Resolution for jersey version conflict

Moved the glassfish version of jersey to point to 2.25.1 as to that of odl

Issue-ID: CCSDK-1034

Change-Id: Ia245f3f49f035b45ce9668d334b05a70254272d6
Signed-off-by: janani b <janani.b@huawei.com>

diff --git a/features/ccsdk-sli-plugins-all/pom.xml b/features/ccsdk-sli-plugins-all/pom.xml
index 2c4e4c6..7d9068e 100644 (file)
--- a/features/ccsdk-sli-plugins-all/pom.xml
+++ b/features/ccsdk-sli-plugins-all/pom.xml
@@ -25,7 +25,7 @@
                        <type>xml</type>
                        <classifier>features</classifier>
                </dependency>
-               <!--  Current breaks container due to jersey version conflict
+
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>ccsdk-restapi-call-node</artifactId>
@@ -33,7 +33,7 @@
                        <type>xml</type>
                        <classifier>features</classifier>
                </dependency>
-               -->
+
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>ccsdk-template-node</artifactId>

diff --git a/restapi-call-node/provider/pom.xml b/restapi-call-node/provider/pom.xml
index 5217854..5b34153 100755 (executable)
--- a/restapi-call-node/provider/pom.xml
+++ b/restapi-call-node/provider/pom.xml
@@ -49,15 +49,20 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
+            <artifactId>jersey-guava</artifactId>
+            <version>2.22.2</version>
+        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.security</groupId>
             <artifactId>oauth1-signature</artifactId>
-            <version>${glassfish.version}</version>
+            <version>${jersey.version}</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.security</groupId>
             <artifactId>oauth1-client</artifactId>
-            <version>${glassfish.version}</version>
+            <version>${jersey.version}</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.jettison</groupId>
@@ -66,14 +71,10 @@
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>
-            <version>${glassfish.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.inject</groupId>
-            <artifactId>jersey-hk2</artifactId>
-            <version>${glassfish.version}</version>
+            <version>${jersey.version}</version>
         </dependency>
 
+
         <!-- For test -->
         <dependency>
             <groupId>junit</groupId>

diff --git a/restconf-client/provider/pom.xml b/restconf-client/provider/pom.xml
index e946719..0dae696 100755 (executable)
--- a/restconf-client/provider/pom.xml
+++ b/restconf-client/provider/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-sse</artifactId>
-            <version>${glassfish.version}</version>
+            <version>${jersey.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
@@ -103,22 +103,16 @@
             <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.inject</groupId>
-            <artifactId>jersey-hk2</artifactId>
-            <version>${glassfish.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-servlet</artifactId>
-            <version>${glassfish.version}</version>
+            <version>${jersey.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-grizzly2-http</artifactId>
-            <version>${glassfish.version}</version>
+            <version>${jersey.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -133,5 +127,11 @@
             <version>2.0.6.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-client</artifactId>
+            <version>${jersey.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>