summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-03-24 14:53:09 +0000
committerGerrit Code Review <gerrit@onap.org>2019-03-24 14:53:09 +0000
commit8f3b67cdcf11d2fb661da98a22d9d532eb13e809 (patch)
tree494b74b6a1281066a7ad00b0a3c98ab6b5ee90ff
parentd9080716861ba46ea86fc7aebd4d4c42eea97016 (diff)
parent2d465026f1ef738b1f4e0274c8608317c57bbdf5 (diff)
Merge "Plugin points to 2.0.1 javax version"
-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 0cd756eda..c589ba3f0 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 a28cbbe4c..0bf2a023d 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 1d724c646..c5556011a 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 0d5ee180a..e6da0cd13 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>