Update Maven dependencies.
Use more org.osgi dependencies directly.
diff --git a/maven/org.eclipse.oomph.maven.generator/report/merged-target/REPORT.md b/maven/org.eclipse.oomph.maven.generator/report/merged-target/REPORT.md
index a87ddda..ea048cb 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/merged-target/REPORT.md
+++ b/maven/org.eclipse.oomph.maven.generator/report/merged-target/REPORT.md
@@ -124,6 +124,9 @@
- [org.osgi](https://repo1.maven.org/maven2/org/osgi/)
- [org.osgi.annotation.bundle](https://repo1.maven.org/maven2/org/osgi/org.osgi.annotation.bundle/) **[2.0.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.annotation.bundle/2.0.0)**
- [org.osgi.annotation.versioning](https://repo1.maven.org/maven2/org/osgi/org.osgi.annotation.versioning/) **[1.1.2](https://repo1.maven.org/maven2/org/osgi/org.osgi.annotation.versioning/1.1.2)**
+ - [org.osgi.dto](https://repo1.maven.org/maven2/org/osgi/org.osgi.dto/) **[1.1.1](https://repo1.maven.org/maven2/org/osgi/org.osgi.dto/1.1.1)**
+ - [org.osgi.framework](https://repo1.maven.org/maven2/org/osgi/org.osgi.framework/) **[1.10.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.framework/1.10.0)**
+ - [org.osgi.resource](https://repo1.maven.org/maven2/org/osgi/org.osgi.resource/) **[1.0.1](https://repo1.maven.org/maven2/org/osgi/org.osgi.resource/1.0.1)**
- [org.osgi.service.cm](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.cm/) **[1.6.1](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.cm/1.6.1)**
- [org.osgi.service.component](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.component/) **[1.5.1](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.component/1.5.1)**
- [org.osgi.service.component.annotations](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.component.annotations/) **[1.5.1](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.component.annotations/1.5.1)**
@@ -132,6 +135,7 @@
- [org.osgi.service.event](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.event/) **[1.4.1](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.event/1.4.1)**
- [org.osgi.service.http](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.http/) **[1.2.2](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.http/1.2.2)**
- [org.osgi.service.http.whiteboard](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.http.whiteboard/) **[1.1.1](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.http.whiteboard/1.1.1)**
+ - [org.osgi.service.log](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.log/) **[1.5.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.log/1.5.0)**
- [org.osgi.service.log.stream](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.log.stream/) **[1.0.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.log.stream/1.0.0)**
- [org.osgi.service.metatype](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.metatype/) **[1.4.1](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.metatype/1.4.1)**
- [org.osgi.service.metatype.annotations](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.metatype.annotations/) **[1.4.1](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.metatype.annotations/1.4.1)**
@@ -146,6 +150,7 @@
- [org.osgi.util.position](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.position/) **[1.0.1](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.position/1.0.1)**
- [org.osgi.util.promise](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.promise/) **[1.3.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.promise/1.3.0)**
- [org.osgi.util.pushstream](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.pushstream/) **[1.1.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.pushstream/1.1.0)**
+ - [org.osgi.util.tracker](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.tracker/) **[1.5.4](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.tracker/1.5.4)**
- [org.osgi.util.xml](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.xml/) **[1.0.2](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.xml/1.0.2)**
- [org.ow2.asm](https://repo1.maven.org/maven2/org/ow2/asm/)
- [asm](https://repo1.maven.org/maven2/org/ow2/asm/asm/) **[9.4](https://repo1.maven.org/maven2/org/ow2/asm/asm/9.4)**
diff --git a/maven/org.eclipse.oomph.maven.generator/report/merged-target/original.target b/maven/org.eclipse.oomph.maven.generator/report/merged-target/original.target
index 0058e13..2f663a9 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/merged-target/original.target
+++ b/maven/org.eclipse.oomph.maven.generator/report/merged-target/original.target
@@ -539,6 +539,24 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.dto</artifactId>
+ <version>1.1.1</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.framework</artifactId>
+ <version>1.10.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.resource</artifactId>
+ <version>1.0.1</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
<version>1.6.1</version>
<type>jar</type>
@@ -587,6 +605,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.log</artifactId>
+ <version>1.5.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.service.log.stream</artifactId>
<version>1.0.0</version>
<type>jar</type>
@@ -671,6 +695,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
+ <version>1.5.4</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.util.xml</artifactId>
<version>1.0.2</version>
<type>jar</type>
@@ -750,10 +780,12 @@
</dependencies>
</location>
+<!--
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/eclipse/updates/4.26"/>
<unit id="org.eclipse.osgi" version="0.0.0"/>
</location>
+-->
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
<unit id="org.jdom2" version="0.0.0"/>
diff --git a/maven/org.eclipse.oomph.maven.generator/report/merged-target/updated.target b/maven/org.eclipse.oomph.maven.generator/report/merged-target/updated.target
index 0058e13..2f663a9 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/merged-target/updated.target
+++ b/maven/org.eclipse.oomph.maven.generator/report/merged-target/updated.target
@@ -539,6 +539,24 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.dto</artifactId>
+ <version>1.1.1</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.framework</artifactId>
+ <version>1.10.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.resource</artifactId>
+ <version>1.0.1</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
<version>1.6.1</version>
<type>jar</type>
@@ -587,6 +605,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.log</artifactId>
+ <version>1.5.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.service.log.stream</artifactId>
<version>1.0.0</version>
<type>jar</type>
@@ -671,6 +695,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
+ <version>1.5.4</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.util.xml</artifactId>
<version>1.0.2</version>
<type>jar</type>
@@ -750,10 +780,12 @@
</dependencies>
</location>
+<!--
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/eclipse/updates/4.26"/>
<unit id="org.eclipse.osgi" version="0.0.0"/>
</location>
+-->
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
<unit id="org.jdom2" version="0.0.0"/>
diff --git a/maven/org.eclipse.oomph.maven.generator/report/platform/original.target b/maven/org.eclipse.oomph.maven.generator/report/platform/original.target
index f8e405e..2ab9af2 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/platform/original.target
+++ b/maven/org.eclipse.oomph.maven.generator/report/platform/original.target
@@ -46,7 +46,7 @@
<!-- This is the "normal" Orbit repository. During development on Bug 568936 this repo is the EBR (git)
sourced bundles of Orbit from 2022-03. This is the sub-p2-repo of the 2022-03 recommended build.
This is the repo that is expected to be updated on milestones based on Orbit deliveries. -->
- <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230214193619/repository/"/>
+ <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository/"/>
</location>
<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
diff --git a/maven/org.eclipse.oomph.maven.generator/report/platform/updated.target b/maven/org.eclipse.oomph.maven.generator/report/platform/updated.target
index 2013dbc..2eccafa 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/platform/updated.target
+++ b/maven/org.eclipse.oomph.maven.generator/report/platform/updated.target
@@ -46,7 +46,7 @@
<!-- This is the "normal" Orbit repository. During development on Bug 568936 this repo is the EBR (git)
sourced bundles of Orbit from 2022-03. This is the sub-p2-repo of the 2022-03 recommended build.
This is the repo that is expected to be updated on milestones based on Orbit deliveries. -->
- <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20230214193619/repository/"/>
+ <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository/"/>
</location>
<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
diff --git a/maven/org.eclipse.oomph.maven.generator/report/supplement/REPORT.md b/maven/org.eclipse.oomph.maven.generator/report/supplement/REPORT.md
index 793dc37..eb76bcf 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/supplement/REPORT.md
+++ b/maven/org.eclipse.oomph.maven.generator/report/supplement/REPORT.md
@@ -13,3 +13,9 @@
- [org.apache.aries.spifly.dynamic.bundle](https://repo1.maven.org/maven2/org/apache/aries/spifly/org.apache.aries.spifly.dynamic.bundle/) **[1.3.6](https://repo1.maven.org/maven2/org/apache/aries/spifly/org.apache.aries.spifly.dynamic.bundle/1.3.6)**
- [org.apache.felix](https://repo1.maven.org/maven2/org/apache/felix/)
- [org.apache.felix.http.servlet-api](https://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.http.servlet-api/) **[1.2.0](https://repo1.maven.org/maven2/org/apache/felix/org.apache.felix.http.servlet-api/1.2.0)**
+ - [org.osgi](https://repo1.maven.org/maven2/org/osgi/)
+ - [org.osgi.dto](https://repo1.maven.org/maven2/org/osgi/org.osgi.dto/) **[1.1.1](https://repo1.maven.org/maven2/org/osgi/org.osgi.dto/1.1.1)**
+ - [org.osgi.framework](https://repo1.maven.org/maven2/org/osgi/org.osgi.framework/) **[1.10.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.framework/1.10.0)**
+ - [org.osgi.resource](https://repo1.maven.org/maven2/org/osgi/org.osgi.resource/) **[1.0.1](https://repo1.maven.org/maven2/org/osgi/org.osgi.resource/1.0.1)**
+ - [org.osgi.service.log](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.log/) **[1.5.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.log/1.5.0)**
+ - [org.osgi.util.tracker](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.tracker/) **[1.5.4](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.tracker/1.5.4)**
diff --git a/maven/org.eclipse.oomph.maven.generator/report/supplement/original.target b/maven/org.eclipse.oomph.maven.generator/report/supplement/original.target
index 3d723ed..dcb9c8f 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/supplement/original.target
+++ b/maven/org.eclipse.oomph.maven.generator/report/supplement/original.target
@@ -38,6 +38,41 @@
<version>3.2.2</version>
<type>jar</type>
</dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.framework</artifactId>
+ <version>1.10.0</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.resource</artifactId>
+ <version>1.0.1</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.log</artifactId>
+ <version>1.5.0</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
+ <version>1.5.4</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.dto</artifactId>
+ <version>1.1.1</version>
+ <type>jar</type>
+ </dependency>
</dependencies>
</location>
</locations>
diff --git a/maven/org.eclipse.oomph.maven.generator/report/supplement/updated.target b/maven/org.eclipse.oomph.maven.generator/report/supplement/updated.target
index 3d723ed..dcb9c8f 100644
--- a/maven/org.eclipse.oomph.maven.generator/report/supplement/updated.target
+++ b/maven/org.eclipse.oomph.maven.generator/report/supplement/updated.target
@@ -38,6 +38,41 @@
<version>3.2.2</version>
<type>jar</type>
</dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.framework</artifactId>
+ <version>1.10.0</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.resource</artifactId>
+ <version>1.0.1</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.log</artifactId>
+ <version>1.5.0</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
+ <version>1.5.4</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.dto</artifactId>
+ <version>1.1.1</version>
+ <type>jar</type>
+ </dependency>
</dependencies>
</location>
</locations>
diff --git a/maven/tp/Maven.target b/maven/tp/Maven.target
index 0058e13..c5b0229 100644
--- a/maven/tp/Maven.target
+++ b/maven/tp/Maven.target
@@ -539,6 +539,24 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.dto</artifactId>
+ <version>1.1.1</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.framework</artifactId>
+ <version>1.10.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.resource</artifactId>
+ <version>1.0.1</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
<version>1.6.1</version>
<type>jar</type>
@@ -587,6 +605,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.log</artifactId>
+ <version>1.5.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.service.log.stream</artifactId>
<version>1.0.0</version>
<type>jar</type>
@@ -671,6 +695,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
+ <version>1.5.4</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.util.xml</artifactId>
<version>1.0.2</version>
<type>jar</type>
@@ -751,10 +781,6 @@
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository location="https://download.eclipse.org/eclipse/updates/4.26"/>
- <unit id="org.eclipse.osgi" version="0.0.0"/>
- </location>
- <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/downloads/latest-I"/>
<unit id="org.jdom2" version="0.0.0"/>
<unit id="org.junit" version="0.0.0"/>
diff --git a/maven/tp/other/MavenSupplement.target b/maven/tp/other/MavenSupplement.target
index 3d723ed..dcb9c8f 100644
--- a/maven/tp/other/MavenSupplement.target
+++ b/maven/tp/other/MavenSupplement.target
@@ -38,6 +38,41 @@
<version>3.2.2</version>
<type>jar</type>
</dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.framework</artifactId>
+ <version>1.10.0</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.resource</artifactId>
+ <version>1.0.1</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.log</artifactId>
+ <version>1.5.0</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
+ <version>1.5.4</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.dto</artifactId>
+ <version>1.1.1</version>
+ <type>jar</type>
+ </dependency>
</dependencies>
</location>
</locations>
