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 /sli | |
| 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 'sli')
| -rwxr-xr-x | sli/installer/pom.xml | 10 | ||||
| -rw-r--r-- | sli/installer/src/main/resources/scripts/install-feature.sh | 9 |
2 files changed, 11 insertions, 8 deletions
diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml index ec2b43cf..e84ae6d0 100755 --- a/sli/installer/pom.xml +++ b/sli/installer/pom.xml @@ -56,7 +56,11 @@ <artifactId>sli-recording</artifactId> <version>${project.version}</version> </dependency> - + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4</artifactId> + <version>${antlr.version}</version> + </dependency> </dependencies> <build> @@ -115,8 +119,8 @@ <useRepositoryLayout>true</useRepositoryLayout> <addParentPoms>false</addParentPoms> <copyPom>false</copyPom> - <includeGroupIds>org.onap.ccsdk.sli</includeGroupIds> - <excludeArtifactIds>dblib-provider</excludeArtifactIds> + <includeGroupIds>org.onap.ccsdk.sli.core,org.antlr</includeGroupIds> + <excludeArtifactIds>utils-provider,dblib-provider</excludeArtifactIds> <scope>provided</scope> </configuration> </execution> diff --git a/sli/installer/src/main/resources/scripts/install-feature.sh b/sli/installer/src/main/resources/scripts/install-feature.sh index 70cd8516..74b95b5c 100644 --- a/sli/installer/src/main/resources/scripts/install-feature.sh +++ b/sli/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} |