diff options
| author |   Dan Timoney <dtimoney@att.com> | 2018-02-27 18:36:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-02-27 18:36:47 +0000 |
| commit | d235f8f32910d20362f48748b6fb9658ab6c93b2 (patch) | |
| tree | e7406d8a1627cf25ff1f62ca52ebfec47bac0c12 | |
| parent | e920a1343b4aa55f95cd3db2595f52cbbea73399 (diff) | |
| parent | 4f380043c90d234d563b1011a281b41623148dae (diff) | |
Merge "Fix installation issues"
| -rw-r--r-- | aai-service/features/ccsdk-aai-service/pom.xml | 4 | ||||
| -rw-r--r-- | aai-service/installer/src/main/resources/scripts/install-feature.sh | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/aai-service/features/ccsdk-aai-service/pom.xml b/aai-service/features/ccsdk-aai-service/pom.xml index 48a79add7..3e1a5059e 100644 --- a/aai-service/features/ccsdk-aai-service/pom.xml +++ b/aai-service/features/ccsdk-aai-service/pom.xml @@ -49,12 +49,12 @@ </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore-osgi</artifactId> + <artifactId>httpcore</artifactId> <version>${apache.httpcomponents.core.version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient-osgi</artifactId> + <artifactId>httpclient</artifactId> <version>${apache.httpcomponents.client.version}</version> </dependency> <dependency> diff --git a/aai-service/installer/src/main/resources/scripts/install-feature.sh b/aai-service/installer/src/main/resources/scripts/install-feature.sh index df03392c8..0eab001d5 100644 --- a/aai-service/installer/src/main/resources/scripts/install-feature.sh +++ b/aai-service/installer/src/main/resources/scripts/install-feature.sh @@ -10,9 +10,9 @@ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -23,7 +23,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 @@ -36,5 +35,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} |