diff options
author | Bin Yang <bin.yang@windriver.com> | 2018-11-27 14:32:33 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-11-27 14:32:33 +0000 |
commit | 4d6cff18c5d2a66cde633e5db3b82eb74b81c8fb (patch) | |
tree | ecfab65cd6064dbeb5528e44a70f6ce346dcecde | |
parent | 276104e4037bcb5fc462facdab1fe1d5ca8a5803 (diff) | |
parent | 253e8458ebe6d64d73f2ec45736ec38e3c234b84 (diff) |
Merge "bump version to 1.2.3" into casablanca
-rw-r--r-- | multivimbroker/docker/Dockerfile | 2 | ||||
-rw-r--r-- | multivimbroker/docker/build_image.sh | 4 | ||||
-rw-r--r-- | multivimbroker/pom.xml | 4 | ||||
-rw-r--r-- | pom.xml | 2 | ||||
-rw-r--r-- | version.properties | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/multivimbroker/docker/Dockerfile b/multivimbroker/docker/Dockerfile index 6167e9b..bc72323 100644 --- a/multivimbroker/docker/Dockerfile +++ b/multivimbroker/docker/Dockerfile @@ -14,7 +14,7 @@ EXPOSE 9001 RUN apt-get update && \ apt-get install -y unzip && \ cd /opt/ && \ - wget -O multicloud-framework.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.framework.broker&a=multicloud-framework-broker&e=zip&v=1.2.2-SNAPSHOT" && \ + wget -O multicloud-framework.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.framework.broker&a=multicloud-framework-broker&e=zip&v=1.2.3-SNAPSHOT" && \ unzip -q -o -B multicloud-framework.zip && \ rm -f multicloud-framework.zip && \ pip install -r /opt/multivimbroker/requirements.txt diff --git a/multivimbroker/docker/build_image.sh b/multivimbroker/docker/build_image.sh index f196590..11a46da 100644 --- a/multivimbroker/docker/build_image.sh +++ b/multivimbroker/docker/build_image.sh @@ -17,8 +17,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.2.2-SNAPSHOT" -STAGING_VERSION="1.2.2-STAGING" +VERSION="1.2.3-SNAPSHOT" +STAGING_VERSION="1.2.3-STAGING" PROJECT="multicloud" IMAGE="framework" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml index f87db2c..fbaa183 100644 --- a/multivimbroker/pom.xml +++ b/multivimbroker/pom.xml @@ -18,12 +18,12 @@ <parent> <groupId>org.onap.multicloud.framework</groupId> <artifactId>multicloud-framework</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.2.3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.multicloud.framework.broker</groupId> <artifactId>multicloud-framework-broker</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.2.3-SNAPSHOT</version> <packaging>pom</packaging> <name>multicloud-framework-broker</name> <description>multivim broker</description> @@ -24,7 +24,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.multicloud.framework</groupId> <artifactId>multicloud-framework</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.2.3-SNAPSHOT</version> <packaging>pom</packaging> <name>multicloud-framework</name> <description>multivim broker</description> diff --git a/version.properties b/version.properties index c9206e9..cd12874 100644 --- a/version.properties +++ b/version.properties @@ -19,7 +19,7 @@ major=1 minor=2 -patch=2 +patch=3 base_version=${major}.${minor}.${patch} |