From 77a8961d8a40afb557814802264aaab50291807f Mon Sep 17 00:00:00 2001
From: janani b <janani.b@huawei.com>
Date: Thu, 7 Feb 2019 19:21:55 +0530
Subject: 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>
---
 restapi-call-node/provider/pom.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'restapi-call-node/provider/pom.xml')

diff --git a/restapi-call-node/provider/pom.xml b/restapi-call-node/provider/pom.xml
index 52178540..5b34153d 100755
--- 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>
-- 
cgit 1.2.3-korg