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>

7 files changed, 12 insertions, 12 deletions

diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
index 6baab04f1..7286ec9d8 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
@@ -25,7 +25,7 @@
 		<groupId>org.onap.appc.parent</groupId>
 		<artifactId>binding-parent</artifactId>
 		<version>2.7.0-SNAPSHOT</version>
-                <relativePath />
+                <relativePath/>
 	</parent>
 
         <groupId>org.onap.appc</groupId>
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/features-appc-rest-adapter/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/features-appc-rest-adapter/pom.xml
index 27f4196a1..062253d8d 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/features-appc-rest-adapter/pom.xml
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/features-appc-rest-adapter/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-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml
index d2418a275..3436de47c 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/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-adapters/appc-rest-adapter/appc-rest-adapter-features/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/pom.xml
index b5479390b..372b87b6f 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/pom.xml
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-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-rest-adapter</module>
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/pom.xml
index 873ccfa60..37f8a032c 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/pom.xml
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/pom.xml
@@ -25,7 +25,7 @@
     <artifactId>odlparent-lite</artifactId>
     <groupId>org.onap.appc.parent</groupId>
     <version>2.7.0-SNAPSHOT</version>
-    <relativePath />
+    <relativePath/>
   </parent>
   <groupId>org.onap.appc</groupId>
   <artifactId>appc-rest-adapter-installer</artifactId>
diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/src/main/resources/scripts/install-feature.sh
index 836910190..f5d3d28e7 100755
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/src/main/resources/scripts/install-feature.sh
@@ -38,7 +38,8 @@ fi
 
 COUNT=0
 while [ $COUNT -lt 10 ]; do
-	${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr
+#	${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr
+sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" 2> /tmp/installErr
 	cat /tmp/installErr
 	if grep -q 'Failed to get the session' /tmp/installErr; then
 		sleep 10
diff --git a/appc-adapters/appc-rest-adapter/pom.xml b/appc-adapters/appc-rest-adapter/pom.xml
index 4e8057161..9a5669c32 100644
--- a/appc-adapters/appc-rest-adapter/pom.xml
+++ b/appc-adapters/appc-rest-adapter/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>