From: Dan Timoney <dtimoney@att.com>
Date: Tue, 5 Feb 2019 17:39:57 +0000 (+0000)
Subject: Merge "Rename ccsdk-gr-toolkit features.xml name"
X-Git-Tag: 0.4.1~9
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a51e307659b1b3853e1d081064159572070a9a47;hp=e421fb3c892f2d387f364a0a8e15f14132c9547f;p=ccsdk%2Fsli%2Fplugins.git

Merge "Rename ccsdk-gr-toolkit features.xml name"
---

diff --git a/features/ccsdk-sli-plugins-all/pom.xml b/features/ccsdk-sli-plugins-all/pom.xml
index 271cbb18..2c4e4c61 100644
--- a/features/ccsdk-sli-plugins-all/pom.xml
+++ b/features/ccsdk-sli-plugins-all/pom.xml
@@ -25,6 +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>
@@ -32,6 +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/features/ccsdk-restapi-call-node/pom.xml b/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml
index da6b8d0d..638cff39 100644
--- a/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml
+++ b/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml
@@ -18,7 +18,11 @@
 
 
 	<dependencies>
-
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <version>2.1</version>
+        </dependency>
 		<dependency>
 			<groupId>org.onap.ccsdk.sli.core</groupId>
 			<artifactId>ccsdk-sli</artifactId>