From: Bin Yang Date: Thu, 11 Jul 2019 05:24:54 +0000 (+0000) Subject: Bump version for E release X-Git-Tag: 1.4.1~21 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=commitdiff_plain;h=ed31aba64afb1893bd37e76457320cfd4983d078 Bump version for E release from 1.3.4 to 1.4.0 Change-Id: I51e1eced5c683deb4986213a6667b34893a1b8e1 Issue-ID: MULTICLOUD-701 Signed-off-by: Bin Yang --- diff --git a/artifactbroker/docker/Dockerfile b/artifactbroker/docker/Dockerfile index b7b11b5..8006e29 100644 --- a/artifactbroker/docker/Dockerfile +++ b/artifactbroker/docker/Dockerfile @@ -25,9 +25,9 @@ RUN mkdir -p ${ARTIFACT_DISTRIBUTION_HOME} ${ARTIFACT_LOGS} ${ARTIFACT_HOME}/etc chown -R onap:onap ${ARTIFACT_HOME} ${ARTIFACT_DISTRIBUTION_HOME} ${ARTIFACT_LOGS} WORKDIR ${ARTIFACT_DISTRIBUTION_HOME} -RUN wget -O multicloud-framework-artifactbroker-package-1.3.4-SNAPSHOT.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.framework&a=multicloud-framework-artifactbroker-package&e=zip&v=1.3.4-SNAPSHOT" && \ - unzip -q -o -B multicloud-framework-artifactbroker-package-1.3.4-SNAPSHOT.zip && \ - rm -f multicloud-framework-artifactbroker-package-1.3.4-SNAPSHOT.zip +RUN wget -O multicloud-framework-artifactbroker-package-1.4.0-SNAPSHOT.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.framework&a=multicloud-framework-artifactbroker-package&e=zip&v=1.4.0-SNAPSHOT" && \ + unzip -q -o -B multicloud-framework-artifactbroker-package-1.4.0-SNAPSHOT.zip && \ + rm -f multicloud-framework-artifactbroker-package-1.4.0-SNAPSHOT.zip COPY artifact-dist.sh bin/. #RUN tar xvfz /packages/policy-distribution.tar.gz --directory ${ARTIFACT_DISTRIBUTION_HOME} #RUN rm /packages/policy-distribution.tar.gz diff --git a/artifactbroker/docker/build_image.sh b/artifactbroker/docker/build_image.sh index 9522e3c..e082e9b 100755 --- a/artifactbroker/docker/build_image.sh +++ b/artifactbroker/docker/build_image.sh @@ -17,8 +17,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.3.4-SNAPSHOT" -STAGING_VERSION="1.3.4-STAGING" +VERSION="1.4.0-SNAPSHOT" +STAGING_VERSION="1.4.0-STAGING" PROJECT="multicloud" IMAGE="framework-artifactbroker" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/artifactbroker/forwarding/pom.xml b/artifactbroker/forwarding/pom.xml index cdd50cb..4a19385 100644 --- a/artifactbroker/forwarding/pom.xml +++ b/artifactbroker/forwarding/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.3.4-SNAPSHOT + 1.4.0-SNAPSHOT multicloud-framework-artifactbroker-forwarding diff --git a/artifactbroker/main/pom.xml b/artifactbroker/main/pom.xml index e452f7e..4091240 100644 --- a/artifactbroker/main/pom.xml +++ b/artifactbroker/main/pom.xml @@ -21,7 +21,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.3.4-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 multicloud-framework-artifactbroker-main diff --git a/artifactbroker/model/pom.xml b/artifactbroker/model/pom.xml index fc295e0..33ad947 100644 --- a/artifactbroker/model/pom.xml +++ b/artifactbroker/model/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.3.4-SNAPSHOT + 1.4.0-SNAPSHOT multicloud-framework-artifactbroker-model diff --git a/artifactbroker/packages/pom.xml b/artifactbroker/packages/pom.xml index 871bb08..c5d98e7 100644 --- a/artifactbroker/packages/pom.xml +++ b/artifactbroker/packages/pom.xml @@ -24,7 +24,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.3.4-SNAPSHOT + 1.4.0-SNAPSHOT multicloud-framework-artifactbroker-package diff --git a/artifactbroker/plugins/forwarding-plugins/pom.xml b/artifactbroker/plugins/forwarding-plugins/pom.xml index dc05a2f..0e4b6a6 100644 --- a/artifactbroker/plugins/forwarding-plugins/pom.xml +++ b/artifactbroker/plugins/forwarding-plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker-plugins - 1.3.4-SNAPSHOT + 1.4.0-SNAPSHOT multicloud-framework-artifactbroker-forwarding-plugins diff --git a/artifactbroker/plugins/pom.xml b/artifactbroker/plugins/pom.xml index 0673fad..e34e4e4 100644 --- a/artifactbroker/plugins/pom.xml +++ b/artifactbroker/plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.3.4-SNAPSHOT + 1.4.0-SNAPSHOT multicloud-framework-artifactbroker-plugins diff --git a/artifactbroker/plugins/reception-plugins/pom.xml b/artifactbroker/plugins/reception-plugins/pom.xml index ca671d8..ba7740f 100644 --- a/artifactbroker/plugins/reception-plugins/pom.xml +++ b/artifactbroker/plugins/reception-plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker-plugins - 1.3.4-SNAPSHOT + 1.4.0-SNAPSHOT multicloud-framework-artifactbroker-reception-plugins diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml index f202647..39c9134 100644 --- a/artifactbroker/pom.xml +++ b/artifactbroker/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.3.4-SNAPSHOT + 1.4.0-SNAPSHOT pom multicloud-framework-artifactbroker artifact broker diff --git a/artifactbroker/reception/pom.xml b/artifactbroker/reception/pom.xml index ae96a71..ef7c5a9 100644 --- a/artifactbroker/reception/pom.xml +++ b/artifactbroker/reception/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.3.4-SNAPSHOT + 1.4.0-SNAPSHOT multicloud-framework-artifactbroker-reception diff --git a/multivimbroker/docker/Dockerfile b/multivimbroker/docker/Dockerfile index 111fdd0..f2bb7cc 100644 --- a/multivimbroker/docker/Dockerfile +++ b/multivimbroker/docker/Dockerfile @@ -16,7 +16,7 @@ RUN addgroup -S onap && adduser -S -G onap onap RUN apk update && \ apk add uwsgi wget unzip gcc make libc-dev libffi-dev openssl-dev && \ cd /opt/ && \ - wget -O multicloud-framework.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.framework&a=multicloud-framework-broker&e=zip&v=1.3.4-SNAPSHOT" && \ + wget -O multicloud-framework.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.framework&a=multicloud-framework-broker&e=zip&v=1.4.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 4c78d09..d398b2d 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.3.4-SNAPSHOT" -STAGING_VERSION="1.3.4-STAGING" +VERSION="1.4.0-SNAPSHOT" +STAGING_VERSION="1.4.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 ec7fb6d..5230182 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.3.4-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.4.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 9104e15..dea669e 100644 --- a/multivimbroker/pom.xml +++ b/multivimbroker/pom.xml @@ -18,12 +18,12 @@ org.onap.multicloud.framework multicloud-framework - 1.3.4-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 org.onap.multicloud.framework multicloud-framework-broker - 1.3.4-SNAPSHOT + 1.4.0-SNAPSHOT pom multicloud-framework-broker multivim broker diff --git a/pom.xml b/pom.xml index 7bfd94c..1c5954d 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.onap.multicloud.framework multicloud-framework - 1.3.4-SNAPSHOT + 1.4.0-SNAPSHOT pom multicloud-framework multicloud broker