Roll to initial Dublin snapshot

Roll to initial Dublin snapshot

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

Fix CCSDK docker version

Update CCSDK docker versions used to build SDNC docker containers.

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

Former-commit-id: c261e3f719abcbea0762162dc9244f951296c6a1

12 files changed, 25 insertions, 20 deletions

diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index 5a8e3c68..7cd1f478 100644
--- a/installation/admportal/pom.xml
+++ b/installation/admportal/pom.xml
@@ -5,14 +5,14 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.1.1</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
 	<groupId>org.onap.sdnc.oam</groupId>
 	<artifactId>installation-admportal</artifactId>
-	<version>1.4.1-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 
 	<name>sdnc-oam :: installation :: ${project.artifactId}</name>
 	<description>Creates admportal Docker container</description>
@@ -20,6 +20,7 @@
 	<properties>
 		<image.name>onap/admportal-sdnc-image</image.name>
 		<sdnc.project.version>${project.version}</sdnc.project.version>
+		<ccsdk.docker.version>0.4-STAGING-latest</ccsdk.docker.version>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 	</properties>
 
diff --git a/installation/admportal/src/main/docker/Dockerfile b/installation/admportal/src/main/docker/Dockerfile
index fadb8120..abaa056f 100644
--- a/installation/admportal/src/main/docker/Dockerfile
+++ b/installation/admportal/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-ubuntu-image:${ccsdk.distribution.version}
+FROM onap/ccsdk-ubuntu-image:${ccsdk.docker.version}
 MAINTAINER SDN-C Team (sdnc@lists.openecomp.org)
 
 # create link for pm2
diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml
index b9e88cbe..0ec328ee 100644
--- a/installation/ansible-server/pom.xml
+++ b/installation/ansible-server/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.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.4.1-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates ansible-server Docker container</description>
@@ -19,6 +19,7 @@
     <properties>
         <image.name>onap/sdnc-ansible-server-image</image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
+        <ccsdk.docker.version>0.4-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/ansible-server/src/main/docker/Dockerfile b/installation/ansible-server/src/main/docker/Dockerfile
index ea9e61b7..0e59fba8 100644
--- a/installation/ansible-server/src/main/docker/Dockerfile
+++ b/installation/ansible-server/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-ansible-server-image:${ccsdk.distribution.version}
+FROM onap/ccsdk-ansible-server-image:${ccsdk.docker.version}
 
 LABEL maintainer="SDN-C Team (sdnc@lists.openecomp.org)"
 
diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml
index c9e9d79e..6ddd1eb8 100644
--- a/installation/dgbuilder/pom.xml
+++ b/installation/dgbuilder/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.1.1</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml
index 09f6048e..7878df52 100644
--- a/installation/dmaap-listener/pom.xml
+++ b/installation/dmaap-listener/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.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.4.1-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates dmaap-listener Docker container</description>
@@ -19,6 +19,7 @@
     <properties>
         <image.name>onap/sdnc-dmaap-listener-image</image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
+        <ccsdk.docker.version>0.4-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/dmaap-listener/src/main/docker/Dockerfile b/installation/dmaap-listener/src/main/docker/Dockerfile
index 49a70e4f..28676fac 100644
--- a/installation/dmaap-listener/src/main/docker/Dockerfile
+++ b/installation/dmaap-listener/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-ubuntu-image:${ccsdk.distribution.version}
+FROM onap/ccsdk-ubuntu-image:${ccsdk.docker.version}
 MAINTAINER SDNC Team (onap-sdnc@lists.onap.org)
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
 ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
diff --git a/installation/pom.xml b/installation/pom.xml
index 65ead6f2..383c6763 100644
--- a/installation/pom.xml
+++ b/installation/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation</artifactId>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.5.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 82a98195..4202e538 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -5,14 +5,14 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.1.1</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
 	<groupId>org.onap.sdnc.oam</groupId>
 	<artifactId>installation-sdnc</artifactId>
-	<version>1.4.1-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 
 	<name>sdnc-oam :: installation :: ${project.artifactId}</name>
 	<description>Creates SDN Controller Docker container</description>
@@ -21,6 +21,7 @@
 		<image.name>onap/sdnc-image</image.name>
 		<sdnc.project.version>${project.version}</sdnc.project.version>
 		<sdnc.northbound.version>1.4.1</sdnc.northbound.version>
+        <ccsdk.docker.version>0.4-STAGING-latest</ccsdk.docker.version>
 		<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
 		<docker.push.phase>deploy</docker.push.phase>
 		<docker.verbose>true</docker.verbose>
diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index 13a644e4..89e2aa01 100755
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-odlsli-image:${ccsdk.distribution.version}
+FROM onap/ccsdk-odlsli-image:${ccsdk.docker.version}
 
 MAINTAINER SDN-C Team (sdnc@lists.onap.org)
 
diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml
index 2e6c76c0..5cd806a4 100644
--- a/installation/ueb-listener/pom.xml
+++ b/installation/ueb-listener/pom.xml
@@ -5,22 +5,23 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.1</version>
+        <version>1.2.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.4.1-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates ueb-listener Docker container</description>
 
     <properties>
         <image.name>onap/sdnc-ueb-listener-image</image.name>
-        <sdnc.project.version>${project.version}</sdnc.project.version>
+        <sdnc.project.version>${project.version}</sdnc.project.version>    
+        <ccsdk.docker.version>0.4-STAGING-latest</ccsdk.docker.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
-	<docker.push.phase>deploy</docker.push.phase>
+	    <docker.push.phase>deploy</docker.push.phase>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
 
diff --git a/installation/ueb-listener/src/main/docker/Dockerfile b/installation/ueb-listener/src/main/docker/Dockerfile
index 49a70e4f..28676fac 100644
--- a/installation/ueb-listener/src/main/docker/Dockerfile
+++ b/installation/ueb-listener/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-ubuntu-image:${ccsdk.distribution.version}
+FROM onap/ccsdk-ubuntu-image:${ccsdk.docker.version}
 MAINTAINER SDNC Team (onap-sdnc@lists.onap.org)
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
 ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties