Merge "Plugin points to 2.0.1 javax version"

diff --git a/features/ccsdk-sli-plugins-all/pom.xml b/features/ccsdk-sli-plugins-all/pom.xml
index 0cd756e..c589ba3 100644 (file)
--- a/features/ccsdk-sli-plugins-all/pom.xml
+++ b/features/ccsdk-sli-plugins-all/pom.xml
@@ -34,6 +34,14 @@
                        <classifier>features</classifier>
                </dependency>
 
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>ccsdk-restconf-client</artifactId>
+                       <version>${project.version}</version>
+                       <type>xml</type>
+                       <classifier>features</classifier>
+               </dependency>
+
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>ccsdk-template-node</artifactId>
@@ -41,6 +49,7 @@
                        <type>xml</type>
                        <classifier>features</classifier>
                </dependency>
+
                <dependency>
                        <groupId>${project.groupId}</groupId>
                        <artifactId>ccsdk-sshapi-call-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 a28cbbe..0bf2a02 100644 (file)
--- a/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml
+++ b/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml
@@ -21,7 +21,6 @@
         <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>

diff --git a/restapi-call-node/provider/pom.xml b/restapi-call-node/provider/pom.xml
index 1d724c6..c555601 100755 (executable)
--- a/restapi-call-node/provider/pom.xml
+++ b/restapi-call-node/provider/pom.xml
@@ -35,7 +35,6 @@
         <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>

diff --git a/restconf-client/provider/pom.xml b/restconf-client/provider/pom.xml
index 0d5ee18..e6da0cd 100755 (executable)
--- a/restconf-client/provider/pom.xml
+++ b/restconf-client/provider/pom.xml
@@ -41,7 +41,6 @@
         <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>