From e6cf301baadef714999d9cb47252910179140dda Mon Sep 17 00:00:00 2001
From: Xiaohua Zhang <xiaohua.zhang@windriver.com>
Date: Wed, 9 Jan 2019 04:28:36 +0000
Subject: Upgrade to 1.2.4

Change-Id: I5a8bdbf95e2454656e10eec097a870ec1de4ce63
Issue-ID: MULTICLOUD-432
Signed-off-by: Xiaohua Zhang <xiaohua.zhang@windriver.com>
---
 newton/docker/Dockerfile        | 2 +-
 newton/docker/build_image.sh    | 4 ++--
 newton/pom.xml                  | 2 +-
 ocata/docker/Dockerfile         | 2 +-
 ocata/docker/build_image.sh     | 4 ++--
 ocata/pom.xml                   | 2 +-
 pike/docker/Dockerfile          | 2 +-
 pike/docker/build_image.sh      | 4 ++--
 pike/pom.xml                    | 2 +-
 pom.xml                         | 2 +-
 version.properties              | 2 +-
 windriver/docker/Dockerfile     | 2 +-
 windriver/docker/build_image.sh | 4 ++--
 windriver/pom.xml               | 2 +-
 14 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/newton/docker/Dockerfile b/newton/docker/Dockerfile
index ce6ea333..85f50e2c 100644
--- a/newton/docker/Dockerfile
+++ b/newton/docker/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update && \
     apt-get install -y memcached && \
     apt-get install -y unzip && \
     cd /opt/ && \
-    wget -O multicloud-openstack-newton.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-newton&e=zip&v=1.2.3-SNAPSHOT" && \
+    wget -O multicloud-openstack-newton.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-newton&e=zip&v=1.2.4-SNAPSHOT" && \
     unzip -q -o -B multicloud-openstack-newton.zip && \
     chmod +x /opt/newton/*.sh && \
     rm -f multicloud-openstack-newton.zip && \
diff --git a/newton/docker/build_image.sh b/newton/docker/build_image.sh
index 442968f8..96128187 100644
--- a/newton/docker/build_image.sh
+++ b/newton/docker/build_image.sh
@@ -20,8 +20,8 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.2.3-SNAPSHOT"
-STAGING="1.2.3-STAGING"
+VERSION="1.2.4-SNAPSHOT"
+STAGING="1.2.4-STAGING"
 PROJECT="multicloud"
 IMAGE="openstack-newton"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/newton/pom.xml b/newton/pom.xml
index c2fd92fd..d3a87d18 100644
--- a/newton/pom.xml
+++ b/newton/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-newton</artifactId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-openstack-newton</name>
     <description>multicloud for openstack newton</description>
diff --git a/ocata/docker/Dockerfile b/ocata/docker/Dockerfile
index e6ce994e..6826e664 100644
--- a/ocata/docker/Dockerfile
+++ b/ocata/docker/Dockerfile
@@ -33,7 +33,7 @@ EXPOSE 9006
 
 WORKDIR /opt/ocata
 RUN apt-get update && apt-get install -y memcached unzip rabbitmq-server
-RUN wget -O /opt/multicloud-openstack-ocata.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-ocata&e=zip&v=1.2.3-SNAPSHOT" && \
+RUN wget -O /opt/multicloud-openstack-ocata.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-ocata&e=zip&v=1.2.4-SNAPSHOT" && \
     unzip -q -o -B /opt/multicloud-openstack-ocata.zip -d /opt/ && \
     rm -f /opt/multicloud-openstack-ocata.zip
 RUN mkdir -p /var/log/onap/multicloud/openstack/ocata/
diff --git a/ocata/docker/build_image.sh b/ocata/docker/build_image.sh
index 38b2a84b..e209808b 100755
--- a/ocata/docker/build_image.sh
+++ b/ocata/docker/build_image.sh
@@ -19,8 +19,8 @@ echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"
 cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
-VERSION="1.2.3-SNAPSHOT"
-STAGING="1.2.3-STAGING"
+VERSION="1.2.4-SNAPSHOT"
+STAGING="1.2.4-STAGING"
 OS_VERSION="ocata"
 IMAGE_NAME="nexus3.onap.org:10003/onap/multicloud/openstack-${OS_VERSION}"
 
diff --git a/ocata/pom.xml b/ocata/pom.xml
index 7ce367ff..f264fd82 100644
--- a/ocata/pom.xml
+++ b/ocata/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-ocata</artifactId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-openstack-ocata</name>
     <description>multicloud for openstack ocata</description>
diff --git a/pike/docker/Dockerfile b/pike/docker/Dockerfile
index 2f6bc629..fa2c3005 100644
--- a/pike/docker/Dockerfile
+++ b/pike/docker/Dockerfile
@@ -33,7 +33,7 @@ EXPOSE 9007
 
 WORKDIR /opt/pike
 RUN apt-get update && apt-get install -y memcached unzip
-RUN wget -O /opt/multicloud-openstack-pike.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-pike&e=zip&v=1.2.3-SNAPSHOT" && \
+RUN wget -O /opt/multicloud-openstack-pike.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-pike&e=zip&v=1.2.4-SNAPSHOT" && \
     unzip -q -o -B /opt/multicloud-openstack-pike.zip -d /opt/ && \
     rm -f /opt/multicloud-openstack-pike.zip
 RUN mkdir -p /var/log/onap/multicloud/openstack/pike/
diff --git a/pike/docker/build_image.sh b/pike/docker/build_image.sh
index 9f719269..3f6fb244 100755
--- a/pike/docker/build_image.sh
+++ b/pike/docker/build_image.sh
@@ -20,8 +20,8 @@ echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"
 cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
-VERSION="1.2.3-SNAPSHOT"
-STAGING="1.2.3-STAGING"
+VERSION="1.2.4-SNAPSHOT"
+STAGING="1.2.4-STAGING"
 OS_VERSION="pike"
 IMAGE_NAME="nexus3.onap.org:10003/onap/multicloud/openstack-${OS_VERSION}"
 
diff --git a/pike/pom.xml b/pike/pom.xml
index a5cf048a..d3ee9aa7 100644
--- a/pike/pom.xml
+++ b/pike/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-pike</artifactId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-openstack-pike</name>
     <description>multicloud for openstack pike</description>
diff --git a/pom.xml b/pom.xml
index 95ec3591..0fe5ea4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-root</artifactId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.4-SNAPSHOT</version>
     <name>multicloud-openstack</name>
     <packaging>pom</packaging>
     <description>multicloud openstack</description>
diff --git a/version.properties b/version.properties
index 1aeae5b0..71901f2f 100644
--- a/version.properties
+++ b/version.properties
@@ -18,7 +18,7 @@
 
 major=1
 minor=2
-patch=3
+patch=4
 
 base_version=${major}.${minor}.${patch}
 
diff --git a/windriver/docker/Dockerfile b/windriver/docker/Dockerfile
index f0bd620e..ea8f5221 100644
--- a/windriver/docker/Dockerfile
+++ b/windriver/docker/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update && \
     apt-get install -y rabbitmq-server && \
     apt-get install -y unzip && \
     cd /opt/ && \
-    wget -O multicloud-openstack-windriver.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-windriver&e=zip&v=1.2.3-SNAPSHOT" && \
+    wget -O multicloud-openstack-windriver.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-windriver&e=zip&v=1.2.4-SNAPSHOT" && \
     unzip -q -o -B multicloud-openstack-windriver.zip && \
     chmod +x /opt/windriver/*.sh && \
     rm -f multicloud-openstack-windriver.zip && \
diff --git a/windriver/docker/build_image.sh b/windriver/docker/build_image.sh
index 2ff6dbbb..57afe608 100644
--- a/windriver/docker/build_image.sh
+++ b/windriver/docker/build_image.sh
@@ -6,8 +6,8 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.2.3-SNAPSHOT"
-STAGING="1.2.3-STAGING"
+VERSION="1.2.4-SNAPSHOT"
+STAGING="1.2.4-STAGING"
 PROJECT="multicloud"
 IMAGE="openstack-windriver"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/windriver/pom.xml b/windriver/pom.xml
index 1af1578f..5c43e200 100644
--- a/windriver/pom.xml
+++ b/windriver/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-windriver</artifactId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-openstack-windriver</name>
     <description>multicloud for openstack Wind River Titanium Cloud</description>
-- 
cgit 1.2.3-korg