diff options
| author |   Dan Timoney <dt5972@att.com> | 2018-04-25 16:52:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-25 16:52:22 +0000 |
| commit | 063a0a49c800770154ed072fa2335e80836443bb (patch) | |
| tree | 86f30c165a7038c81a3e37376ac4b37142578c8a /ansible-adapter/ansible-adapter-installer | |
| parent | 8ed112cc25f33315e453b238478c4a1fde3e257e (diff) | |
| parent | 4869bd53408224dbc5500adc17f63bab497e8d07 (diff) | |
Merge "Fix ansible-adapter dependencies"v0.2.1
Diffstat (limited to 'ansible-adapter/ansible-adapter-installer')
| -rw-r--r-- | ansible-adapter/ansible-adapter-installer/pom.xml | 6 | ||||
| -rw-r--r-- | ansible-adapter/ansible-adapter-installer/src/main/resources/scripts/install-feature.sh | 5 |
2 files changed, 8 insertions, 3 deletions
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 @@ <artifactId>ansible-adapter-bundle</artifactId> <version>${project.version}</version> </dependency> + + <dependency> + <groupId>javax</groupId> + <artifactId>javaee-api</artifactId> + <version>7.0</version> + </dependency> </dependencies> <build> <plugins> 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} |