From 4869bd53408224dbc5500adc17f63bab497e8d07 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Tue, 24 Apr 2018 11:10:08 -0400 Subject: Fix ansible-adapter dependencies Ansible-adapter pom included unnecessary dependencies, which caused problems when attempting to install in karaf. Change-Id: I7017a25a4d45ab8a75dd7599d10e466ef16d2e6f Issue-ID: CCSDK-251 Signed-off-by: Timoney, Dan (dt5972) --- ansible-adapter/ansible-adapter-bundle/pom.xml | 35 ++-------------------- ansible-adapter/ansible-adapter-installer/pom.xml | 6 ++++ .../src/main/resources/scripts/install-feature.sh | 5 ++-- 3 files changed, 11 insertions(+), 35 deletions(-) (limited to 'ansible-adapter') diff --git a/ansible-adapter/ansible-adapter-bundle/pom.xml b/ansible-adapter/ansible-adapter-bundle/pom.xml index 2a8c744c..912ec471 100644 --- a/ansible-adapter/ansible-adapter-bundle/pom.xml +++ b/ansible-adapter/ansible-adapter-bundle/pom.xml @@ -45,27 +45,20 @@ ${apache.httpcomponents.client.version} - - - - - javax - javaee-api - 7.0 - - org.glassfish.jersey.core jersey-common 2.9.1 + test org.codehaus.jackson jackson-jaxrs 1.9.13 + test @@ -76,6 +69,7 @@ org.mockito mockito-core + test org.onap.ccsdk.sli.core @@ -113,31 +107,8 @@ guava - - diff --git a/ansible-adapter/ansible-adapter-installer/pom.xml b/ansible-adapter/ansible-adapter-installer/pom.xml index 79448f82..daac66ea 100644 --- a/ansible-adapter/ansible-adapter-installer/pom.xml +++ b/ansible-adapter/ansible-adapter-installer/pom.xml @@ -60,6 +60,12 @@ ansible-adapter-bundle ${project.version} + + + javax + javaee-api + 7.0 + diff --git a/ansible-adapter/ansible-adapter-installer/src/main/resources/scripts/install-feature.sh b/ansible-adapter/ansible-adapter-installer/src/main/resources/scripts/install-feature.sh index 05b4ae37..c8214c52 100644 --- a/ansible-adapter/ansible-adapter-installer/src/main/resources/scripts/install-feature.sh +++ b/ansible-adapter/ansible-adapter-installer/src/main/resources/scripts/install-feature.sh @@ -26,7 +26,6 @@ ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client} -ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"} INSTALLERDIR=$(dirname $0) REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip @@ -39,5 +38,5 @@ else exit 1 fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot} +${ODL_KARAF_CLIENT} feature:repo-add ${features.repositories} +${ODL_KARAF_CLIENT} feature:install ${features.boot} -- cgit 1.2.3-korg