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>

9 files changed, 26 insertions, 33 deletions

diff --git a/appc-inbound/appc-interfaces-service/bundle/pom.xml b/appc-inbound/appc-interfaces-service/bundle/pom.xml
index 999761c40..dcb0b385a 100644
--- a/appc-inbound/appc-interfaces-service/bundle/pom.xml
+++ b/appc-inbound/appc-interfaces-service/bundle/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-interfaces-service-bundle</artifactId>
diff --git a/appc-inbound/appc-interfaces-service/features/features-appc-interfaces-service/pom.xml b/appc-inbound/appc-interfaces-service/features/features-appc-interfaces-service/pom.xml
index c83a4453a..e0228f040 100644
--- a/appc-inbound/appc-interfaces-service/features/features-appc-interfaces-service/pom.xml
+++ b/appc-inbound/appc-interfaces-service/features/features-appc-interfaces-service/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-inbound/appc-interfaces-service/features/onap-appc-interfaces-service/pom.xml b/appc-inbound/appc-interfaces-service/features/onap-appc-interfaces-service/pom.xml
index 3917771ff..c75f0687a 100644
--- a/appc-inbound/appc-interfaces-service/features/onap-appc-interfaces-service/pom.xml
+++ b/appc-inbound/appc-interfaces-service/features/onap-appc-interfaces-service/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-inbound/appc-interfaces-service/features/pom.xml b/appc-inbound/appc-interfaces-service/features/pom.xml
index 2ecbe4391..4d1e65b17 100644
--- a/appc-inbound/appc-interfaces-service/features/pom.xml
+++ b/appc-inbound/appc-interfaces-service/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-interfaces-service</module>
diff --git a/appc-inbound/appc-interfaces-service/installer/pom.xml b/appc-inbound/appc-interfaces-service/installer/pom.xml
index fc608e995..cb9fdaa54 100644
--- a/appc-inbound/appc-interfaces-service/installer/pom.xml
+++ b/appc-inbound/appc-interfaces-service/installer/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>odlparent-lite</artifactId>
         <version>2.7.0-SNAPSHOT</version>
-        <relativePath />
+        <relativePath/>
     </parent>
   <groupId>org.onap.appc</groupId>
     <artifactId>appc-interfaces-service-installer</artifactId>
diff --git a/appc-inbound/appc-interfaces-service/installer/resources/scripts/install-feature.sh b/appc-inbound/appc-interfaces-service/installer/resources/scripts/install-feature.sh
index a42126ee2..55584589f 100755
--- a/appc-inbound/appc-interfaces-service/installer/resources/scripts/install-feature.sh
+++ b/appc-inbound/appc-interfaces-service/installer/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-inbound/appc-interfaces-service/installer/src/main/resources/scripts/install-feature.sh b/appc-inbound/appc-interfaces-service/installer/src/main/resources/scripts/install-feature.sh
index 06e8f20d3..e7eb9b5ed 100755
--- a/appc-inbound/appc-interfaces-service/installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-inbound/appc-interfaces-service/installer/src/main/resources/scripts/install-feature.sh
@@ -36,5 +36,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-inbound/appc-interfaces-service/model/pom.xml b/appc-inbound/appc-interfaces-service/model/pom.xml
index 7f2591ce5..a5da6121b 100644
--- a/appc-inbound/appc-interfaces-service/model/pom.xml
+++ b/appc-inbound/appc-interfaces-service/model/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-interfaces-service-model</artifactId>
@@ -146,7 +145,7 @@
                                         </goals>
                                     </pluginExecutionFilter>
                                     <action>
-                                        <ignore />
+                                        <ignore/>
                                     </action>
                                 </pluginExecution>
                             </pluginExecutions>
@@ -166,13 +165,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>
-            </dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
+        </dependency>
+
+        
     </dependencies>
     <version>1.7.0-SNAPSHOT</version>
 </project>
diff --git a/appc-inbound/appc-interfaces-service/pom.xml b/appc-inbound/appc-interfaces-service/pom.xml
index 50e4367f1..4dcdbcaf3 100644
--- a/appc-inbound/appc-interfaces-service/pom.xml
+++ b/appc-inbound/appc-interfaces-service/pom.xml
@@ -19,15 +19,14 @@
   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">
     <modelVersion>4.0.0</modelVersion>
 
     <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>
 
@@ -103,7 +102,7 @@
                                         </goals>
                                     </pluginExecutionFilter>
                                     <action>
-                                        <ignore></ignore>
+                                        <ignore/>
                                     </action>
                                 </pluginExecution>
                             </pluginExecutions>