Jersey version bump to 3.0.4 (#3884)

* Jersey version bump * Jackson version bump * Rest client 3.0 Signed-off-by: David Kral <david.k.kral@oracle.com>
helidon-io · Feb 11, 2022 · 3692c5f · 3692c5f
1 parent d937a66
commit 3692c5f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -66,7 +66,7 @@
         <version.lib.hibernate>6.0.0.Beta1</version.lib.hibernate>
         <version.lib.hikaricp>5.0.0</version.lib.hikaricp>
         <version.lib.hystrix>1.5.18</version.lib.hystrix>
-        <version.lib.jackson>2.12.1</version.lib.jackson>
+        <version.lib.jackson>2.13.1</version.lib.jackson>
         <version.lib.jaegertracing>1.6.0</version.lib.jaegertracing>
         <version.lib.jakarta.activation-api>2.0.1</version.lib.jakarta.activation-api>
         <version.lib.jakarta.annotation-api>2.0.0</version.lib.jakarta.annotation-api>
@@ -92,7 +92,7 @@
         <!-- Force upgrade version used by maven-jaxb2-plugin. Needed to support Java 16 -->
         <version.lib.jaxb-runtime>3.0.2</version.lib.jaxb-runtime>
         <version.lib.jedis>3.6.3</version.lib.jedis>
-        <version.lib.jersey>3.0.3</version.lib.jersey>
+        <version.lib.jersey>3.0.4</version.lib.jersey>
         <version.lib.jgit>5.11.1.202105131744-r</version.lib.jgit>
         <version.lib.jsonp-impl>2.0.1</version.lib.jsonp-impl>
         <version.lib.junit4>4.13.1</version.lib.junit4>

diff --git a/microprofile/rest-client/pom.xml b/microprofile/rest-client/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019, 2021 Oracle and/or its affiliates.
+    Copyright (c) 2019, 2022 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -53,11 +53,10 @@
             <groupId>io.helidon.jersey</groupId>
             <artifactId>helidon-jersey-client</artifactId>
         </dependency>
-        <!-- TODO 3.0.0-JAKARTA -->
-<!--        <dependency>-->
-<!--            <groupId>org.glassfish.jersey.ext.microprofile</groupId>-->
-<!--            <artifactId>jersey-mp-rest-client</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.glassfish.jersey.ext.microprofile</groupId>
+            <artifactId>jersey-mp-rest-client</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/microprofile/tests/tck/tck-rest-client/pom.xml b/microprofile/tests/tck/tck-rest-client/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2019, 2021 Oracle and/or its affiliates.
+    Copyright (c) 2019, 2022 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -28,11 +28,6 @@
     <artifactId>tck-rest-client</artifactId>
     <name>Helidon Microprofile Tests TCK REST Client</name>
 
-    <properties>
-        <!-- 3.0.0-JAKARTA -->
-        <skipTests>true</skipTests>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>io.helidon.microprofile.tests</groupId>

diff --git a/microprofile/tests/tck/tck-rest-client/src/test/tck-suite.xml b/microprofile/tests/tck/tck-rest-client/src/test/tck-suite.xml
@@ -18,6 +18,11 @@
     <test name="microprofile-rest-client TCK">
         <packages>
             <package name="org.eclipse.microprofile.rest.client.tck.*">
+                <!--
+                Excluded because to failures in our pipeline due to the performance issues.
+                Remove exclusion to test locally when upgrading Rest Client.
+                -->
+                <exclude name="org.eclipse.microprofile.rest.client.tck.timeout"/>
             </package>
         </packages>
         <classes>