From 94a9bcfabe1cd010bc4a18010ac7026b3045c671 Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Fri, 26 Apr 2019 04:43:35 +0000 Subject: [PATCH] Upgrade version to 1.3.1 1.3.0 was used by integration team for validation Change-Id: I90147a31d451b4288836242cc3112a1a82357b46 Issue-ID: MULTICLOUD-589 Signed-off-by: Bin Yang --- artifactbroker/docker/Dockerfile | 6 +++--- artifactbroker/docker/build_image.sh | 4 ++-- artifactbroker/forwarding/pom.xml | 2 +- artifactbroker/main/pom.xml | 2 +- artifactbroker/model/pom.xml | 2 +- artifactbroker/packages/pom.xml | 2 +- artifactbroker/plugins/forwarding-plugins/pom.xml | 2 +- artifactbroker/plugins/pom.xml | 2 +- artifactbroker/plugins/reception-plugins/pom.xml | 2 +- artifactbroker/pom.xml | 2 +- artifactbroker/reception/pom.xml | 2 +- multivimbroker/docker/Dockerfile | 2 +- multivimbroker/docker/build_image.sh | 4 ++-- multivimbroker/docker/pecan/Dockerfile | 2 +- multivimbroker/pom.xml | 2 +- pom.xml | 2 +- version.properties | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/artifactbroker/docker/Dockerfile b/artifactbroker/docker/Dockerfile index 008a3c1..fe6a1df 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.0-SNAPSHOT.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=autorelease-121669&g=org.onap.multicloud.framework&a=multicloud-framework-artifactbroker-package&v=1.3.0&e=zip" && \ - unzip -q -o -B multicloud-framework-artifactbroker-package-1.3.0-SNAPSHOT.zip && \ - rm -f multicloud-framework-artifactbroker-package-1.3.0-SNAPSHOT.zip +RUN wget -O multicloud-framework-artifactbroker-package-1.3.1-SNAPSHOT.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=autorelease-121669&g=org.onap.multicloud.framework&a=multicloud-framework-artifactbroker-package&v=1.3.0&e=zip" && \ + unzip -q -o -B multicloud-framework-artifactbroker-package-1.3.1-SNAPSHOT.zip && \ + rm -f multicloud-framework-artifactbroker-package-1.3.1-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 1dcd7d5..108173e 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.0-SNAPSHOT" -STAGING_VERSION="1.3.0-STAGING" +VERSION="1.3.1-SNAPSHOT" +STAGING_VERSION="1.3.1-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 a56c313..b101f4f 100644 --- a/artifactbroker/forwarding/pom.xml +++ b/artifactbroker/forwarding/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT multicloud-framework-artifactbroker-forwarding diff --git a/artifactbroker/main/pom.xml b/artifactbroker/main/pom.xml index 4e0ecc0..3be70ac 100644 --- a/artifactbroker/main/pom.xml +++ b/artifactbroker/main/pom.xml @@ -21,7 +21,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT 4.0.0 multicloud-framework-artifactbroker-main diff --git a/artifactbroker/model/pom.xml b/artifactbroker/model/pom.xml index f2c2850..8357a61 100644 --- a/artifactbroker/model/pom.xml +++ b/artifactbroker/model/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT multicloud-framework-artifactbroker-model diff --git a/artifactbroker/packages/pom.xml b/artifactbroker/packages/pom.xml index 63769f4..d92d555 100644 --- a/artifactbroker/packages/pom.xml +++ b/artifactbroker/packages/pom.xml @@ -24,7 +24,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT multicloud-framework-artifactbroker-package diff --git a/artifactbroker/plugins/forwarding-plugins/pom.xml b/artifactbroker/plugins/forwarding-plugins/pom.xml index 8b4e8cb..b6876e4 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.0-SNAPSHOT + 1.3.1-SNAPSHOT multicloud-framework-artifactbroker-forwarding-plugins diff --git a/artifactbroker/plugins/pom.xml b/artifactbroker/plugins/pom.xml index ad380bb..cae0e31 100644 --- a/artifactbroker/plugins/pom.xml +++ b/artifactbroker/plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT multicloud-framework-artifactbroker-plugins diff --git a/artifactbroker/plugins/reception-plugins/pom.xml b/artifactbroker/plugins/reception-plugins/pom.xml index a8e37e9..c1b9885 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.0-SNAPSHOT + 1.3.1-SNAPSHOT multicloud-framework-artifactbroker-reception-plugins diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml index 1e0a1f7..818ddf0 100644 --- a/artifactbroker/pom.xml +++ b/artifactbroker/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom multicloud-framework-artifactbroker artifact broker diff --git a/artifactbroker/reception/pom.xml b/artifactbroker/reception/pom.xml index b18838d..5064e81 100644 --- a/artifactbroker/reception/pom.xml +++ b/artifactbroker/reception/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT multicloud-framework-artifactbroker-reception diff --git a/multivimbroker/docker/Dockerfile b/multivimbroker/docker/Dockerfile index 3fb6ef7..54b8da3 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.0-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.3.1-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 2c1a1ea..9cf8b0d 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.0-SNAPSHOT" -STAGING_VERSION="1.3.0-STAGING" +VERSION="1.3.1-SNAPSHOT" +STAGING_VERSION="1.3.1-STAGING" PROJECT="multicloud" IMAGE="framework" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/multivimbroker/docker/pecan/Dockerfile b/multivimbroker/docker/pecan/Dockerfile index 837211b..f54eeb4 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.0-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.1-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 cd8fc00..6a7dd3e 100644 --- a/multivimbroker/pom.xml +++ b/multivimbroker/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.onap.multicloud.framework multicloud-framework-broker - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom multicloud-framework-broker multivim broker diff --git a/pom.xml b/pom.xml index 79a1f92..87a6585 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.onap.multicloud.framework multicloud-framework - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom multicloud-framework multicloud broker diff --git a/version.properties b/version.properties index 263e15c..c2ec0b2 100644 --- a/version.properties +++ b/version.properties @@ -19,7 +19,7 @@ major=1 minor=3 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} -- 2.16.6