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>

2 files changed, 151 insertions, 146 deletions

diff --git a/appc-core/appc-core-installer/pom.xml b/appc-core/appc-core-installer/pom.xml
index 1fe9c9cc2..0831712dc 100644
--- a/appc-core/appc-core-installer/pom.xml
+++ b/appc-core/appc-core-installer/pom.xml
@@ -1,144 +1,145 @@
-<!--

-  ============LICENSE_START=======================================================

-  ONAP : APPC

-  ================================================================================

-  Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.

-  ================================================================================

-  Licensed under the Apache License, Version 2.0 (the "License");

-  you may not use this file except in compliance with the License.

-  You may obtain a copy of the License at

-  

-       http://www.apache.org/licenses/LICENSE-2.0

-  

-  Unless required by applicable law or agreed to in writing, software

-  distributed under the License is distributed on an "AS IS" BASIS,

-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  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">

-  <modelVersion>4.0.0</modelVersion>

-  <parent>

-    <groupId>org.onap.appc</groupId>

-    <artifactId>appc-core</artifactId>

-    <version>1.7.0-SNAPSHOT</version>

-  </parent>

-  <artifactId>appc-core-installer</artifactId>

-  <packaging>pom</packaging>

-  

-  <properties>

-    <application.name>appc-core</application.name>

-    <features.boot>appc-core</features.boot>

-    

-    <!-- SEPARATED FEATURE INSTALLS -->

-    <features.repo.core>mvn:org.onap.appc/onap-appc-core/${project.version}/xml/features</features.repo.core>

-    <features.repo.common>mvn:org.onap.appc/onap-appc-common/${project.version}/xml/features</features.repo.common>

-  </properties>

-  <dependencies>

-    <dependency>

-        <groupId>org.onap.appc</groupId>

-        <artifactId>onap-appc-common</artifactId>

-        <version>${project.version}</version>

-        <type>xml</type>

-        <classifier>features</classifier>

-    </dependency>

-    <dependency>

-        <groupId>org.onap.appc</groupId>

-        <artifactId>onap-appc-core</artifactId>

-        <version>${project.version}</version>

-        <type>xml</type>

-        <classifier>features</classifier>

-    </dependency>

-  </dependencies>

-    <build>

-    <plugins>

-      <plugin>

-        <artifactId>maven-assembly-plugin</artifactId>

-        <executions>

-          <execution>

-            <id>maven-repo-zip</id>

-            <goals>

-              <goal>single</goal>

-            </goals>

-            <phase>package</phase>

-            <configuration>

-              <appendAssemblyId>false</appendAssemblyId>

-              <attach>false</attach>

-              <finalName>stage/${application.name}-${project.version}</finalName>

-              <descriptors>

-                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>

-              </descriptors>

-            </configuration>

-          </execution>

-          <execution>

-            <id>installer-zip</id>

-            <goals>

-              <goal>single</goal>

-            </goals>

-            <phase>package</phase>

-            <configuration>

-              <appendAssemblyId>false</appendAssemblyId>

-              <attach>true</attach>

-              <finalName>${application.name}-${project.version}</finalName>

-              <descriptors>

-                <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>

-              </descriptors>

-            </configuration>

-          </execution>

-        </executions>

-      </plugin>

-      <plugin>

-        <groupId>org.apache.maven.plugins</groupId>

-        <artifactId>maven-dependency-plugin</artifactId>

-        <executions>

-          <execution>

-            <id>copy-dependencies</id>

-            <goals>

-              <goal>copy-dependencies</goal>

-            </goals>

-            <phase>prepare-package</phase>

-            <configuration>

-              <transitive>false</transitive>

-              <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>

-              <overWriteReleases>false</overWriteReleases>

-              <overWriteSnapshots>true</overWriteSnapshots>

-              <overWriteIfNewer>true</overWriteIfNewer>

-              <useRepositoryLayout>true</useRepositoryLayout>

-              <addParentPoms>false</addParentPoms>

-              <copyPom>false</copyPom>

-              <excludeGroupIds>org.opendaylight</excludeGroupIds>

-              <scope>provided</scope>

-            </configuration>

-          </execution>

-        </executions>

-      </plugin>

-      <plugin>

-        <artifactId>maven-resources-plugin</artifactId>

-        <executions>

-          <execution>

-            <id>copy-version</id>

-            <goals>

-              <goal>copy-resources</goal>

-            </goals>

-            <!-- here the phase you need -->

-            <phase>validate</phase>

-            <configuration>

-              <outputDirectory>${basedir}/target/stage</outputDirectory>

-              <resources>

-                <resource>

-                  <directory>src/main/resources/scripts</directory>

-                  <includes>

-                    <include>install-feature.sh</include>

-                  </includes>

-                  <filtering>true</filtering>

-                </resource>

-              </resources>

-            </configuration>

-          </execution>

-        </executions>

-      </plugin>

-    </plugins>

-  </build>

-    <version>1.7.0-SNAPSHOT</version>

-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  ONAP : APPC
+  ================================================================================
+  Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.onap.appc</groupId>
+    <artifactId>appc-core</artifactId>
+    <version>1.7.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>appc-core-installer</artifactId>
+  <packaging>pom</packaging>
+  
+  <properties>
+    <application.name>appc-core</application.name>
+    <features.boot>appc-core</features.boot>
+    
+    <!-- SEPARATED FEATURE INSTALLS -->
+    <features.repo.core>mvn:org.onap.appc/onap-appc-core/${project.version}/xml/features</features.repo.core>
+    <features.repo.common>mvn:org.onap.appc/onap-appc-common/${project.version}/xml/features</features.repo.common>
+  </properties>
+  <dependencies>
+    <dependency>
+        <groupId>org.onap.appc</groupId>
+        <artifactId>onap-appc-common</artifactId>
+        <version>${project.version}</version>
+        <type>xml</type>
+        <classifier>features</classifier>
+    </dependency>
+    <dependency>
+        <groupId>org.onap.appc</groupId>
+        <artifactId>onap-appc-core</artifactId>
+        <version>${project.version}</version>
+        <type>xml</type>
+        <classifier>features</classifier>
+    </dependency>
+  </dependencies>
+    <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>maven-repo-zip</id>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <appendAssemblyId>false</appendAssemblyId>
+              <attach>false</attach>
+              <finalName>stage/${application.name}-${project.version}</finalName>
+              <descriptors>
+                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+          <execution>
+            <id>installer-zip</id>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <appendAssemblyId>false</appendAssemblyId>
+              <attach>true</attach>
+              <finalName>${application.name}-${project.version}</finalName>
+              <descriptors>
+                <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <phase>prepare-package</phase>
+            <configuration>
+              <transitive>false</transitive>
+              <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+              <overWriteReleases>false</overWriteReleases>
+              <overWriteSnapshots>true</overWriteSnapshots>
+              <overWriteIfNewer>true</overWriteIfNewer>
+              <useRepositoryLayout>true</useRepositoryLayout>
+              <addParentPoms>false</addParentPoms>
+              <copyPom>false</copyPom>
+              <excludeGroupIds>org.opendaylight</excludeGroupIds>
+              <scope>provided</scope>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-version</id>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <!-- here the phase you need -->
+            <phase>validate</phase>
+            <configuration>
+              <outputDirectory>${basedir}/target/stage</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>src/main/resources/scripts</directory>
+                  <includes>
+                    <include>install-feature.sh</include>
+                  </includes>
+                  <filtering>true</filtering>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+    <version>1.7.0-SNAPSHOT</version>
+</project>
diff --git a/appc-core/appc-core-installer/src/main/resources/scripts/install-feature.sh b/appc-core/appc-core-installer/src/main/resources/scripts/install-feature.sh
index 229fcc091..edf2c017c 100755
--- a/appc-core/appc-core-installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-core/appc-core-installer/src/main/resources/scripts/install-feature.sh
@@ -36,8 +36,12 @@ then
 
 fi
 
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.common}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.core}
+sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repo.common}"
+sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repo.core}"
+
+#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.common}
+
+#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.core}
 
 
 #COUNT=0