aboutsummaryrefslogtreecommitdiffstats
path: root/appc-dg
diff options
context:
space:
mode:
authorTaka Cho <takamune.cho@att.com>2019-10-08 22:11:26 -0400
committerTaka Cho <takamune.cho@att.com>2019-10-08 22:12:07 -0400
commit9c74c5729c9a52268342e583d6493bb19df80aa6 (patch)
treebeab41f47664f62a54b2b72229c449237af5625b /appc-dg
parent701d10c208c24c72e67ac7e555520c6127e0698f (diff)
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>
Diffstat (limited to 'appc-dg')
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-aai/pom.xml2
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-common/pom.xml2
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml3
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-domain-model-lib/pom.xml4
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml2
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml6
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-model/pom.xml19
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-mdsal-store/pom.xml6
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml2
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-shared-features/features-appc-dg-shared/pom.xml4
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-shared-features/onap-appc-dg-shared/pom.xml7
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-shared-features/pom.xml4
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-shared-installer/pom.xml2
-rwxr-xr-xappc-dg/appc-dg-shared/appc-dg-shared-installer/src/main/resources/scripts/install-feature.sh3
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml2
-rw-r--r--appc-dg/appc-dg-shared/pom.xml2
16 files changed, 32 insertions, 38 deletions
diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml b/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml
index 202ba674e..56b381e39 100644
--- a/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-aai/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>
<artifactId>appc-dg-aai</artifactId>
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/pom.xml b/appc-dg/appc-dg-shared/appc-dg-common/pom.xml
index 04aad7804..d478c83e3 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-common/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>
<artifactId>appc-dg-common</artifactId>
diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml b/appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml
index bd6b06a17..8d83547cc 100644
--- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
============LICENSE_START=======================================================
ONAP : APPC
@@ -24,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-dg/appc-dg-shared/appc-dg-domain-model-lib/pom.xml b/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/pom.xml
index 045534e10..73b292b32 100644
--- a/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
============LICENSE_START=======================================================
ONAP : APPC
@@ -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-dg/appc-dg-shared/appc-dg-license-manager/pom.xml b/appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml
index e2b01741c..b6a4c475c 100644
--- a/appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-license-manager/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>
<artifactId>appc-dg-license-manager</artifactId>
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml
index 60fab3cd7..8a12ab791 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml
@@ -21,15 +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>
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-model/pom.xml b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-model/pom.xml
index f8c71aa33..dcf7bf843 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-model/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-model/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
============LICENSE_START=======================================================
ONAP : APPC
@@ -21,14 +21,13 @@
============LICENSE_END=========================================================
-->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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>
@@ -93,13 +92,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>
+
+
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>yang-jmx-generator-plugin</artifactId>
diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/pom.xml b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/pom.xml
index 03c0f6493..cb50b9b31 100644
--- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/pom.xml
@@ -21,15 +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>odlparent-lite</artifactId>
<version>2.7.0-SNAPSHOT</version>
- <relativePath />
+ <relativePath/>
</parent>
<groupId>org.onap.appc</groupId>
<artifactId>appc-dg-mdsal-store</artifactId>
diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml b/appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml
index 9302d20bf..ecfbee6a6 100644
--- a/appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-netconf/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>
<artifactId>appc-dg-netconf</artifactId>
diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-features/features-appc-dg-shared/pom.xml b/appc-dg/appc-dg-shared/appc-dg-shared-features/features-appc-dg-shared/pom.xml
index 88b0fd57a..ddb9e24b4 100644
--- a/appc-dg/appc-dg-shared/appc-dg-shared-features/features-appc-dg-shared/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-shared-features/features-appc-dg-shared/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-dg/appc-dg-shared/appc-dg-shared-features/onap-appc-dg-shared/pom.xml b/appc-dg/appc-dg-shared/appc-dg-shared-features/onap-appc-dg-shared/pom.xml
index 99b0e3e65..5a2d25e42 100644
--- a/appc-dg/appc-dg-shared/appc-dg-shared-features/onap-appc-dg-shared/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-shared-features/onap-appc-dg-shared/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-dg/appc-dg-shared/appc-dg-shared-features/pom.xml b/appc-dg/appc-dg-shared/appc-dg-shared-features/pom.xml
index 951da62c2..93164c4ac 100644
--- a/appc-dg/appc-dg-shared/appc-dg-shared-features/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-shared-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-dg-shared</module>
diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-installer/pom.xml b/appc-dg/appc-dg-shared/appc-dg-shared-installer/pom.xml
index 988eaa449..2384c1dc9 100644
--- a/appc-dg/appc-dg-shared/appc-dg-shared-installer/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-shared-installer/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>
<artifactId>appc-dg-shared-installer</artifactId>
diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-installer/src/main/resources/scripts/install-feature.sh b/appc-dg/appc-dg-shared/appc-dg-shared-installer/src/main/resources/scripts/install-feature.sh
index 836910190..f5d3d28e7 100755
--- a/appc-dg/appc-dg-shared/appc-dg-shared-installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-dg/appc-dg-shared/appc-dg-shared-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-dg/appc-dg-shared/appc-dg-ssh/pom.xml b/appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml
index 28bab1709..aed8ef21b 100644
--- a/appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-ssh/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>
<artifactId>appc-dg-ssh</artifactId>
diff --git a/appc-dg/appc-dg-shared/pom.xml b/appc-dg/appc-dg-shared/pom.xml
index d23294faa..8cbac7848 100644
--- a/appc-dg/appc-dg-shared/pom.xml
+++ b/appc-dg/appc-dg-shared/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>
<artifactId>appc-dg-shared</artifactId>
<packaging>pom</packaging>