Skip to content

Commit 4c3d4f4

Browse files
committed
Failed attempt to fix OSGi test for Java 16, deactivated for now.
1 parent 29e9535 commit 4c3d4f4

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

pom.xml

+8-9
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@
275275
<modules>
276276
<module>xstream</module>
277277
<module>xstream-hibernate</module>
278-
<module>xstream-its</module>
278+
<!--module>xstream-its</module-->
279279
<module>xstream-jmh</module>
280280
<module>xstream-benchmark</module>
281281
<module>xstream-distribution</module>
@@ -629,18 +629,17 @@
629629
</dependency>
630630

631631
<!-- Pax Exam Dependencies -->
632+
<dependency>
633+
<groupId>jakarta.inject</groupId>
634+
<artifactId>jakarta.inject-api</artifactId>
635+
<version>${version.jakarta.inject.api}</version>
636+
</dependency>
632637
<dependency>
633638
<groupId>org.apache.felix</groupId>
634639
<artifactId>org.apache.felix.framework</artifactId>
635640
<version>${version.org.apache.felix}</version>
636641
<scope>test</scope>
637642
</dependency>
638-
<dependency>
639-
<groupId>org.glassfish.hk2.external</groupId>
640-
<artifactId>javax.inject</artifactId>
641-
<version>${version.javax.inject}</version>
642-
<scope>provided</scope>
643-
</dependency>
644643
<dependency>
645644
<groupId>org.ops4j.pax.exam</groupId>
646645
<artifactId>pax-exam-container-native</artifactId>
@@ -1112,9 +1111,9 @@
11121111
<version.io.github.x-stream.mxparser>1.2.1</version.io.github.x-stream.mxparser>
11131112
<version.jakarta.activation.api>1.2.1</version.jakarta.activation.api>
11141113
<version.jakarta.annotation.api>1.3.4</version.jakarta.annotation.api>
1114+
<version.jakarta.inject.api>1.0</version.jakarta.inject.api>
11151115
<version.jakarta.xml.bind.api>2.3.2</version.jakarta.xml.bind.api>
11161116
<version.javaassist>3.12.1.GA</version.javaassist>
1117-
<version.javax.inject>2.4.0</version.javax.inject>
11181117
<version.javax.xml.bind.api>2.3.1</version.javax.xml.bind.api>
11191118
<version.javax.xml.ws.jaxws.rt>2.2</version.javax.xml.ws.jaxws.rt><!-- Java 5 -->
11201119
<version.jmock>1.0.1</version.jmock>
@@ -1131,7 +1130,7 @@
11311130
<version.org.jdom2>2.0.6</version.org.jdom2>
11321131
<version.org.json>20180813</version.org.json>
11331132
<version.org.openjdk.jmh>1.21</version.org.openjdk.jmh>
1134-
<version.org.ops4j.pax.exam>4.13.1</version.org.ops4j.pax.exam>
1133+
<version.org.ops4j.pax.exam>4.13.4</version.org.ops4j.pax.exam>
11351134
<version.org.slf4j>1.6.1</version.org.slf4j>
11361135
<version.stax>1.2.0</version.stax>
11371136
<version.xerces.impl>2.8.1</version.xerces.impl>

xstream-its/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@
7979

8080
<!-- test dependencies -->
8181
<dependency>
82-
<groupId>org.apache.felix</groupId>
83-
<artifactId>org.apache.felix.framework</artifactId>
82+
<groupId>jakarta.inject</groupId>
83+
<artifactId>jakarta.inject-api</artifactId>
8484
</dependency>
8585
<dependency>
86-
<groupId>org.glassfish.hk2.external</groupId>
87-
<artifactId>javax.inject</artifactId>
86+
<groupId>org.apache.felix</groupId>
87+
<artifactId>org.apache.felix.framework</artifactId>
8888
</dependency>
8989
<dependency>
9090
<groupId>org.ops4j.pax.exam</groupId>

0 commit comments

Comments
 (0)