Fix install issues

Fixed issues in installation scripts

Change-Id: I4bd59ab16b55555ded8d9c2b0e8486d3df88fb44
Issue-ID: CCSDK-175
Signed-off-by: Dan Timoney <dtimoney@att.com>

diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml
index 8d6147b..3f58195 100755 (executable)
--- 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 16b5be8..e16e79a 100644 (file)
--- 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 a16b6a6..6cc9e5e 100755 (executable)
--- 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 70cd851..74b95b5 100644 (file)
--- 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 ec2b43c..e84ae6d 100755 (executable)
--- 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 70cd851..74b95b5 100644 (file)
--- 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 1c0704a..f11b27c 100755 (executable)
--- 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 70cd851..74b95b5 100644 (file)
--- 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 0a274ed..c09029f 100755 (executable)
--- 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 290524e..d9da979 100755 (executable)
--- 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 70cd851..74b95b5 100644 (file)
--- 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 16b5be8..e16e79a 100644 (file)
--- 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}