Bump up version for E Release

Change from 1.3.5 to 1.4.0

Change-Id: I91e1e5ffa95b54b6650d7b895ea5daf1590217dc
Issue-ID: MULTICLOUD-700
Signed-off-by: Bin Yang <bin.yang@windriver.com>

diff --git a/fcaps/docker/Dockerfile b/fcaps/docker/Dockerfile
index 0a07064..498066b 100644 (file)
--- a/fcaps/docker/Dockerfile
+++ b/fcaps/docker/Dockerfile
@@ -22,7 +22,7 @@ RUN addgroup -S onap && adduser -S -G onap onap
 RUN apk update && \
     apk add uwsgi memcached wget unzip gcc make libc-dev libffi-dev openssl-dev && \
     cd /opt/ && \
-    wget -O multicloud-openstack-fcaps.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-fcaps&e=zip&v=1.3.5-SNAPSHOT" && \
+    wget -O multicloud-openstack-fcaps.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-fcaps&e=zip&v=1.4.0-SNAPSHOT" && \
     unzip -q -o -B multicloud-openstack-fcaps.zip && \
     chmod +x /opt/fcaps/*.sh && \
     rm -f multicloud-openstack-fcaps.zip && \

diff --git a/fcaps/docker/build_image.sh b/fcaps/docker/build_image.sh
index e61911f..bb67f46 100644 (file)
--- a/fcaps/docker/build_image.sh
+++ b/fcaps/docker/build_image.sh
@@ -6,8 +6,8 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.3.5-SNAPSHOT"
-STAGING="1.3.5-STAGING"
+VERSION="1.4.0-SNAPSHOT"
+STAGING="1.4.0-STAGING"
 PROJECT="multicloud"
 IMAGE="openstack-fcaps"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"

diff --git a/fcaps/pom.xml b/fcaps/pom.xml
index f47c2e5..46917bd 100644 (file)
--- a/fcaps/pom.xml
+++ b/fcaps/pom.xml
@@ -16,15 +16,14 @@
 -->
 <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">
     <parent>
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>2.0.0</version>
-        <relativePath>../oparent</relativePath>
+        <groupId>org.onap.multicloud.openstack</groupId>
+        <artifactId>multicloud-openstack-root</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-fcaps</artifactId>
-    <version>1.3.5-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-openstack-fcaps</name>
     <description>multicloud for openstack Wind River Titanium Cloud</description>

diff --git a/lenovo/docker/Dockerfile b/lenovo/docker/Dockerfile
index 4926fff..9193714 100644 (file)
--- a/lenovo/docker/Dockerfile
+++ b/lenovo/docker/Dockerfile
@@ -37,7 +37,7 @@ RUN groupadd -r onap && useradd -r -g onap onap
 RUN apt-get update && \
     apt-get install -y memcached wget unzip gcc libssl-dev && \
     cd /opt/ && \
-    wget -O multicloud-openstack-lenovo.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-lenovo&e=zip&v=1.3.5-SNAPSHOT" && \
+    wget -O multicloud-openstack-lenovo.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-lenovo&e=zip&v=1.4.0-SNAPSHOT" && \
     unzip -q -o -B multicloud-openstack-lenovo.zip && \
     chmod +x /opt/lenovo/*.sh &&\
     rm -f multicloud-openstack-lenovo.zip &&\

diff --git a/lenovo/docker/build_image.sh b/lenovo/docker/build_image.sh
index 7f813fe..66d4463 100755 (executable)
--- a/lenovo/docker/build_image.sh
+++ b/lenovo/docker/build_image.sh
@@ -20,8 +20,8 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.3.5-SNAPSHOT"
-STAGING="1.3.5-STAGING"
+VERSION="1.4.0-SNAPSHOT"
+STAGING="1.4.0-STAGING"
 PROJECT="multicloud"
 IMAGE="openstack-lenovo"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"

diff --git a/lenovo/pom.xml b/lenovo/pom.xml
index 28c5695..cb361a5 100644 (file)
--- a/lenovo/pom.xml
+++ b/lenovo/pom.xml
@@ -16,15 +16,14 @@
 -->
 <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">
     <parent>
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>2.0.0</version>
-        <relativePath>../oparent</relativePath>
+        <groupId>org.onap.multicloud.openstack</groupId>
+        <artifactId>multicloud-openstack-root</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-lenovo</artifactId>
-    <version>1.3.5-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-openstack-lenovo</name>
     <description>multicloud for openstack lenovo thinkcloud</description>

diff --git a/newton/docker/Dockerfile b/newton/docker/Dockerfile
index f40c786..08a0a62 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.3.5-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.4.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 6752334..669cc5d 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.3.5-SNAPSHOT"
-STAGING="1.3.5-STAGING"
+VERSION="1.4.0-SNAPSHOT"
+STAGING="1.4.0-STAGING"
 PROJECT="multicloud"
 IMAGE="openstack-newton"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"

diff --git a/newton/pom.xml b/newton/pom.xml
index b3a19a7..d04fab3 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.3.5-SNAPSHOT</version>
+    <version>1.4.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 be2e356..9c423d5 100644 (file)
--- a/ocata/docker/Dockerfile
+++ b/ocata/docker/Dockerfile
@@ -36,7 +36,7 @@ RUN groupadd -r onap && useradd -r -g onap onap
 RUN apt-get update && \
     apt-get install -y memcached wget unzip gcc libssl-dev && \
     cd /opt/ && \
-    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.5-SNAPSHOT" && \
+    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.4.0-SNAPSHOT" && \
     unzip -q -o -B /opt/multicloud-openstack-ocata.zip -d /opt/ && \
     rm -f /opt/multicloud-openstack-ocata.zip && \
     pip install -r /opt/ocata/requirements.txt && \

diff --git a/ocata/docker/build_image.sh b/ocata/docker/build_image.sh
index 5c74e30..f93a63e 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.3.5-SNAPSHOT"
-STAGING="1.3.5-STAGING"
+VERSION="1.4.0-SNAPSHOT"
+STAGING="1.4.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 d40f6da..6ff8c8b 100644 (file)
--- a/ocata/pom.xml
+++ b/ocata/pom.xml
@@ -16,15 +16,14 @@
 -->
 <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">
     <parent>
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>2.0.0</version>
-        <relativePath>../oparent</relativePath>
+        <groupId>org.onap.multicloud.openstack</groupId>
+        <artifactId>multicloud-openstack-root</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-ocata</artifactId>
-    <version>1.3.5-SNAPSHOT</version>
+    <version>1.4.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 e166de1..64df1e1 100644 (file)
--- a/pike/docker/Dockerfile
+++ b/pike/docker/Dockerfile
@@ -36,7 +36,7 @@ RUN groupadd -r onap && useradd -r -g onap onap
 RUN apt-get update && \
     apt-get install -y memcached wget unzip gcc libssl-dev && \
     cd /opt/ && \
-    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.5-SNAPSHOT" && \
+    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.4.0-SNAPSHOT" && \
     unzip -q -o -B /opt/multicloud-openstack-pike.zip -d /opt/ && \
     rm -f /opt/multicloud-openstack-pike.zip && \
     pip install -r /opt/pike/requirements.txt && \

diff --git a/pike/docker/build_image.sh b/pike/docker/build_image.sh
index 06057f0..123884c 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.3.5-SNAPSHOT"
-STAGING="1.3.5-STAGING"
+VERSION="1.4.0-SNAPSHOT"
+STAGING="1.4.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 9c4a7b4..672d248 100644 (file)
--- a/pike/pom.xml
+++ b/pike/pom.xml
@@ -16,15 +16,14 @@
 -->
 <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">
     <parent>
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>2.0.0</version>
-        <relativePath>../oparent</relativePath>
+        <groupId>org.onap.multicloud.openstack</groupId>
+        <artifactId>multicloud-openstack-root</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-pike</artifactId>
-    <version>1.3.5-SNAPSHOT</version>
+    <version>1.4.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 74aeaf8..ac2dcb0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -20,13 +20,13 @@
         <groupId>org.onap.oparent</groupId>
         <artifactId>oparent</artifactId>
         <version>2.0.0</version>
-        <relativePath>../oparent</relativePath>
+        <!--relativePath>../oparent</relativePath-->
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-root</artifactId>
-    <version>1.3.5-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <name>multicloud-openstack</name>
     <packaging>pom</packaging>
     <description>multicloud openstack</description>

diff --git a/starlingx/docker/Dockerfile b/starlingx/docker/Dockerfile
index 6d638f0..18788dd 100644 (file)
--- a/starlingx/docker/Dockerfile
+++ b/starlingx/docker/Dockerfile
@@ -36,7 +36,7 @@ RUN addgroup -S onap && adduser -S -G onap onap
 RUN apk update && \
     apk add bash uwsgi curl memcached wget unzip gcc make libc-dev libffi-dev openssl-dev && \
     cd /opt/ && \
-    wget -O /opt/multicloud-openstack-starlingx.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-starlingx&e=zip&v=1.3.5-SNAPSHOT" && \
+    wget -O /opt/multicloud-openstack-starlingx.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-starlingx&e=zip&v=1.4.0-SNAPSHOT" && \
     unzip -q -o -B /opt/multicloud-openstack-starlingx.zip -d /opt/ && \
     rm -f /opt/multicloud-openstack-starlingx.zip && \
     pip install -r /opt/starlingx/requirements.txt && \

diff --git a/starlingx/docker/build_image.sh b/starlingx/docker/build_image.sh
index a738f32..9fc7b83 100755 (executable)
--- a/starlingx/docker/build_image.sh
+++ b/starlingx/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.3.5-SNAPSHOT"
-STAGING="1.3.5-STAGING"
+VERSION="1.4.0-SNAPSHOT"
+STAGING="1.4.0-STAGING"
 OS_VERSION="starlingx"
 IMAGE_NAME="nexus3.onap.org:10003/onap/multicloud/openstack-${OS_VERSION}"
 

diff --git a/starlingx/pom.xml b/starlingx/pom.xml
index 22c746f..83dd656 100644 (file)
--- a/starlingx/pom.xml
+++ b/starlingx/pom.xml
@@ -16,15 +16,14 @@
 -->
 <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">
     <parent>
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>2.0.0</version>
-        <relativePath>../oparent</relativePath>
+        <groupId>org.onap.multicloud.openstack</groupId>
+        <artifactId>multicloud-openstack-root</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-starlingx</artifactId>
-    <version>1.3.5-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-openstack-starlingx</name>
     <description>multicloud for openstack starlingx</description>

diff --git a/version.properties b/version.properties
index 25f98e4..e01fca5 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=3
-patch=5
+minor=4
+patch=0
 
 base_version=${major}.${minor}.${patch}
 

diff --git a/windriver/docker/Dockerfile b/windriver/docker/Dockerfile
index 6740bca..823c1e4 100644 (file)
--- a/windriver/docker/Dockerfile
+++ b/windriver/docker/Dockerfile
@@ -22,7 +22,7 @@ RUN addgroup -S onap && adduser -S -G onap onap
 RUN apk update && \
     apk add uwsgi memcached wget unzip gcc make libc-dev libffi-dev openssl-dev && \
     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.3.5-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.4.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 515723a..03efb00 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.3.5-SNAPSHOT"
-STAGING="1.3.5-STAGING"
+VERSION="1.4.0-SNAPSHOT"
+STAGING="1.4.0-STAGING"
 PROJECT="multicloud"
 IMAGE="openstack-windriver"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"

diff --git a/windriver/pom.xml b/windriver/pom.xml
index 2bd2466..5e27bd5 100644 (file)
--- a/windriver/pom.xml
+++ b/windriver/pom.xml
@@ -16,15 +16,14 @@
 -->
 <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">
     <parent>
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>2.0.0</version>
-        <relativePath>../oparent</relativePath>
+        <groupId>org.onap.multicloud.openstack</groupId>
+        <artifactId>multicloud-openstack-root</artifactId>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-windriver</artifactId>
-    <version>1.3.5-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-openstack-windriver</name>
     <description>multicloud for openstack Wind River Titanium Cloud</description>