Upgrade to Jersey 2.35

Signed-off-by: Andrew Berezovskyi <andriib@kth.se>
eclipse · Dec 24, 2021 · af4c0c9 · af4c0c9
1 parent cd5f280
commit af4c0c9
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 2 deletions.
diff --git a/client/oslc-client/pom.xml b/client/oslc-client/pom.xml
@@ -123,9 +123,14 @@
       <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>
-            <version>${v.jersey}</version>
             <scope>test</scope>
         </dependency>
+      <dependency>
+        <groupId>org.glassfish.jersey.inject</groupId>
+        <artifactId>jersey-hk2</artifactId>
+        <scope>test</scope>
+      </dependency>
+
     </dependencies>
     <build>
         <plugins>

diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
     <v.dokka>1.5.31</v.dokka>
 
     <v.jena>4.1.0</v.jena>
-    <v.jersey>2.25.1</v.jersey>
+    <v.jersey>2.35</v.jersey>
     <v.slf4j>1.7.32</v.slf4j>
     <v.servlet>3.1.0</v.servlet>
     <v.httpclient>4.5.13</v.httpclient>
@@ -349,6 +349,17 @@
         <artifactId>javax.annotation-api</artifactId>
         <version>1.3.2</version>
       </dependency>
+      <dependency>
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>2.3.3</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.activation</groupId>
+        <artifactId>jakarta.activation-api</artifactId>
+        <version>1.2.2</version>
+      </dependency>
+
 
       <!--Convergence-->
       <dependency>

diff --git a/trs/server/pom.xml b/trs/server/pom.xml
@@ -47,6 +47,54 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <!--duplicate of the parent config but allowing servlet 4.0 for the test deps-->
+            <id>enforce</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <bannedDependencies>
+                  <excludes>
+                    <exclude>xerces</exclude>
+                    <exclude>xml-apis</exclude>
+                    <exclude>com.sun.xml.bind:jaxb-impl</exclude>
+
+                    <!-- https://github.com/eclipse/lyo/pull/220 -->
+                    <!--                    <exclude>log4j:log4j</exclude>-->
+                    <!--log4j v2 is not used, just for the future-->
+                    <exclude>org.apache.logging.log4j:log4j-core</exclude>
+                  </excludes>
+                </bannedDependencies>
+                <banDuplicatePomDependencyVersions/>
+                <requireMavenVersion>
+                  <version>3.1.1</version>
+                </requireMavenVersion>
+                <requireJavaVersion>
+                  <version>11</version>
+                </requireJavaVersion>
+                <requireUpperBoundDeps>
+                  <excludes>
+                    <!--jersey and jena via commons-compress-->
+                    <exclude>org.osgi:org.osgi.core</exclude>
+                    <exclude>javax.servlet:javax.servlet-api</exclude>
+                  </excludes>
+                </requireUpperBoundDeps>
+                <reactorModuleConvergence>
+                  <message>The reactor is not valid</message>
+                  <ignoreModuleDependencies>false</ignoreModuleDependencies>
+                </reactorModuleConvergence>
+              </rules>
+              <fail>true</fail>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -115,13 +163,19 @@
       <version>${v.jersey}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.inject</groupId>
+      <artifactId>jersey-hk2</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.test-framework</groupId>
       <artifactId>jersey-test-framework-core</artifactId>
       <version>${v.jersey}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
+      <!--NB! servlet 4.0 pulled here-->
       <groupId>org.glassfish.jersey.test-framework.providers</groupId>
       <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
       <version>${v.jersey}</version>