summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pom.xml5
-rw-r--r--version.properties4
-rw-r--r--vio/docker/Dockerfile2
-rwxr-xr-xvio/docker/build_image.sh4
-rw-r--r--vio/pom.xml5
-rw-r--r--vio/version.properties4
6 files changed, 11 insertions, 13 deletions
diff --git a/pom.xml b/pom.xml
index 5cb2371..71536e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,13 +18,12 @@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.2.0</version>
- <relativePath>../oparent</relativePath>
+ <version>2.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.multicloud.openstack.vmware</groupId>
<artifactId>multicloud-openstack-vmware</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>multicloud-openstack-vmware</name>
<description>multicloud openstack vmware</description>
diff --git a/version.properties b/version.properties
index 3e594ed..8081980 100644
--- a/version.properties
+++ b/version.properties
@@ -18,8 +18,8 @@
# because they are used in Jenkins, whose plug-in doesn't support
major=1
-minor=3
-patch=2
+minor=4
+patch=0
base_version=${major}.${minor}.${patch}
diff --git a/vio/docker/Dockerfile b/vio/docker/Dockerfile
index 5bc8499..ba15ddb 100644
--- a/vio/docker/Dockerfile
+++ b/vio/docker/Dockerfile
@@ -17,7 +17,7 @@ RUN addgroup -S onap && adduser -S -G onap onap
RUN apk update && \
apk add uwsgi unzip wget curl gcc make libc-dev libffi-dev openssl-dev && \
cd /opt/ && \
- wget -q -O multicloud-vio.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack.vmware&a=multicloud-openstack-vmware&v=1.3.2-SNAPSHOT&e=zip' && \
+ wget -q -O multicloud-vio.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack.vmware&a=multicloud-openstack-vmware&v=1.4.0-SNAPSHOT&e=zip' && \
unzip multicloud-vio.zip && \
rm -rf multicloud-vio.zip && \
pip install -r /opt/vio/requirements.txt && \
diff --git a/vio/docker/build_image.sh b/vio/docker/build_image.sh
index faedce5..2a40090 100755
--- a/vio/docker/build_image.sh
+++ b/vio/docker/build_image.sh
@@ -20,8 +20,8 @@ cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
ORG="onap"
-VERSION="1.3.2-SNAPSHOT"
-STAGING="1.3.2-STAGING"
+VERSION="1.4.0-SNAPSHOT"
+STAGING="1.4.0-STAGING"
PROJECT="multicloud"
IMAGE="vio"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/vio/pom.xml b/vio/pom.xml
index 3ed1255..f5bd9c9 100644
--- a/vio/pom.xml
+++ b/vio/pom.xml
@@ -16,13 +16,12 @@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.2.0</version>
- <relativePath>../oparent</relativePath>
+ <version>2.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.multicloud.openstack.vmware</groupId>
<artifactId>multicloud-openstack-vmware</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>multicloud-openstack-vmware</name>
<description>multicloud openstack vmware vio</description>
diff --git a/vio/version.properties b/vio/version.properties
index 3e594ed..8081980 100644
--- a/vio/version.properties
+++ b/vio/version.properties
@@ -18,8 +18,8 @@
# because they are used in Jenkins, whose plug-in doesn't support
major=1
-minor=3
-patch=2
+minor=4
+patch=0
base_version=${major}.${minor}.${patch}