Merge "Roll to next snapshot" into casablanca

15 files changed, 21 insertions, 21 deletions

diff --git a/components/core/pom.xml b/components/core/pom.xml
index a3c7ec66..cea7e85d 100644
--- a/components/core/pom.xml
+++ b/components/core/pom.xml
@@ -25,7 +25,7 @@
     <parent>

         <groupId>org.onap.ccsdk.apps.components</groupId>

         <artifactId>parent</artifactId>

-        <version>0.3.2-SNAPSHOT</version>

+        <version>0.3.3-SNAPSHOT</version>

         <relativePath>../parent</relativePath>

     </parent>

     <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>

diff --git a/components/parent/pom.xml b/components/parent/pom.xml
index e1967efe..c2054181 100644
--- a/components/parent/pom.xml
+++ b/components/parent/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>components</artifactId>
-        <version>0.3.2-SNAPSHOT</version>
+        <version>0.3.3-SNAPSHOT</version>
     </parent>
     <groupId>org.onap.ccsdk.apps.components</groupId>
     <artifactId>parent</artifactId>
diff --git a/components/pom.xml b/components/pom.xml
index 02007c75..a4d9239b 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>ccsdk-apps</artifactId>
-        <version>0.3.2-SNAPSHOT</version>
+        <version>0.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.ccsdk.apps</groupId>
diff --git a/components/resource-dict/pom.xml b/components/resource-dict/pom.xml
index 13816bd5..0c8e6dfb 100644
--- a/components/resource-dict/pom.xml
+++ b/components/resource-dict/pom.xml
@@ -25,7 +25,7 @@
     <parent>

         <groupId>org.onap.ccsdk.apps.components</groupId>

         <artifactId>parent</artifactId>

-        <version>0.3.2-SNAPSHOT</version>

+        <version>0.3.3-SNAPSHOT</version>

         <relativePath>../parent</relativePath>

     </parent>

     <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>

diff --git a/ms/controllerblueprints/application/pom.xml b/ms/controllerblueprints/application/pom.xml
index cdfdf7c6..9c387df9 100644
--- a/ms/controllerblueprints/application/pom.xml
+++ b/ms/controllerblueprints/application/pom.xml
@@ -25,7 +25,7 @@
     <parent>

         <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>

         <artifactId>parent</artifactId>

-        <version>0.3.2-SNAPSHOT</version>

+        <version>0.3.3-SNAPSHOT</version>

         <relativePath>../parent</relativePath>

     </parent>

     <artifactId>application</artifactId>

diff --git a/ms/controllerblueprints/distribution/pom.xml b/ms/controllerblueprints/distribution/pom.xml
index 6a1e419d..38b7bab4 100644
--- a/ms/controllerblueprints/distribution/pom.xml
+++ b/ms/controllerblueprints/distribution/pom.xml
@@ -23,7 +23,7 @@
     <parent>

         <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>

         <artifactId>parent</artifactId>

-        <version>0.3.2-SNAPSHOT</version>

+        <version>0.3.3-SNAPSHOT</version>

         <relativePath>../parent</relativePath>

     </parent>

     <artifactId>distribution</artifactId>

diff --git a/ms/controllerblueprints/modules/pom.xml b/ms/controllerblueprints/modules/pom.xml
index aefd4e14..dde1d4fe 100644
--- a/ms/controllerblueprints/modules/pom.xml
+++ b/ms/controllerblueprints/modules/pom.xml
@@ -23,7 +23,7 @@
     <parent>

         <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>

         <artifactId>parent</artifactId>

-        <version>0.3.2-SNAPSHOT</version>

+        <version>0.3.3-SNAPSHOT</version>

         <relativePath>../parent</relativePath>

     </parent>

     <artifactId>modules</artifactId>

diff --git a/ms/controllerblueprints/modules/service/pom.xml b/ms/controllerblueprints/modules/service/pom.xml
index 70b4a89b..22899453 100644
--- a/ms/controllerblueprints/modules/service/pom.xml
+++ b/ms/controllerblueprints/modules/service/pom.xml
@@ -25,7 +25,7 @@
     <parent>

         <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>

         <artifactId>modules</artifactId>

-        <version>0.3.2-SNAPSHOT</version>

+        <version>0.3.3-SNAPSHOT</version>

     </parent>

     <artifactId>service</artifactId>

     <name>Controller Blueprints Service</name>

diff --git a/ms/controllerblueprints/parent/pom.xml b/ms/controllerblueprints/parent/pom.xml
index 37336847..523bab8e 100644
--- a/ms/controllerblueprints/parent/pom.xml
+++ b/ms/controllerblueprints/parent/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>controllerblueprints</artifactId>
-        <version>0.3.2-SNAPSHOT</version>
+        <version>0.3.3-SNAPSHOT</version>
     </parent>
     <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
     <artifactId>parent</artifactId>
diff --git a/ms/controllerblueprints/pom.xml b/ms/controllerblueprints/pom.xml
index 4828308b..7e098725 100644
--- a/ms/controllerblueprints/pom.xml
+++ b/ms/controllerblueprints/pom.xml
@@ -20,13 +20,13 @@
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>ccsdk-apps-ms</artifactId>
-        <version>0.3.2-SNAPSHOT</version>
+        <version>0.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.ccsdk.apps</groupId>
     <artifactId>controllerblueprints</artifactId>
     <name>Controller Blueprints Root</name>
-    <version>0.3.2-SNAPSHOT</version>
+    <version>0.3.3-SNAPSHOT</version>
     <properties>
         <service.name>ControllerBlueprints</service.name>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml
index 2dd59392..05489e35 100644
--- a/ms/neng/pom.xml
+++ b/ms/neng/pom.xml
@@ -24,7 +24,7 @@
 
     <groupId>org.onap.ccsdk.apps</groupId>
     <artifactId>ccsdk-apps-ms-neng</artifactId>
-    <version>0.3.2-SNAPSHOT</version>
+    <version>0.3.3-SNAPSHOT</version>
 
     <properties>
         <swagger.directory>${basedir}/target/classes/META-INF/resources/swagger</swagger.directory>
@@ -241,7 +241,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.2</version>
+        <version>1.1.3-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/ms/pom.xml b/ms/pom.xml
index 21e52bbd..eb7dbdb0 100644
--- a/ms/pom.xml
+++ b/ms/pom.xml
@@ -25,13 +25,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.2</version>
+        <version>1.1.3-SNAPSHOT</version>
         <relativePath />
     </parent>
 
     <groupId>org.onap.ccsdk.apps</groupId>
     <artifactId>ccsdk-apps-ms</artifactId>
-    <version>0.3.2-SNAPSHOT</version>
+    <version>0.3.3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-apps-ms</name>
diff --git a/ms/vlantag-api/pom.xml b/ms/vlantag-api/pom.xml
index 23e84748..b66d136b 100644
--- a/ms/vlantag-api/pom.xml
+++ b/ms/vlantag-api/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>org.onap.ccsdk.apps.ms.vlantagapi</groupId>
 	<artifactId>vlantag-api</artifactId>
-	<version>0.3.2-SNAPSHOT</version>
+	<version>0.3.3-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>vlantag-api</name>
@@ -42,7 +42,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.1.2</version>
+		<version>1.1.3-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index 8be8071e..d20fa86f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.1.2</version>
+		<version>1.1.3-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.apps</groupId>
 	<artifactId>ccsdk-apps</artifactId>
-	<version>0.3.2-SNAPSHOT</version>
+	<version>0.3.3-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>ccsdk-apps</name>
diff --git a/version.properties b/version.properties
index c387b3c5..c636d7e7 100644
--- a/version.properties
+++ b/version.properties
@@ -6,10 +6,10 @@
 
 release_name=0
 sprint_number=3
-feature_revision=2
+feature_revision=3
 
 base_version=${release_name}.${sprint_number}.${feature_revision}
 
-release_version=${base_version}
+release_version=${base_version}-STAGING
 snapshot_version=${base_version}-SNAPSHOT