From d873c2251b596c5dc15c0899b22ea0b7fdd6a286 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Wed, 14 Feb 2018 14:28:47 -0500
Subject: Fix install issues

Fixed issues in installation scripts

Change-Id: I4bd59ab16b55555ded8d9c2b0e8486d3df88fb44
Issue-ID: CCSDK-175
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 dblib/installer/pom.xml                                       | 10 +++++++---
 dblib/installer/src/main/resources/scripts/install-feature.sh |  5 ++---
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'dblib/installer')

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}
-- 
cgit 1.2.3-korg