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>
---
 appc-oam/appc-oam-bundle/pom.xml                     |  7 ++-----
 appc-oam/appc-oam-features/features-appc-oam/pom.xml |  4 ++--
 appc-oam/appc-oam-features/onap-appc-oam/pom.xml     |  7 +++----
 appc-oam/appc-oam-features/pom.xml                   |  4 ++--
 appc-oam/appc-oam-installer/pom.xml                  |  2 +-
 .../src/main/resources/scripts/install-feature.sh    | 20 +++-----------------
 appc-oam/appc-oam-model/pom.xml                      | 15 ++++++---------
 appc-oam/pom.xml                                     |  2 +-
 8 files changed, 20 insertions(+), 41 deletions(-)

(limited to 'appc-oam')

diff --git a/appc-oam/appc-oam-bundle/pom.xml b/appc-oam/appc-oam-bundle/pom.xml
index 529299773..5970f79e6 100644
--- a/appc-oam/appc-oam-bundle/pom.xml
+++ b/appc-oam/appc-oam-bundle/pom.xml
@@ -21,16 +21,13 @@
 
   ============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-oam-bundle</artifactId>
diff --git a/appc-oam/appc-oam-features/features-appc-oam/pom.xml b/appc-oam/appc-oam-features/features-appc-oam/pom.xml
index 46b5ed419..5a838d8cf 100644
--- a/appc-oam/appc-oam-features/features-appc-oam/pom.xml
+++ b/appc-oam/appc-oam-features/features-appc-oam/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-oam/appc-oam-features/onap-appc-oam/pom.xml b/appc-oam/appc-oam-features/onap-appc-oam/pom.xml
index b005fb85f..60ed80c9b 100644
--- a/appc-oam/appc-oam-features/onap-appc-oam/pom.xml
+++ b/appc-oam/appc-oam-features/onap-appc-oam/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-oam/appc-oam-features/pom.xml b/appc-oam/appc-oam-features/pom.xml
index 07fc12f49..7c2c86db1 100644
--- a/appc-oam/appc-oam-features/pom.xml
+++ b/appc-oam/appc-oam-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-oam</module>
diff --git a/appc-oam/appc-oam-installer/pom.xml b/appc-oam/appc-oam-installer/pom.xml
index eaa7b3766..3360b2f16 100644
--- a/appc-oam/appc-oam-installer/pom.xml
+++ b/appc-oam/appc-oam-installer/pom.xml
@@ -27,7 +27,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-oam/appc-oam-installer/src/main/resources/scripts/install-feature.sh b/appc-oam/appc-oam-installer/src/main/resources/scripts/install-feature.sh
index 47a6ea4dd..5c077e86b 100755
--- a/appc-oam/appc-oam-installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-oam/appc-oam-installer/src/main/resources/scripts/install-feature.sh
@@ -36,13 +36,10 @@ then
 
 fi
 
-#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-#
-
-
 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
@@ -50,15 +47,4 @@ while [ $COUNT -lt 10 ]; do
 		let COUNT=10
 	fi
 	let COUNT=COUNT+1
-done
-COUNT=0
-while [ $COUNT -lt 10 ]; do
-	 2> /tmp/installErr
-		cat /tmp/installErr
-	if grep -q 'Failed to get the session' /tmp/installErr; then
-		sleep 10
-	else
-		let COUNT=10
-	fi
-	let COUNT=COUNT+1
-done
+done
\ No newline at end of file
diff --git a/appc-oam/appc-oam-model/pom.xml b/appc-oam/appc-oam-model/pom.xml
index 6bbb2c58c..e51c7dd99 100644
--- a/appc-oam/appc-oam-model/pom.xml
+++ b/appc-oam/appc-oam-model/pom.xml
@@ -21,14 +21,13 @@
 
   ============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-oam-model</artifactId>
@@ -112,13 +111,11 @@
             <artifactId>yang-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types-2013-07-15</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types-20130715</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
         </dependency>
+
+        
     </dependencies>
     <version>1.7.0-SNAPSHOT</version>
 </project>
diff --git a/appc-oam/pom.xml b/appc-oam/pom.xml
index a97287826..bf237f30c 100644
--- a/appc-oam/pom.xml
+++ b/appc-oam/pom.xml
@@ -27,7 +27,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>
   <artifactId>appc-oam</artifactId>
-- 
cgit 1.2.3-korg