From 09763e98c5851e0345d4c9534ecf509fc9609e9c Mon Sep 17 00:00:00 2001
From: Murali-P <murali.p@huawei.com>
Date: Tue, 27 Mar 2018 10:50:54 +0530
Subject: Update release version

Move release version to 1.1.0

Issue-ID: VNFSDK-160

Change-Id: Ia0142d76a147d746a8601cf8a80e22fd64fe6831
Signed-off-by: Murali-P <murali.p@huawei.com>
---
 version.properties                                     | 2 +-
 vnfmarket-be/deployment/docker/docker-postgres/pom.xml | 2 +-
 vnfmarket-be/deployment/docker/docker-refrepo/pom.xml  | 2 +-
 vnfmarket-be/deployment/pom.xml                        | 6 ++----
 vnfmarket-be/deployment/zip/pom.xml                    | 2 +-
 vnfmarket-be/pom.xml                                   | 2 +-
 vnfmarket-be/portal-marketplace/pom.xml                | 4 ++--
 vnfmarket-be/vnf-sdk-marketplace/pom.xml               | 2 +-
 vnfmarket/pom.xml                                      | 4 ++--
 9 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/version.properties b/version.properties
index bf3f0bf1..0424f622 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major=1
-minor=0
+minor=1
 patch=0
 
 base_version=${major}.${minor}.${patch}
diff --git a/vnfmarket-be/deployment/docker/docker-postgres/pom.xml b/vnfmarket-be/deployment/docker/docker-postgres/pom.xml
index e4c8d5ab..b274e01e 100644
--- a/vnfmarket-be/deployment/docker/docker-postgres/pom.xml
+++ b/vnfmarket-be/deployment/docker/docker-postgres/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.vnfsdk.refrepo</groupId>
         <artifactId>vnf-sdk-marketplace-core-parent</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
     </parent>
 
     <artifactId>vnfmarket-docker-refrepo-postgres</artifactId>
diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
index 347ae06c..a6ca68e0 100644
--- a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.vnfsdk.refrepo</groupId>
         <artifactId>vnf-sdk-marketplace-core-parent</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
     </parent>
 
     <artifactId>vnfmarket-docker-refrepo</artifactId>
diff --git a/vnfmarket-be/deployment/pom.xml b/vnfmarket-be/deployment/pom.xml
index 9e470413..3a087904 100644
--- a/vnfmarket-be/deployment/pom.xml
+++ b/vnfmarket-be/deployment/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.vnfsdk.refrepo</groupId>
         <artifactId>vnf-sdk-marketplace-core-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
     </parent>
 
     <artifactId>vnfmarket-deployment</artifactId>
@@ -33,10 +33,8 @@
 
     <modules>
         <module>zip</module>
-	<!--
         <module>docker/docker-postgres</module>
-        <module>docker/docker-refrepo</module>        
-	-->
+        <module>docker/docker-refrepo</module>
     </modules>
 
 </project>
diff --git a/vnfmarket-be/deployment/zip/pom.xml b/vnfmarket-be/deployment/zip/pom.xml
index 34f60c0e..e0b4e7e9 100644
--- a/vnfmarket-be/deployment/zip/pom.xml
+++ b/vnfmarket-be/deployment/zip/pom.xml
@@ -19,7 +19,7 @@
    <parent>
         <groupId>org.onap.vnfsdk.refrepo</groupId>
         <artifactId>vnf-sdk-marketplace-core-parent</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
     </parent>
 
     <artifactId>vnf-sdk-marketplace-deployment</artifactId>
diff --git a/vnfmarket-be/pom.xml b/vnfmarket-be/pom.xml
index 36b8a459..a8923376 100644
--- a/vnfmarket-be/pom.xml
+++ b/vnfmarket-be/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.onap.vnfsdk.refrepo</groupId>
         <artifactId>vnfmarket</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/vnfmarket-be/portal-marketplace/pom.xml b/vnfmarket-be/portal-marketplace/pom.xml
index 28a7ba12..542d8f73 100644
--- a/vnfmarket-be/portal-marketplace/pom.xml
+++ b/vnfmarket-be/portal-marketplace/pom.xml
@@ -18,11 +18,11 @@
   <parent>
     <groupId>org.onap.vnfsdk.refrepo</groupId>
     <artifactId>vnf-sdk-marketplace-core-parent</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>portal-marketplace</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.1.0</version>
   <packaging>war</packaging>
   <build>
     <plugins>
diff --git a/vnfmarket-be/vnf-sdk-marketplace/pom.xml b/vnfmarket-be/vnf-sdk-marketplace/pom.xml
index ca7265d8..77cc60ef 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/pom.xml
+++ b/vnfmarket-be/vnf-sdk-marketplace/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.onap.vnfsdk.refrepo</groupId>
 		<artifactId>vnf-sdk-marketplace-core-parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/vnfmarket/pom.xml b/vnfmarket/pom.xml
index 60ef007e..3c231fe3 100644
--- a/vnfmarket/pom.xml
+++ b/vnfmarket/pom.xml
@@ -20,12 +20,12 @@
     <parent>
         <groupId>org.onap.vnfsdk.refrepo</groupId>
         <artifactId>oparent</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>vnfmarket-gui</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <packaging>war</packaging>
     <name>client-gui/vnfmarket</name>
 
-- 
cgit 1.2.3-korg