summaryrefslogtreecommitdiffstats
path: root/restapi-call-node/provider
diff options
context:
space:
mode:
authorjanani b <janani.b@huawei.com>2019-02-07 19:21:55 +0530
committerjanani b <janani.b@huawei.com>2019-02-07 20:44:28 +0530
commit77a8961d8a40afb557814802264aaab50291807f (patch)
tree39524d1a5a30454073689e7bdeafd695ef0ba86b /restapi-call-node/provider
parent02c666d1f6d40158a004a946a507c16e4ad5a70c (diff)
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>
Diffstat (limited to 'restapi-call-node/provider')
-rwxr-xr-xrestapi-call-node/provider/pom.xml17
1 files changed, 9 insertions, 8 deletions
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
@@ -50,14 +50,19 @@
<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>