From 2d465026f1ef738b1f4e0274c8608317c57bbdf5 Mon Sep 17 00:00:00 2001
From: janani b <janani.b@huawei.com>
Date: Thu, 21 Mar 2019 22:56:13 +0530
Subject: [PATCH] Plugin points to 2.0.1 javax version

RestapiCallNode and RestconfClient in plugins will point to the odl default javax version.
Also RestconfClient is added to plugins-all features.

Issue-ID: CCSDK-1045

Change-Id: I6f7173ec765bc21201f17a3bfd6801c18de610a9
Signed-off-by: janani b <janani.b@huawei.com>
---
 features/ccsdk-sli-plugins-all/pom.xml                     | 9 +++++++++
 restapi-call-node/features/ccsdk-restapi-call-node/pom.xml | 1 -
 restapi-call-node/provider/pom.xml                         | 1 -
 restconf-client/provider/pom.xml                           | 1 -
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/features/ccsdk-sli-plugins-all/pom.xml b/features/ccsdk-sli-plugins-all/pom.xml
index b75833c3..3d5129b3 100644
--- 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 cae47c65..c9c08d66 100644
--- 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 fa69f5d0..b927b4fc 100755
--- 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 ccc9ab86..7cb2993c 100755
--- 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>
-- 
2.16.6