Upgrade to 1.3.4

This should be done once 1.3.3 artifacts are released

Change-Id: I5699ae11007c6b2427fa94113345377cb24fcf34
Issue-ID: MULTICLOUD-652
Signed-off-by: liboNet <libo.zhu@intel.com>

diff --git a/artifactbroker/docker/Dockerfile b/artifactbroker/docker/Dockerfile
index daa8e24..b7b11b5 100644 (file)
--- 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.3-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.3-SNAPSHOT" && \
-    unzip -q -o -B multicloud-framework-artifactbroker-package-1.3.3-SNAPSHOT.zip && \
-    rm -f multicloud-framework-artifactbroker-package-1.3.3-SNAPSHOT.zip
+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
 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 696df0e..9522e3c 100755 (executable)
--- 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.3-SNAPSHOT"
-STAGING_VERSION="1.3.3-STAGING"
+VERSION="1.3.4-SNAPSHOT"
+STAGING_VERSION="1.3.4-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 da1aba4..cdd50cb 100644 (file)
--- a/artifactbroker/forwarding/pom.xml
+++ b/artifactbroker/forwarding/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-forwarding</artifactId>

diff --git a/artifactbroker/main/pom.xml b/artifactbroker/main/pom.xml
index 4574372..e452f7e 100644 (file)
--- a/artifactbroker/main/pom.xml
+++ b/artifactbroker/main/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.3.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>multicloud-framework-artifactbroker-main</artifactId>

diff --git a/artifactbroker/model/pom.xml b/artifactbroker/model/pom.xml
index 28df7b1..fc295e0 100644 (file)
--- a/artifactbroker/model/pom.xml
+++ b/artifactbroker/model/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-model</artifactId>

diff --git a/artifactbroker/packages/pom.xml b/artifactbroker/packages/pom.xml
index e2d26db..871bb08 100644 (file)
--- a/artifactbroker/packages/pom.xml
+++ b/artifactbroker/packages/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-package</artifactId>

diff --git a/artifactbroker/plugins/forwarding-plugins/pom.xml b/artifactbroker/plugins/forwarding-plugins/pom.xml
index b30b44a..dc05a2f 100644 (file)
--- a/artifactbroker/plugins/forwarding-plugins/pom.xml
+++ b/artifactbroker/plugins/forwarding-plugins/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker-plugins</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-forwarding-plugins</artifactId>

diff --git a/artifactbroker/plugins/pom.xml b/artifactbroker/plugins/pom.xml
index 65ec73c..0673fad 100644 (file)
--- a/artifactbroker/plugins/pom.xml
+++ b/artifactbroker/plugins/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-plugins</artifactId>

diff --git a/artifactbroker/plugins/reception-plugins/pom.xml b/artifactbroker/plugins/reception-plugins/pom.xml
index 222ab54..ca671d8 100644 (file)
--- a/artifactbroker/plugins/reception-plugins/pom.xml
+++ b/artifactbroker/plugins/reception-plugins/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker-plugins</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-reception-plugins</artifactId>

diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml
index 2d79241..b8ec774 100644 (file)
--- a/artifactbroker/pom.xml
+++ b/artifactbroker/pom.xml
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.framework</groupId>
     <artifactId>multicloud-framework-artifactbroker</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.3.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-framework-artifactbroker</name>
     <description>artifact  broker</description>

diff --git a/artifactbroker/reception/pom.xml b/artifactbroker/reception/pom.xml
index 71af912..ae96a71 100644 (file)
--- a/artifactbroker/reception/pom.xml
+++ b/artifactbroker/reception/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework-artifactbroker</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-reception</artifactId>

diff --git a/multivimbroker/docker/Dockerfile b/multivimbroker/docker/Dockerfile
index 46257ba..111fdd0 100644 (file)
--- 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.3-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.4-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 2b6f548..4c78d09 100644 (file)
--- 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.3-SNAPSHOT"
-STAGING_VERSION="1.3.3-STAGING"
+VERSION="1.3.4-SNAPSHOT"
+STAGING_VERSION="1.3.4-STAGING"
 PROJECT="multicloud"
 IMAGE="framework"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"

diff --git a/multivimbroker/docker/pecan/Dockerfile b/multivimbroker/docker/pecan/Dockerfile
index b358d48..ec7fb6d 100644 (file)
--- 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.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.4-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 26bd102..6f7eebf 100644 (file)
--- a/multivimbroker/pom.xml
+++ b/multivimbroker/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.framework</groupId>
     <artifactId>multicloud-framework-broker</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.3.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-framework-broker</name>
     <description>multivim broker</description>

diff --git a/pom.xml b/pom.xml
index d54ff4c..ce0814c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.framework</groupId>
     <artifactId>multicloud-framework</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.3.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-framework</name>
     <description>multicloud broker</description>

diff --git a/version.properties b/version.properties
index 56d96da..4c48512 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -19,7 +19,7 @@
 
 major=1
 minor=3
-patch=3
+patch=4
 
 base_version=${major}.${minor}.${patch}