From: Xiaohua Zhang Date: Fri, 8 Mar 2019 02:06:19 +0000 (+0000) Subject: Upgrade to 1.3.0 for dublin X-Git-Tag: 1.3.0~29 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=commitdiff_plain;h=57b4c6fe822a1e36a37a0656af191631f5397190 Upgrade to 1.3.0 for dublin Change-Id: Iae553e1c960571d99faf6b5aba39c70edf0f867e Issue-ID: MULTICLOUD-432 Signed-off-by: Xiaohua Zhang --- diff --git a/multivimbroker/docker/Dockerfile b/multivimbroker/docker/Dockerfile index cda6d49..1ff3724 100644 --- a/multivimbroker/docker/Dockerfile +++ b/multivimbroker/docker/Dockerfile @@ -16,7 +16,7 @@ RUN groupadd -r onap && useradd -r -g onap onap RUN apt-get update && \ apt-get install -y wget unzip gcc && \ 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.3-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.3.0-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 11a46da..2c1a1ea 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.3-SNAPSHOT" -STAGING_VERSION="1.2.3-STAGING" +VERSION="1.3.0-SNAPSHOT" +STAGING_VERSION="1.3.0-STAGING" PROJECT="multicloud" IMAGE="framework" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/multivimbroker/docker/pecan/Dockerfile b/multivimbroker/docker/pecan/Dockerfile index 60695b0..837211b 100644 --- a/multivimbroker/docker/pecan/Dockerfile +++ b/multivimbroker/docker/pecan/Dockerfile @@ -16,7 +16,7 @@ RUN groupadd -r onap && useradd -r -g onap onap RUN apt-get update && \ apt-get install -y wget unzip gcc && \ 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.3-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.3.0-SNAPSHOT" && \ unzip -q -o -B multicloud-framework.zip && \ rm -f multicloud-framework.zip && \ pip install -r /opt/multivimbroker/requirements.txt && \ diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml index fbaa183..ef627af 100644 --- a/multivimbroker/pom.xml +++ b/multivimbroker/pom.xml @@ -18,12 +18,12 @@ org.onap.multicloud.framework multicloud-framework - 1.2.3-SNAPSHOT + 1.3.0-SNAPSHOT 4.0.0 org.onap.multicloud.framework.broker multicloud-framework-broker - 1.2.3-SNAPSHOT + 1.3.0-SNAPSHOT pom multicloud-framework-broker multivim broker diff --git a/pom.xml b/pom.xml index a4b00f8..51e32db 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.onap.multicloud.framework multicloud-framework - 1.2.3-SNAPSHOT + 1.3.0-SNAPSHOT pom multicloud-framework multivim broker diff --git a/version.properties b/version.properties index cd12874..263e15c 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=2 -patch=3 +minor=3 +patch=0 base_version=${major}.${minor}.${patch}