From 37d6468cc670045ab4ff1ee23315739a429aa5e3 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Thu, 21 Sep 2017 16:07:02 -0400
Subject: Install sdnc-core utils as karaf package

New utils jar was added in another change, but wasn't bundled as a karaf
feature and was not being installed in container. This broke odlsli
docker container. This change wraps that util package as a new
feature (sdnc-core-utils).

Change-Id: Ie8c1d608e2c67aa1635837bc400cec942761c81c
Issue-ID: CCSDK-54
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 .../src/main/resources/scripts/install-feature.sh     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 utils/installer/src/main/resources/scripts/install-feature.sh

(limited to 'utils/installer/src/main/resources/scripts/install-feature.sh')

diff --git a/utils/installer/src/main/resources/scripts/install-feature.sh b/utils/installer/src/main/resources/scripts/install-feature.sh
new file mode 100644
index 000000000..16b5be8c4
--- /dev/null
+++ b/utils/installer/src/main/resources/scripts/install-feature.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+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
+
+if [ -f ${REPOZIP} ]
+then
+	unzip -d ${ODL_HOME} ${REPOZIP}
+else
+	echo "ERROR : repo zip ($REPOZIP) not found"
+	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}
-- 
cgit 1.2.3-korg


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 +++++++---
 .../installer/src/main/resources/scripts/install-feature.sh |  5 ++---
 filters/installer/pom.xml                                   |  6 +++---
 .../installer/src/main/resources/scripts/install-feature.sh |  9 ++++-----
 sli/installer/pom.xml                                       | 10 +++++++---
 sli/installer/src/main/resources/scripts/install-feature.sh |  9 ++++-----
 sliPluginUtils/installer/pom.xml                            | 13 ++++++++-----
 .../installer/src/main/resources/scripts/install-feature.sh |  9 ++++-----
 sliPluginUtils/provider/pom.xml                             |  2 +-
 sliapi/installer/pom.xml                                    |  3 +--
 .../installer/src/main/resources/scripts/install-feature.sh |  9 ++++-----
 .../installer/src/main/resources/scripts/install-feature.sh |  5 ++---
 12 files changed, 47 insertions(+), 43 deletions(-)

(limited to 'utils/installer/src/main/resources/scripts/install-feature.sh')

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}
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}
diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml
index ec2b43cff..e84ae6d09 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 70cd85162..74b95b5c8 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}
diff --git a/sliPluginUtils/installer/pom.xml b/sliPluginUtils/installer/pom.xml
index 1c0704af6..f11b27ca3 100755
--- a/sliPluginUtils/installer/pom.xml
+++ b/sliPluginUtils/installer/pom.xml
@@ -9,7 +9,7 @@
 		<relativePath/>
 	</parent>
 
-	<groupId>org.onap.ccsdl.sli.core</groupId>
+	<groupId>org.onap.ccsdk.sli.core</groupId>
 	<artifactId>sliPluginUtils-installer</artifactId>
 	<version>0.2.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
@@ -19,7 +19,7 @@
 	<properties>
 		<application.name>ccsdk-sliPluginUtils</application.name>
 		<features.boot>${application.name}</features.boot>
-		<features.repositories>mvn:org.onap.ccsdk.sli.core/sliPluginUtils-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>
 
@@ -45,7 +45,11 @@
 			<version>${project.version}</version>
 		</dependency>
 
-
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.1</version>
+        </dependency>
 	</dependencies>
 
 	<build>
@@ -104,8 +108,7 @@
 							<useRepositoryLayout>true</useRepositoryLayout>
 							<addParentPoms>false</addParentPoms>
 							<copyPom>false</copyPom>
-							<includeGroupIds>org.onap.ccsdk.sli</includeGroupIds>
-							<excludeArtifactIds>sli-common,sli-provider,dblib-provider</excludeArtifactIds>
+							<includeArtifactIds>sliPluginUtils-provider,ccsdk-sliPluginUtils,features-sliPluginUtils,commons-text</includeArtifactIds>
 							<scope>provided</scope>
 						</configuration>
 					</execution>
diff --git a/sliPluginUtils/installer/src/main/resources/scripts/install-feature.sh b/sliPluginUtils/installer/src/main/resources/scripts/install-feature.sh
index 70cd85162..74b95b5c8 100644
--- a/sliPluginUtils/installer/src/main/resources/scripts/install-feature.sh
+++ b/sliPluginUtils/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}
diff --git a/sliPluginUtils/provider/pom.xml b/sliPluginUtils/provider/pom.xml
index 0a274edd0..c09029fa0 100755
--- a/sliPluginUtils/provider/pom.xml
+++ b/sliPluginUtils/provider/pom.xml
@@ -58,7 +58,7 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.6.2</version>
+			<version>2.7</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
diff --git a/sliapi/installer/pom.xml b/sliapi/installer/pom.xml
index 290524e32..d9da9794e 100755
--- a/sliapi/installer/pom.xml
+++ b/sliapi/installer/pom.xml
@@ -104,8 +104,7 @@
 							<useRepositoryLayout>true</useRepositoryLayout>
 							<addParentPoms>false</addParentPoms>
 							<copyPom>false</copyPom>
-							<includeGroupIds>org.onap.ccsdk.sli.core</includeGroupIds>
-							<excludeArtifactIds>sli-common,sli-provider,dblib-provider</excludeArtifactIds>
+							<includeArtifactIds>sliapi-model,sliapi-provider,ccsdk-sliapi,features-sliapi</includeArtifactIds>
 							<scope>provided</scope>
 						</configuration>
 					</execution>
diff --git a/sliapi/installer/src/main/resources/scripts/install-feature.sh b/sliapi/installer/src/main/resources/scripts/install-feature.sh
index 70cd85162..74b95b5c8 100644
--- a/sliapi/installer/src/main/resources/scripts/install-feature.sh
+++ b/sliapi/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}
diff --git a/utils/installer/src/main/resources/scripts/install-feature.sh b/utils/installer/src/main/resources/scripts/install-feature.sh
index 16b5be8c4..e16e79a12 100644
--- a/utils/installer/src/main/resources/scripts/install-feature.sh
+++ b/utils/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