Upgrade Jersey to 2.27

Now that we have a more modern Karaf, with Jackson-2.10 and
javax.annotation-api-1.3.1, we should be able to upgrade to
JAX-RS 2.1 and Jersey-2.27.

https://eclipse-ee4j.github.io/jersey.github.io/release-notes/2.26.html
https://eclipse-ee4j.github.io/jersey.github.io/release-notes/2.27.html

JIRA: ODLPARENT-208
Change-Id: I57d583a160d2f40cc2c589ff7e5e89b736ae21e9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/odl-jersey-2/pom.xml b/features/odl-jersey-2/pom.xml
index cc6229f35c8cf6f6d62d6dce807d7ba9a117d022..607eb4a016325f442ff60cb7f25c3dd3df6cefa9 100644 (file)
--- a/features/odl-jersey-2/pom.xml
+++ b/features/odl-jersey-2/pom.xml
@@ -51,6 +51,18 @@
             <type>xml</type>
         </dependency>
 
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <exclusions>
+                <!-- Provided by org.glassfish.hk2.external/javax.inject, which is a proper bundle. That probably
+                     should also be excluded and we should rely on whatever is recommended for Karaf. -->
+                <exclusion>
+                    <groupId>javax.inject</groupId>
+                    <artifactId>javax.inject</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>

diff --git a/features/odl-jersey-2/src/main/history/dependencies.xml b/features/odl-jersey-2/src/main/history/dependencies.xml
index b717390616c6858fe67139bbdfa9879ec6d9a579..8d6a90c46c777c0b2197190799eaacdff7942b10 100644 (file)
--- a/features/odl-jersey-2/src/main/history/dependencies.xml
+++ b/features/odl-jersey-2/src/main/history/dependencies.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-jersey-2">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-jersey-2">
     <feature version="0.0.0">
         <feature>odl-javassist-3</feature>
         <feature>odl-servlet-api</feature>
         <feature>odl-ws-rs-api</feature>
         <bundle>mvn:javax.annotation/javax.annotation-api/1.3.1</bundle>
         <bundle>mvn:javax.validation/validation-api/1.1.0.Final</bundle>
-        <bundle>mvn:org.glassfish.hk2.external/aopalliance-repackaged/2.5.0-b32</bundle>
-        <bundle>mvn:org.glassfish.hk2.external/javax.inject/2.5.0-b32</bundle>
-        <bundle>mvn:org.glassfish.hk2/hk2-api/2.5.0-b32</bundle>
-        <bundle>mvn:org.glassfish.hk2/hk2-locator/2.5.0-b32</bundle>
-        <bundle>mvn:org.glassfish.hk2/hk2-utils/2.5.0-b32</bundle>
+        <bundle>mvn:org.glassfish.hk2.external/aopalliance-repackaged/2.5.0-b42</bundle>
+        <bundle>mvn:org.glassfish.hk2.external/javax.inject/2.5.0-b42</bundle>
+        <bundle>mvn:org.glassfish.hk2/hk2-api/2.5.0-b42</bundle>
+        <bundle>mvn:org.glassfish.hk2/hk2-locator/2.5.0-b42</bundle>
+        <bundle>mvn:org.glassfish.hk2/hk2-utils/2.5.0-b42</bundle>
         <bundle>mvn:org.glassfish.hk2/osgi-resource-locator/1.0.1</bundle>
-        <bundle>mvn:org.glassfish.jersey.bundles.repackaged/jersey-guava/2.25.1</bundle>
-        <bundle>mvn:org.glassfish.jersey.containers/jersey-container-servlet-core/2.25.1</bundle>
-        <bundle>mvn:org.glassfish.jersey.containers/jersey-container-servlet/2.25.1</bundle>
-        <bundle>mvn:org.glassfish.jersey.core/jersey-client/2.25.1</bundle>
-        <bundle>mvn:org.glassfish.jersey.core/jersey-common/2.25.1</bundle>
-        <bundle>mvn:org.glassfish.jersey.core/jersey-server/2.25.1</bundle>
-        <bundle>mvn:org.glassfish.jersey.media/jersey-media-jaxb/2.25.1</bundle>
-        <bundle>mvn:org.glassfish.jersey.media/jersey-media-sse/2.25.1</bundle>
+        <bundle>mvn:org.glassfish.jersey.containers/jersey-container-servlet-core/2.27</bundle>
+        <bundle>mvn:org.glassfish.jersey.containers/jersey-container-servlet/2.27</bundle>
+        <bundle>mvn:org.glassfish.jersey.core/jersey-client/2.27</bundle>
+        <bundle>mvn:org.glassfish.jersey.core/jersey-common/2.27</bundle>
+        <bundle>mvn:org.glassfish.jersey.core/jersey-server/2.27</bundle>
+        <bundle>mvn:org.glassfish.jersey.inject/jersey-hk2/2.27</bundle>
+        <bundle>mvn:org.glassfish.jersey.media/jersey-media-jaxb/2.27</bundle>
+        <bundle>mvn:org.glassfish.jersey.media/jersey-media-sse/2.27</bundle>
     </feature>
 </features>

diff --git a/features/odl-ws-rs-api/src/main/history/dependencies.xml b/features/odl-ws-rs-api/src/main/history/dependencies.xml
index 7d04e4d70ef281acbfd3f69f582412220faaea75..f423e29aed4cb2698e2a0c7136596f109e6877b0 100644 (file)
--- a/features/odl-ws-rs-api/src/main/history/dependencies.xml
+++ b/features/odl-ws-rs-api/src/main/history/dependencies.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-ws-rs-api">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-ws-rs-api">
     <feature version="0.0.0">
-        <bundle>mvn:javax.ws.rs/javax.ws.rs-api/2.0.1</bundle>
+        <bundle>mvn:javax.ws.rs/javax.ws.rs-api/2.1.1</bundle>
     </feature>
 </features>

diff --git a/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index 33fb4894c43512255a8faf951ad6ac4449294256..c448f5cf2fde1d6af51475c392aab484b67aad98 100644 (file)
--- a/odlparent-dependency-check/pom.xml
+++ b/odlparent-dependency-check/pom.xml
@@ -397,7 +397,7 @@
             <groupId>org.glassfish.jersey</groupId>
             <artifactId>jersey-bom</artifactId>
             <type>pom</type>
-            <version>2.25.1</version>
+            <version>2.27</version>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 1413a3a54a9e178ab3113d48ff1b04e82130a6be..866d67e55e54be6c1069eadd8808b38a66b0b4ff 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -356,12 +356,12 @@
       <dependency>
         <groupId>javax.ws.rs</groupId>
         <artifactId>javax.ws.rs-api</artifactId>
-        <version>2.0.1</version>
+        <version>2.1.1</version>
       </dependency>
       <dependency>
         <groupId>org.glassfish.jersey</groupId>
         <artifactId>jersey-bom</artifactId>
-        <version>2.25.1</version>
+        <version>2.27</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>