From b2eb9ed53fabb824f8de08f4c3b8be27e404aeb8 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Tue, 20 Aug 2019 15:40:38 -0400
Subject: Port to Neon

Port sdnc/oam to Neon version of CCSDK and SDNC artifacts

Change-Id: I4a195d0c5e993c433c0c03a898d60521c7df2a9f
Issue-ID: SDNC-850
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

Former-commit-id: 18aff1a38583891cbcddca7242e2326b80d88a8d
---
 installation/admportal/pom.xml      | 10 +++++-----
 installation/ansible-server/pom.xml | 10 +++++-----
 installation/dmaap-listener/pom.xml |  6 +++---
 installation/pom.xml                |  4 ++--
 installation/sdnc/pom.xml           | 10 +++++-----
 installation/ueb-listener/pom.xml   |  6 +++---
 6 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'installation')

diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index 1d48c3b7..8475b1c7 100644
--- a/installation/admportal/pom.xml
+++ b/installation/admportal/pom.xml
@@ -4,14 +4,14 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.3.2</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-admportal</artifactId>
-    <version>1.6.2-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates admportal Docker container</description>
@@ -20,7 +20,7 @@
         <image.name>onap/admportal-sdnc-image</image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
-        <ccsdk.docker.version>0.4-STAGING-latest</ccsdk.docker.version>
+        <ccsdk.docker.version>0.6-STAGING-latest</ccsdk.docker.version>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
 
@@ -46,7 +46,7 @@
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>0.16.5</version>
+                <version>0.28.0</version>
                 <inherited>false</inherited>
                 <configuration>
 
@@ -56,7 +56,7 @@
                             <build>
                                 <cleanup>try</cleanup>
                                 <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+                                <dockerFile>Dockerfile</dockerFile>
                                 <tags>
                                     <tag>${project.docker.latestminortag.version}</tag>
                                     <tag>${project.docker.latestfulltag.version}</tag>
diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml
index 8e38a4c8..da2c4453 100644
--- a/installation/ansible-server/pom.xml
+++ b/installation/ansible-server/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.3.2</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-ansible-server</artifactId>
-    <version>1.6.2-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates ansible-server Docker container</description>
@@ -19,7 +19,7 @@
         <image.name>onap/sdnc-ansible-server-image</image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
-        <ccsdk.docker.version>0.4-STAGING-latest</ccsdk.docker.version>
+        <ccsdk.docker.version>0.6-STAGING-latest</ccsdk.docker.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
@@ -79,7 +79,7 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.16.5</version>
+                        <version>0.28.0</version>
                         <inherited>false</inherited>
                         <configuration>
                             <images>
@@ -88,7 +88,7 @@
                                     <build>
                                         <cleanup>try</cleanup>
                                         <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                        <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+                                        <dockerFile>Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${project.docker.latestminortag.version}</tag>
                                             <tag>${project.docker.latestfulltag.version}</tag>
diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml
index 62ed8386..2c8bfa8c 100644
--- a/installation/dmaap-listener/pom.xml
+++ b/installation/dmaap-listener/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.3.2</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-dmaap-listener</artifactId>
-    <version>1.6.2-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates dmaap-listener Docker container</description>
@@ -19,7 +19,7 @@
         <image.name>onap/sdnc-dmaap-listener-image</image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
-        <ccsdk.docker.version>0.4-STAGING-latest</ccsdk.docker.version>
+        <ccsdk.docker.version>0.6-STAGING-latest</ccsdk.docker.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
diff --git a/installation/pom.xml b/installation/pom.xml
index 0c83e328..cdf3f479 100644
--- a/installation/pom.xml
+++ b/installation/pom.xml
@@ -4,14 +4,14 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.3.2</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation</artifactId>
-    <version>1.6.2-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
 
     <name>sdnc-oam :: installation</name>
     <description>Installs SDN-C on local file system</description>
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index e3877a2a..80a2054a 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -4,14 +4,14 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.3.2</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-sdnc</artifactId>
-    <version>1.6.2-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates SDN Controller Docker container</description>
@@ -21,9 +21,9 @@
         <standalone.image.name>onap/sdnc-image</standalone.image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
-        <sdnc.northbound.version>1.6.1</sdnc.northbound.version>
-        <ccsdk.docker.version>0.5.1</ccsdk.docker.version>
-        <ccsdk.features.version>0.5.1</ccsdk.features.version>
+        <sdnc.northbound.version>1.7.0-SNAPSHOT</sdnc.northbound.version>
+        <ccsdk.docker.version>0.6-STAGING-latest</ccsdk.docker.version>
+        <ccsdk.features.version>0.6.0-SNAPSHOT</ccsdk.features.version>
         <sdnc.keystore>org.onap.sdnc.p12</sdnc.keystore>
         <sdnc.keypass><![CDATA[ff^G9D]yf&r}Ktum@BJ0YB?N]]></sdnc.keypass>
         <sdnc.secureport>8443</sdnc.secureport>
diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml
index 18d3597f..a2b07b18 100644
--- a/installation/ueb-listener/pom.xml
+++ b/installation/ueb-listener/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.3.2</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-ueb-listener</artifactId>
-    <version>1.6.2-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates ueb-listener Docker container</description>
@@ -19,7 +19,7 @@
         <image.name>onap/sdnc-ueb-listener-image</image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
-        <ccsdk.docker.version>0.4-STAGING-latest</ccsdk.docker.version>
+        <ccsdk.docker.version>0.6-STAGING-latest</ccsdk.docker.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <docker.push.phase>deploy</docker.push.phase>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-- 
cgit 1.2.3-korg