Skip to content

Commit 253a19b

Browse files
merksmerks
committed
Add OSGi test dependencies
eclipse-platform/eclipse.platform.releng.aggregator#2822
1 parent 005f1ec commit 253a19b

File tree

6 files changed

+237
-2
lines changed

6 files changed

+237
-2
lines changed

‎maven-osgi/tp/Maven.target‎

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<target name="Maven" sequenceNumber="1">
44
<locations>
55
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven">
6-
<feature id="org.eclipse.orbit.maven.osgi.all" label="Orbit Maven OSGi All" provider-name="Eclipse Orbit" version="4.35.0.v20250215-1500">
6+
<feature id="org.eclipse.orbit.maven.osgi.all" label="Orbit Maven OSGi All" provider-name="Eclipse Orbit" version="4.35.0.v20250216-0807">
77
<description>This feature's dependencies are pulled directly from Maven central.</description>
88
<copyright>
99
Copyright (c) 2025 Eclipse contributors and others.
@@ -16,7 +16,7 @@ https://www.eclipse.org/legal/epl-2.0/
1616
SPDX-License-Identifier: EPL-2.0
1717
</copyright>
1818
<license url="https://www.eclipse.org/legal/epl-2.0/"/>
19-
<!-- SHA1 5791892f2e8f3ad17ff373cff8f5fb504b6d563e -->
19+
<!-- SHA1 d1529d6289c5b6baead8b400e18d32e5d13d223e -->
2020
</feature>
2121
<dependencies>
2222
<dependency>
@@ -1388,6 +1388,12 @@ SPDX-License-Identifier: EPL-2.0
13881388
<version>1.0.1</version>
13891389
<type>jar</type>
13901390
</dependency>
1391+
<dependency>
1392+
<groupId>org.osgi</groupId>
1393+
<artifactId>org.osgi.namespace.implementation</artifactId>
1394+
<version>1.0.0</version>
1395+
<type>jar</type>
1396+
</dependency>
13911397
<dependency>
13921398
<groupId>org.osgi</groupId>
13931399
<artifactId>org.osgi.namespace.service</artifactId>
@@ -1532,6 +1538,48 @@ SPDX-License-Identifier: EPL-2.0
15321538
<version>1.0.2</version>
15331539
<type>jar</type>
15341540
</dependency>
1541+
<dependency>
1542+
<groupId>org.osgi</groupId>
1543+
<artifactId>org.osgi.test.assertj.framework</artifactId>
1544+
<version>1.3.0</version>
1545+
<type>jar</type>
1546+
</dependency>
1547+
<dependency>
1548+
<groupId>org.osgi</groupId>
1549+
<artifactId>org.osgi.test.assertj.log</artifactId>
1550+
<version>1.3.0</version>
1551+
<type>jar</type>
1552+
</dependency>
1553+
<dependency>
1554+
<groupId>org.osgi</groupId>
1555+
<artifactId>org.osgi.test.assertj.promise</artifactId>
1556+
<version>1.3.0</version>
1557+
<type>jar</type>
1558+
</dependency>
1559+
<dependency>
1560+
<groupId>org.osgi</groupId>
1561+
<artifactId>org.osgi.test.common</artifactId>
1562+
<version>1.3.0</version>
1563+
<type>jar</type>
1564+
</dependency>
1565+
<dependency>
1566+
<groupId>org.osgi</groupId>
1567+
<artifactId>org.osgi.test.junit4</artifactId>
1568+
<version>1.3.0</version>
1569+
<type>jar</type>
1570+
</dependency>
1571+
<dependency>
1572+
<groupId>org.osgi</groupId>
1573+
<artifactId>org.osgi.test.junit5</artifactId>
1574+
<version>1.3.0</version>
1575+
<type>jar</type>
1576+
</dependency>
1577+
<dependency>
1578+
<groupId>org.osgi</groupId>
1579+
<artifactId>org.osgi.test.junit5.cm</artifactId>
1580+
<version>1.3.0</version>
1581+
<type>jar</type>
1582+
</dependency>
15351583
<dependency>
15361584
<groupId>org.osgi</groupId>
15371585
<artifactId>org.osgi.util.function</artifactId>
@@ -1574,6 +1622,12 @@ SPDX-License-Identifier: EPL-2.0
15741622
<version>1.0.2</version>
15751623
<type>jar</type>
15761624
</dependency>
1625+
<dependency>
1626+
<groupId>org.osgi</groupId>
1627+
<artifactId>osgi.annotation</artifactId>
1628+
<version>8.1.0</version>
1629+
<type>jar</type>
1630+
</dependency>
15771631
<dependency>
15781632
<groupId>org.ow2.asm</groupId>
15791633
<artifactId>asm</artifactId>
@@ -1691,6 +1745,7 @@ SPDX-License-Identifier: EPL-2.0
16911745
<unit id="org.eclipse.osgi" version="0.0.0"/>
16921746
<unit id="org.eclipse.equinox.app" version="0.0.0"/>
16931747
<unit id="org.eclipse.equinox.common" version="0.0.0"/>
1748+
<unit id="org.eclipse.equinox.cm" version="0.0.0"/>
16941749
<unit id="org.eclipse.equinox.preferences" version="0.0.0"/>
16951750
<unit id="org.eclipse.equinox.registry" version="0.0.0"/>
16961751
</location>

‎maven-osgi/tp/other/MavenSupplement.target‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,12 @@
742742
<version>1.10.0</version>
743743
<type>jar</type>
744744
</dependency>
745+
<dependency>
746+
<groupId>org.osgi</groupId>
747+
<artifactId>org.osgi.namespace.implementation</artifactId>
748+
<version>1.0.0</version>
749+
<type>jar</type>
750+
</dependency>
745751
<dependency>
746752
<groupId>org.osgi</groupId>
747753
<artifactId>org.osgi.resource</artifactId>
@@ -784,12 +790,60 @@
784790
<version>1.0.1</version>
785791
<type>jar</type>
786792
</dependency>
793+
<dependency>
794+
<groupId>org.osgi</groupId>
795+
<artifactId>org.osgi.test.assertj.framework</artifactId>
796+
<version>1.3.0</version>
797+
<type>jar</type>
798+
</dependency>
799+
<dependency>
800+
<groupId>org.osgi</groupId>
801+
<artifactId>org.osgi.test.assertj.log</artifactId>
802+
<version>1.3.0</version>
803+
<type>jar</type>
804+
</dependency>
805+
<dependency>
806+
<groupId>org.osgi</groupId>
807+
<artifactId>org.osgi.test.assertj.promise</artifactId>
808+
<version>1.3.0</version>
809+
<type>jar</type>
810+
</dependency>
811+
<dependency>
812+
<groupId>org.osgi</groupId>
813+
<artifactId>org.osgi.test.common</artifactId>
814+
<version>1.3.0</version>
815+
<type>jar</type>
816+
</dependency>
817+
<dependency>
818+
<groupId>org.osgi</groupId>
819+
<artifactId>org.osgi.test.junit4</artifactId>
820+
<version>1.3.0</version>
821+
<type>jar</type>
822+
</dependency>
823+
<dependency>
824+
<groupId>org.osgi</groupId>
825+
<artifactId>org.osgi.test.junit5</artifactId>
826+
<version>1.3.0</version>
827+
<type>jar</type>
828+
</dependency>
829+
<dependency>
830+
<groupId>org.osgi</groupId>
831+
<artifactId>org.osgi.test.junit5.cm</artifactId>
832+
<version>1.3.0</version>
833+
<type>jar</type>
834+
</dependency>
787835
<dependency>
788836
<groupId>org.osgi</groupId>
789837
<artifactId>org.osgi.util.tracker</artifactId>
790838
<version>1.5.4</version>
791839
<type>jar</type>
792840
</dependency>
841+
<dependency>
842+
<groupId>org.osgi</groupId>
843+
<artifactId>osgi.annotation</artifactId>
844+
<version>8.1.0</version>
845+
<type>jar</type>
846+
</dependency>
793847
<dependency>
794848
<groupId>org.slf4j</groupId>
795849
<artifactId>slf4j-nop</artifactId>

‎report/maven-osgi/merged-target/REPORT.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,7 @@
383383
- [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)**
384384
- [org.osgi.namespace.contract](https://repo1.maven.org/maven2/org/osgi/org.osgi.namespace.contract/) **[1.0.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.namespace.contract/1.0.0)**
385385
- [org.osgi.namespace.extender](https://repo1.maven.org/maven2/org/osgi/org.osgi.namespace.extender/) **[1.0.1](https://repo1.maven.org/maven2/org/osgi/org.osgi.namespace.extender/1.0.1)**
386+
- [org.osgi.namespace.implementation](https://repo1.maven.org/maven2/org/osgi/org.osgi.namespace.implementation/) **[1.0.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.namespace.implementation/1.0.0)**
386387
- [org.osgi.namespace.service](https://repo1.maven.org/maven2/org/osgi/org.osgi.namespace.service/) **[1.0.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.namespace.service/1.0.0)**
387388
- [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)**
388389
- [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)**
@@ -407,13 +408,21 @@
407408
- [org.osgi.service.url](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.url/) **[1.0.1](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.url/1.0.1)**
408409
- [org.osgi.service.useradmin](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.useradmin/) **[1.1.1](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.useradmin/1.1.1)**
409410
- [org.osgi.service.wireadmin](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.wireadmin/) **[1.0.2](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.wireadmin/1.0.2)**
411+
- [org.osgi.test.assertj.framework](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.assertj.framework/) **[1.3.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.assertj.framework/1.3.0)**
412+
- [org.osgi.test.assertj.log](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.assertj.log/) **[1.3.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.assertj.log/1.3.0)**
413+
- [org.osgi.test.assertj.promise](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.assertj.promise/) **[1.3.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.assertj.promise/1.3.0)**
414+
- [org.osgi.test.common](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.common/) **[1.3.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.common/1.3.0)**
415+
- [org.osgi.test.junit4](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.junit4/) **[1.3.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.junit4/1.3.0)**
416+
- [org.osgi.test.junit5](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.junit5/) **[1.3.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.junit5/1.3.0)**
417+
- [org.osgi.test.junit5.cm](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.junit5.cm/) **[1.3.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.junit5.cm/1.3.0)**
410418
- [org.osgi.util.function](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.function/) **[1.2.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.function/1.2.0)**
411419
- [org.osgi.util.measurement](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.measurement/) **[1.0.2](https://repo1.maven.org/maven2/org/osgi/org.osgi.util.measurement/1.0.2)**
412420
- [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)**
413421
- [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)**
414422
- [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)**
415423
- [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)**
416424
- [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)**
425+
- [osgi.annotation](https://repo1.maven.org/maven2/org/osgi/osgi.annotation/) **[8.1.0](https://repo1.maven.org/maven2/org/osgi/osgi.annotation/8.1.0)**
417426
- [org.ow2.asm](https://repo1.maven.org/maven2/org/ow2/asm/)
418427
- [asm](https://repo1.maven.org/maven2/org/ow2/asm/asm/) **[9.7.1](https://repo1.maven.org/maven2/org/ow2/asm/asm/9.7.1)**
419428
- [asm-analysis](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/) **[9.7.1](https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.7.1)**

‎report/maven-osgi/supplement/REPORT.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,14 +252,23 @@
252252
- [org.osgi](https://repo1.maven.org/maven2/org/osgi/)
253253
- [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)**
254254
- [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)**
255+
- [org.osgi.namespace.implementation](https://repo1.maven.org/maven2/org/osgi/org.osgi.namespace.implementation/) **[1.0.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.namespace.implementation/1.0.0)**
255256
- [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)**
256257
- [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)**
257258
- [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)**
258259
- [org.osgi.service.packageadmin](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.packageadmin/) **[1.2.1](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.packageadmin/1.2.1)**
259260
- [org.osgi.service.resolver](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.resolver/) **[1.1.1](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.resolver/1.1.1)**
260261
- [org.osgi.service.startlevel](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.startlevel/) **[1.1.1](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.startlevel/1.1.1)**
261262
- [org.osgi.service.url](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.url/) **[1.0.1](https://repo1.maven.org/maven2/org/osgi/org.osgi.service.url/1.0.1)**
263+
- [org.osgi.test.assertj.framework](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.assertj.framework/) **[1.3.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.assertj.framework/1.3.0)**
264+
- [org.osgi.test.assertj.log](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.assertj.log/) **[1.3.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.assertj.log/1.3.0)**
265+
- [org.osgi.test.assertj.promise](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.assertj.promise/) **[1.3.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.assertj.promise/1.3.0)**
266+
- [org.osgi.test.common](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.common/) **[1.3.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.common/1.3.0)**
267+
- [org.osgi.test.junit4](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.junit4/) **[1.3.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.junit4/1.3.0)**
268+
- [org.osgi.test.junit5](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.junit5/) **[1.3.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.junit5/1.3.0)**
269+
- [org.osgi.test.junit5.cm](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.junit5.cm/) **[1.3.0](https://repo1.maven.org/maven2/org/osgi/org.osgi.test.junit5.cm/1.3.0)**
262270
- [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)**
271+
- [osgi.annotation](https://repo1.maven.org/maven2/org/osgi/osgi.annotation/) **[8.1.0](https://repo1.maven.org/maven2/org/osgi/osgi.annotation/8.1.0)**
263272
- [org.slf4j](https://repo1.maven.org/maven2/org/slf4j/)
264273
- [slf4j-nop](https://repo1.maven.org/maven2/org/slf4j/slf4j-nop/) **[1.7.36](https://repo1.maven.org/maven2/org/slf4j/slf4j-nop/1.7.36)**
265274
- [slf4j-nop](https://repo1.maven.org/maven2/org/slf4j/slf4j-nop/) **[2.0.16](https://repo1.maven.org/maven2/org/slf4j/slf4j-nop/2.0.16)**

‎report/maven-osgi/supplement/original.target‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,12 @@
742742
<version>1.10.0</version>
743743
<type>jar</type>
744744
</dependency>
745+
<dependency>
746+
<groupId>org.osgi</groupId>
747+
<artifactId>org.osgi.namespace.implementation</artifactId>
748+
<version>1.0.0</version>
749+
<type>jar</type>
750+
</dependency>
745751
<dependency>
746752
<groupId>org.osgi</groupId>
747753
<artifactId>org.osgi.resource</artifactId>
@@ -784,12 +790,60 @@
784790
<version>1.0.1</version>
785791
<type>jar</type>
786792
</dependency>
793+
<dependency>
794+
<groupId>org.osgi</groupId>
795+
<artifactId>org.osgi.test.assertj.framework</artifactId>
796+
<version>1.3.0</version>
797+
<type>jar</type>
798+
</dependency>
799+
<dependency>
800+
<groupId>org.osgi</groupId>
801+
<artifactId>org.osgi.test.assertj.log</artifactId>
802+
<version>1.3.0</version>
803+
<type>jar</type>
804+
</dependency>
805+
<dependency>
806+
<groupId>org.osgi</groupId>
807+
<artifactId>org.osgi.test.assertj.promise</artifactId>
808+
<version>1.3.0</version>
809+
<type>jar</type>
810+
</dependency>
811+
<dependency>
812+
<groupId>org.osgi</groupId>
813+
<artifactId>org.osgi.test.common</artifactId>
814+
<version>1.3.0</version>
815+
<type>jar</type>
816+
</dependency>
817+
<dependency>
818+
<groupId>org.osgi</groupId>
819+
<artifactId>org.osgi.test.junit4</artifactId>
820+
<version>1.3.0</version>
821+
<type>jar</type>
822+
</dependency>
823+
<dependency>
824+
<groupId>org.osgi</groupId>
825+
<artifactId>org.osgi.test.junit5</artifactId>
826+
<version>1.3.0</version>
827+
<type>jar</type>
828+
</dependency>
829+
<dependency>
830+
<groupId>org.osgi</groupId>
831+
<artifactId>org.osgi.test.junit5.cm</artifactId>
832+
<version>1.3.0</version>
833+
<type>jar</type>
834+
</dependency>
787835
<dependency>
788836
<groupId>org.osgi</groupId>
789837
<artifactId>org.osgi.util.tracker</artifactId>
790838
<version>1.5.4</version>
791839
<type>jar</type>
792840
</dependency>
841+
<dependency>
842+
<groupId>org.osgi</groupId>
843+
<artifactId>osgi.annotation</artifactId>
844+
<version>8.1.0</version>
845+
<type>jar</type>
846+
</dependency>
793847
<dependency>
794848
<groupId>org.slf4j</groupId>
795849
<artifactId>slf4j-nop</artifactId>

0 commit comments

Comments
 (0)