summaryrefslogtreecommitdiffstats
path: root/filters
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2018-02-14 14:28:47 -0500
committerDan Timoney <dtimoney@att.com>2018-02-15 10:55:11 -0500
commitd873c2251b596c5dc15c0899b22ea0b7fdd6a286 (patch)
tree7180f1643644be469a4675a514a261c2f6068e81 /filters
parent650bf0cbd81be4af3203103188e69f68fdca3a01 (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 'filters')
-rwxr-xr-xfilters/installer/pom.xml6
-rw-r--r--filters/installer/src/main/resources/scripts/install-feature.sh9
2 files changed, 7 insertions, 8 deletions
diff --git a/filters/installer/pom.xml b/filters/installer/pom.xml
index a16b6a60c..6cc9e5e34 100755
--- a/filters/installer/pom.xml
+++ b/filters/installer/pom.xml
@@ -19,7 +19,7 @@
<properties>
<application.name>ccsdk-filters</application.name>
<features.boot>${application.name}</features.boot>
- <features.repositories>mvn:org.onap.ccsdk.sli.core/filters-features/${project.version}/xml/features</features.repositories>
+ <features.repositories>mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features</features.repositories>
<include.transitive.dependencies>false</include.transitive.dependencies>
</properties>
@@ -104,8 +104,8 @@
<useRepositoryLayout>true</useRepositoryLayout>
<addParentPoms>false</addParentPoms>
<copyPom>false</copyPom>
- <includeGroupIds>org.onap.ccsdk.sli</includeGroupIds>
- <excludeArtifactIds>sli-common,sli-provider</excludeArtifactIds>
+ <includeGroupIds>org.onap.ccsdk.sli.core</includeGroupIds>
+ <excludeArtifactIds>sli-common,sli-provider,utils-provider,dblib-provider</excludeArtifactIds>
<scope>provided</scope>
</configuration>
</execution>
diff --git a/filters/installer/src/main/resources/scripts/install-feature.sh b/filters/installer/src/main/resources/scripts/install-feature.sh
index 70cd85162..74b95b5c8 100644
--- a/filters/installer/src/main/resources/scripts/install-feature.sh
+++ b/filters/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}