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 271cbb1..2c4e4c6 100644 (file)
--- 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 da6b8d0..638cff3 100644 (file)
--- 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>