Failed attempt to fix OSGi test for Java 16, deactivated for now.

classicvalues · Mar 20, 2021 · 4c3d4f4 · 4c3d4f4
1 parent 29e9535
commit 4c3d4f4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -275,7 +275,7 @@
   <modules>
     <module>xstream</module>
     <module>xstream-hibernate</module>
-    <module>xstream-its</module>
+    <!--module>xstream-its</module-->
     <module>xstream-jmh</module>
     <module>xstream-benchmark</module>
     <module>xstream-distribution</module>
@@ -629,18 +629,17 @@
       </dependency>
 
       <!-- Pax Exam Dependencies -->
+      <dependency>
+        <groupId>jakarta.inject</groupId>
+        <artifactId>jakarta.inject-api</artifactId>
+        <version>${version.jakarta.inject.api}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.framework</artifactId>
         <version>${version.org.apache.felix}</version>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>org.glassfish.hk2.external</groupId>
-        <artifactId>javax.inject</artifactId>
-        <version>${version.javax.inject}</version>
-        <scope>provided</scope>
-      </dependency>
       <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-container-native</artifactId>
@@ -1112,9 +1111,9 @@
     <version.io.github.x-stream.mxparser>1.2.1</version.io.github.x-stream.mxparser>
     <version.jakarta.activation.api>1.2.1</version.jakarta.activation.api>
     <version.jakarta.annotation.api>1.3.4</version.jakarta.annotation.api>
+    <version.jakarta.inject.api>1.0</version.jakarta.inject.api>
     <version.jakarta.xml.bind.api>2.3.2</version.jakarta.xml.bind.api>
     <version.javaassist>3.12.1.GA</version.javaassist>
-    <version.javax.inject>2.4.0</version.javax.inject>
     <version.javax.xml.bind.api>2.3.1</version.javax.xml.bind.api>
     <version.javax.xml.ws.jaxws.rt>2.2</version.javax.xml.ws.jaxws.rt><!-- Java 5 -->
     <version.jmock>1.0.1</version.jmock>
@@ -1131,7 +1130,7 @@
     <version.org.jdom2>2.0.6</version.org.jdom2>
     <version.org.json>20180813</version.org.json>
     <version.org.openjdk.jmh>1.21</version.org.openjdk.jmh>
-    <version.org.ops4j.pax.exam>4.13.1</version.org.ops4j.pax.exam>
+    <version.org.ops4j.pax.exam>4.13.4</version.org.ops4j.pax.exam>
     <version.org.slf4j>1.6.1</version.org.slf4j>
     <version.stax>1.2.0</version.stax>
     <version.xerces.impl>2.8.1</version.xerces.impl>

diff --git a/xstream-its/pom.xml b/xstream-its/pom.xml
@@ -79,12 +79,12 @@
 
     <!-- test dependencies -->
     <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.framework</artifactId>
+      <groupId>jakarta.inject</groupId>
+      <artifactId>jakarta.inject-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.glassfish.hk2.external</groupId>
-      <artifactId>javax.inject</artifactId>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.framework</artifactId>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>