From 9c74c5729c9a52268342e583d6493bb19df80aa6 Mon Sep 17 00:00:00 2001
From: Taka Cho <takamune.cho@att.com>
Date: Tue, 8 Oct 2019 22:11:26 -0400
Subject: Neon SR1 upgrade

change pom files for
ODL Neon SR1 upgrade

Issue-ID: APPC-1749
Change-Id: Ib10ff74852a2b38933c0df034c71e21665430f62
Signed-off-by: Taka Cho <takamune.cho@att.com>
---
 .../features/features-appc-config-encryption-tool/pom.xml          | 4 ++--
 .../features/onap-appc-config-encryption-tool/pom.xml              | 7 +++----
 appc-config/appc-encryption-tool/features/pom.xml                  | 4 ++--
 appc-config/appc-encryption-tool/installer/pom.xml                 | 2 +-
 .../installer/src/main/resources/scripts/install-feature.sh        | 4 ++--
 appc-config/appc-encryption-tool/pom.xml                           | 5 ++---
 appc-config/appc-encryption-tool/provider/pom.xml                  | 5 ++---
 7 files changed, 14 insertions(+), 17 deletions(-)

(limited to 'appc-config/appc-encryption-tool')

diff --git a/appc-config/appc-encryption-tool/features/features-appc-config-encryption-tool/pom.xml b/appc-config/appc-encryption-tool/features/features-appc-config-encryption-tool/pom.xml
index 51e08db98..f6df30f0e 100644
--- a/appc-config/appc-encryption-tool/features/features-appc-config-encryption-tool/pom.xml
+++ b/appc-config/appc-encryption-tool/features/features-appc-config-encryption-tool/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
         <groupId>org.onap.appc.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
         <version>2.7.0-SNAPSHOT</version>
-        <relativePath />
+        <relativePath/>
     </parent>
 
     <groupId>org.onap.appc</groupId>
@@ -33,7 +33,7 @@ limitations under the License.
     <version>1.7.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name></name>
+    <name/>
 
     <dependencies>
         <dependency>
diff --git a/appc-config/appc-encryption-tool/features/onap-appc-config-encryption-tool/pom.xml b/appc-config/appc-encryption-tool/features/onap-appc-config-encryption-tool/pom.xml
index 1790689e3..548845def 100644
--- a/appc-config/appc-encryption-tool/features/onap-appc-config-encryption-tool/pom.xml
+++ b/appc-config/appc-encryption-tool/features/onap-appc-config-encryption-tool/pom.xml
@@ -18,15 +18,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ============LICENSE_END=========================================================
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.appc.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>2.7.0-SNAPSHOT</version>
-        <relativePath />
+        <relativePath/>
     </parent>
 
     <groupId>org.onap.appc</groupId>
@@ -34,7 +33,7 @@ limitations under the License.
     <version>1.7.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name></name>
+    <name/>
 
     <dependencies>
         <dependency>
diff --git a/appc-config/appc-encryption-tool/features/pom.xml b/appc-config/appc-encryption-tool/features/pom.xml
index 448ead342..5a9f58746 100644
--- a/appc-config/appc-encryption-tool/features/pom.xml
+++ b/appc-config/appc-encryption-tool/features/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
         <groupId>org.onap.appc.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
         <version>2.7.0-SNAPSHOT</version>
-        <relativePath />
+        <relativePath/>
     </parent>
 
     <groupId>org.onap.appc</groupId>
@@ -33,7 +33,7 @@ limitations under the License.
     <version>1.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name></name>
+    <name/>
 
     <modules>
         <module>onap-appc-config-encryption-tool</module>
diff --git a/appc-config/appc-encryption-tool/installer/pom.xml b/appc-config/appc-encryption-tool/installer/pom.xml
index b271bd504..6dabd68e5 100644
--- a/appc-config/appc-encryption-tool/installer/pom.xml
+++ b/appc-config/appc-encryption-tool/installer/pom.xml
@@ -25,7 +25,7 @@
         <groupId>org.onap.appc.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
         <version>2.7.0-SNAPSHOT</version>
-        <relativePath />
+        <relativePath/>
     </parent>
   <groupId>org.onap.appc</groupId>
 
diff --git a/appc-config/appc-encryption-tool/installer/src/main/resources/scripts/install-feature.sh b/appc-config/appc-encryption-tool/installer/src/main/resources/scripts/install-feature.sh
index a42126ee2..55584589f 100755
--- a/appc-config/appc-encryption-tool/installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-config/appc-encryption-tool/installer/src/main/resources/scripts/install-feature.sh
@@ -33,5 +33,5 @@ then
 
 fi
 
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-
+#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
+sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}"
diff --git a/appc-config/appc-encryption-tool/pom.xml b/appc-config/appc-encryption-tool/pom.xml
index 76f55729c..2ce9ac7c0 100644
--- a/appc-config/appc-encryption-tool/pom.xml
+++ b/appc-config/appc-encryption-tool/pom.xml
@@ -19,13 +19,12 @@
   limitations under the License.
   ============LICENSE_END=========================================================
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.onap.appc.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
         <version>2.7.0-SNAPSHOT</version>
-        <relativePath />
+        <relativePath/>
     </parent>
   <groupId>org.onap.appc</groupId>
 
diff --git a/appc-config/appc-encryption-tool/provider/pom.xml b/appc-config/appc-encryption-tool/provider/pom.xml
index 1c8aefc73..6af583e8c 100644
--- a/appc-config/appc-encryption-tool/provider/pom.xml
+++ b/appc-config/appc-encryption-tool/provider/pom.xml
@@ -19,14 +19,13 @@
   limitations under the License.
   ============LICENSE_END=========================================================
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.onap.appc.parent</groupId>
 		<artifactId>binding-parent</artifactId>
 		<version>2.7.0-SNAPSHOT</version>
-                <relativePath />
+                <relativePath/>
 	</parent>
         <groupId>org.onap.appc</groupId>
     <artifactId>appc-config-encryption-tool-provider</artifactId>
-- 
cgit 1.2.3-korg