diff options
| author |   Dan Timoney <dtimoney@att.com> | 2018-02-14 14:28:47 -0500 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2018-02-15 10:55:11 -0500 |
| commit | d873c2251b596c5dc15c0899b22ea0b7fdd6a286 (patch) | |
| tree | 7180f1643644be469a4675a514a261c2f6068e81 /dblib | |
| parent | 650bf0cbd81be4af3203103188e69f68fdca3a01 (diff) | |
Fix install issues
Fixed issues in installation scripts
Change-Id: I4bd59ab16b55555ded8d9c2b0e8486d3df88fb44
Issue-ID: CCSDK-175
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'dblib')
| -rwxr-xr-x | dblib/installer/pom.xml | 10 | ||||
| -rw-r--r-- | dblib/installer/src/main/resources/scripts/install-feature.sh | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml index 8d6147b72..3f581957a 100755 --- a/dblib/installer/pom.xml +++ b/dblib/installer/pom.xml @@ -46,7 +46,11 @@ <version>${project.version}</version> </dependency> - + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>${slf4j.version}</version> + </dependency> <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-jdbc</artifactId> @@ -110,8 +114,8 @@ <useRepositoryLayout>true</useRepositoryLayout> <addParentPoms>false</addParentPoms> <copyPom>false</copyPom> - <includeGroupIds>org.onap.ccsdk.sli,org.apache.tomcat</includeGroupIds> - <excludeArtifactIds>sli-common,sli-provider</excludeArtifactIds> + <includeGroupIds>org.onap.ccsdk.sli.core,org.apache.tomcat,org.slf4j</includeGroupIds> + <excludeArtifactIds>utils-provider,slf4j-api</excludeArtifactIds> <scope>provided</scope> </configuration> </execution> diff --git a/dblib/installer/src/main/resources/scripts/install-feature.sh b/dblib/installer/src/main/resources/scripts/install-feature.sh index 16b5be8c4..e16e79a12 100644 --- a/dblib/installer/src/main/resources/scripts/install-feature.sh +++ b/dblib/installer/src/main/resources/scripts/install-feature.sh @@ -2,7 +2,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 @@ -15,5 +14,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} |