diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-02-01 15:59:45 -0500 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-02-04 17:59:19 -0500 |
| commit | d53b22a833abf7a74257024bd0701b03774ebc42 (patch) | |
| tree | bd859b5852abc14f68ee8f9422eeff3adbc1117f | |
| parent | ce531cc96ecba4d48852ad36fe9d1ab461240596 (diff) | |
Fix restapi-call-node javax.ws.rs version
Fix version of javax.ws.rs in feature.xml file for restapi-call-node
to be 2.1.
Change-Id: Ia2a4f065dff2fea8658d7d9e0f2915112a68a353
Issue-ID: CCSDK-489
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Disable broken restapi-call-node
Enabling restapi-call-node in Fluorine breaks the container due to a
version conflict in jersey (restapi-call-node needs version 2.27,
opendaylight aaa-shiro module requires 2.25.2)
Change-Id: I2ed1810eeeb922e1df76ec580a5424832f5af721
Issue-ID: CCSDK-489
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
| -rw-r--r-- | features/ccsdk-sli-plugins-all/pom.xml | 2 | ||||
| -rw-r--r-- | restapi-call-node/features/ccsdk-restapi-call-node/pom.xml | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/features/ccsdk-sli-plugins-all/pom.xml b/features/ccsdk-sli-plugins-all/pom.xml index 271cbb18..2c4e4c61 100644 --- 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 da6b8d0d..638cff39 100644 --- 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> |