Update version in Guilin release

Issue-ID: MULTICLOUD-1208
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Change-Id: I1376e54e4bad9d4c837883928f058af168749760

diff --git a/artifactbroker/forwarding/pom.xml b/artifactbroker/forwarding/pom.xml
index dd28600..3a64697 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.5.2-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-forwarding</artifactId>

diff --git a/artifactbroker/main/pom.xml b/artifactbroker/main/pom.xml
index afad215..37dad19 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.5.2-SNAPSHOT</version>
+        <version>1.6.0-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 6fffdb3..466b706 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.5.2-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-model</artifactId>

diff --git a/artifactbroker/packages/docker/build_image.sh b/artifactbroker/packages/docker/build_image.sh
index 45c864b..a8a4f61 100755 (executable)
--- a/artifactbroker/packages/docker/build_image.sh
+++ b/artifactbroker/packages/docker/build_image.sh
@@ -17,8 +17,8 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.5.2-SNAPSHOT"
-STAGING_VERSION="1.5.2-STAGING"
+VERSION="1.6.0-SNAPSHOT"
+STAGING_VERSION="1.6.0-STAGING"
 PROJECT="multicloud"
 IMAGE="framework-artifactbroker"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"

diff --git a/artifactbroker/packages/pom.xml b/artifactbroker/packages/pom.xml
index 067040c..121860a 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.5.2-SNAPSHOT</version>
+        <version>1.6.0-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 96b36f2..952c322 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.5.2-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-forwarding-plugins</artifactId>

diff --git a/artifactbroker/plugins/pom.xml b/artifactbroker/plugins/pom.xml
index 717e5ba..eb557fa 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.5.2-SNAPSHOT</version>
+        <version>1.6.0-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 3c5b76e..9ea42a7 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.5.2-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-reception-plugins</artifactId>

diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml
index 3360a4d..7a32e5c 100644 (file)
--- a/artifactbroker/pom.xml
+++ b/artifactbroker/pom.xml
@@ -17,12 +17,12 @@
     <parent>
         <groupId>org.onap.multicloud.framework</groupId>
         <artifactId>multicloud-framework</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.framework</groupId>
     <artifactId>multicloud-framework-artifactbroker</artifactId>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.6.0-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 8475658..6ba6942 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.5.2-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>multicloud-framework-artifactbroker-reception</artifactId>

diff --git a/multivimbroker/docker/build_image.sh b/multivimbroker/docker/build_image.sh
index d7a92f2..bf3ecba 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.5.2-SNAPSHOT"
-STAGING_VERSION="1.5.2-STAGING"
+VERSION="1.6.0-SNAPSHOT"
+STAGING_VERSION="1.6.0-STAGING"
 PROJECT="multicloud"
 IMAGE="framework"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"

diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml
index c9fbdee..1e2d8f4 100644 (file)
--- 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.5.2-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.framework</groupId>
     <artifactId>multicloud-framework-broker</artifactId>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-framework-broker</name>
     <description>multivim broker</description>

diff --git a/pom.xml b/pom.xml
index 1496d64..9b73660 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.framework</groupId>
     <artifactId>multicloud-framework</artifactId>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-framework</name>
     <description>multicloud broker</description>

diff --git a/version.properties b/version.properties
index 0f4fbda..918194c 100644 (file)
--- 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=5
-patch=2
+minor=6
+patch=0
 
 base_version=${major}.${minor}.${patch}