summaryrefslogtreecommitdiffstats
path: root/restconf-client/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 /restconf-client/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 'restconf-client/provider')
-rwxr-xr-xrestconf-client/provider/pom.xml18
1 files changed, 9 insertions, 9 deletions
diff --git a/restconf-client/provider/pom.xml b/restconf-client/provider/pom.xml
index e94671902..0dae6960e 100755
--- 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>
@@ -104,21 +104,15 @@
<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>