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-provider/appc-provider-bundle/pom.xml                  |  5 ++---
 .../appc-provider-features/features-appc-provider/pom.xml   |  3 ++-
 .../appc-provider-features/onap-appc-provider/pom.xml       |  3 ++-
 .../src/main/resources/scripts/install-feature.sh           |  3 ++-
 appc-provider/appc-provider-model/pom.xml                   | 13 +++++--------
 appc-provider/pom.xml                                       |  3 ++-
 6 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'appc-provider')

diff --git a/appc-provider/appc-provider-bundle/pom.xml b/appc-provider/appc-provider-bundle/pom.xml
index 4f64ce662..5f6c67733 100644
--- a/appc-provider/appc-provider-bundle/pom.xml
+++ b/appc-provider/appc-provider-bundle/pom.xml
@@ -21,8 +21,7 @@
 
  ============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>
@@ -170,4 +169,4 @@
             <artifactId>json</artifactId>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/appc-provider/appc-provider-features/features-appc-provider/pom.xml b/appc-provider/appc-provider-features/features-appc-provider/pom.xml
index a32ecb295..4e13e10c8 100644
--- a/appc-provider/appc-provider-features/features-appc-provider/pom.xml
+++ b/appc-provider/appc-provider-features/features-appc-provider/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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>
@@ -23,4 +24,4 @@
     </dependency>
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/appc-provider/appc-provider-features/onap-appc-provider/pom.xml b/appc-provider/appc-provider-features/onap-appc-provider/pom.xml
index 0800fa546..356cb0237 100644
--- a/appc-provider/appc-provider-features/onap-appc-provider/pom.xml
+++ b/appc-provider/appc-provider-features/onap-appc-provider/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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>
@@ -43,4 +44,4 @@
       <version>${project.version}</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/appc-provider/appc-provider-installer/src/main/resources/scripts/install-feature.sh b/appc-provider/appc-provider-installer/src/main/resources/scripts/install-feature.sh
index 836910190..f5d3d28e7 100755
--- a/appc-provider/appc-provider-installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-provider/appc-provider-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-provider/appc-provider-model/pom.xml b/appc-provider/appc-provider-model/pom.xml
index 84d79c1ad..b0f62854a 100644
--- a/appc-provider/appc-provider-model/pom.xml
+++ b/appc-provider/appc-provider-model/pom.xml
@@ -19,8 +19,7 @@
   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>
@@ -109,13 +108,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>
+
+        
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
diff --git a/appc-provider/pom.xml b/appc-provider/pom.xml
index e430cb9b4..4a666a49c 100644
--- a/appc-provider/pom.xml
+++ b/appc-provider/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
   ONAP : APPC
@@ -42,4 +43,4 @@
         <module>appc-provider-installer</module>
         <module>appc-provider-bundle</module>
     </modules>
-</project>
\ No newline at end of file
+</project>
-- 
cgit 1.2.3-korg