summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjanani b <janani.b@huawei.com>2019-03-21 22:56:13 +0530
committerjanani b <janani.b@huawei.com>2019-03-22 19:24:12 +0530
commit2d465026f1ef738b1f4e0274c8608317c57bbdf5 (patch)
treee9c13fec852dea730a228ba461eddc17c4a4d33b
parentc43923c37deb4b74f1a011d08688f2f9fc3fe5e1 (diff)
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>
-rw-r--r--features/ccsdk-sli-plugins-all/pom.xml9
-rw-r--r--restapi-call-node/features/ccsdk-restapi-call-node/pom.xml1
-rwxr-xr-xrestapi-call-node/provider/pom.xml1
-rwxr-xr-xrestconf-client/provider/pom.xml1
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 b75833c38..3d5129b37 100644
--- a/features/ccsdk-sli-plugins-all/pom.xml
+++ b/features/ccsdk-sli-plugins-all/pom.xml
@@ -36,11 +36,20 @@
<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>
<version>${project.version}</version>
<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 cae47c65f..c9c08d669 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 fa69f5d0e..b927b4fc5 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 ccc9ab869..7cb2993c1 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>