Upgrade to 1.3.0 for dublin

Change-Id: I9a42f70d1df743cb3c7cfc95a402bce9eade4469
Issue-ID: MULTICLOUD-432
Signed-off-by: Xiaohua Zhang <xiaohua.zhang@windriver.com>

diff --git a/newton/docker/Dockerfile b/newton/docker/Dockerfile
index ce6ea33..c43311e 100644 (file)
--- 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.3.0-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 442968f..d727d7a 100644 (file)
--- 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.3.0-SNAPSHOT"
+STAGING="1.3.0-STAGING"
 PROJECT="multicloud"
 IMAGE="openstack-newton"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"

diff --git a/newton/pom.xml b/newton/pom.xml
index c2fd92f..89987ef 100644 (file)
--- 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.3.0-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 e6ce994..e652533 100644 (file)
--- 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.3.0-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 38b2a84..f2dd6f7 100755 (executable)
--- 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.3.0-SNAPSHOT"
+STAGING="1.3.0-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 7ce367f..99bcc7e 100644 (file)
--- 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.3.0-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 2f6bc62..d5cfd85 100644 (file)
--- 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.3.0-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 9f71926..a200907 100755 (executable)
--- 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.3.0-SNAPSHOT"
+STAGING="1.3.0-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 a5cf048..6f27be2 100644 (file)
--- 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.3.0-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 95ec359..1933647 100644 (file)
--- 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.3.0-SNAPSHOT</version>
     <name>multicloud-openstack</name>
     <packaging>pom</packaging>
     <description>multicloud openstack</description>

diff --git a/version.properties b/version.properties
index 1aeae5b..bb3cd64 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -17,8 +17,8 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major=1
-minor=2
-patch=3
+minor=3
+patch=0
 
 base_version=${major}.${minor}.${patch}
 

diff --git a/windriver/docker/Dockerfile b/windriver/docker/Dockerfile
index f0bd620..7ec9bb7 100644 (file)
--- 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.3.0-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 2ff6dbb..d880a4e 100644 (file)
--- 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.3.0-SNAPSHOT"
+STAGING="1.3.0-STAGING"
 PROJECT="multicloud"
 IMAGE="openstack-windriver"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"

diff --git a/windriver/pom.xml b/windriver/pom.xml
index 1af1578..1b8e89e 100644 (file)
--- 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.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-openstack-windriver</name>
     <description>multicloud for openstack Wind River Titanium Cloud</description>