Merge "Bump patch version" into amsterdam

Former-commit-id: 0f5df747e09dc37fff3311a32cd2c471ee40c142

17 files changed, 40 insertions, 40 deletions

diff --git a/admportal/pom.xml b/admportal/pom.xml
index d007cd15..b6a208a2 100644
--- a/admportal/pom.xml
+++ b/admportal/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.sdnc.oam</groupId>
 		<artifactId>sdnc-oam</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.2.2-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
@@ -13,7 +13,7 @@
 	<groupId>org.onap.sdnc.oam</groupId>
 	<artifactId>admportal</artifactId>
 
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.2-SNAPSHOT</version>
 
 	<name>Admin Portal</name>
 	<description>Admin Portal</description>
diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml
index 3f25364b..ff69d4be 100644
--- a/dgbuilder/pom.xml
+++ b/dgbuilder/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.sdnc.oam</groupId>
 		<artifactId>sdnc-oam</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.2.2-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
@@ -13,7 +13,7 @@
 	<groupId>org.onap.sdnc.oam</groupId>
 	<artifactId>dgbuilder</artifactId>
 
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.2-SNAPSHOT</version>
 
 	<name>Directed Graph Builder</name>
 	<description>Directed Graph Builder</description>
diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index 909b271a..4306803f 100644
--- a/installation/admportal/pom.xml
+++ b/installation/admportal/pom.xml
@@ -5,14 +5,14 @@
 	<parent>
 		<groupId>org.onap.sdnc.oam</groupId>
 		<artifactId>installation</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.2.2-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
 	<groupId>org.onap.sdnc.oam</groupId>
 	<artifactId>installation-admportal</artifactId>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.2-SNAPSHOT</version>
 
 	<name>Installation - admportal</name>
 	<description>Creates admportal Docker container</description>
@@ -44,7 +44,7 @@
 									project.properties['sdnc.project.version'].split('\\.');
 								}
 
-								if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
+								if (project.properties['sdnc.project.version'].endsWith("-amsterdam")) {
 									project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
 								} else {
 									project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml
index 644d8f63..2bd1f1f7 100644
--- a/installation/dgbuilder/pom.xml
+++ b/installation/dgbuilder/pom.xml
@@ -5,14 +5,14 @@
 	<parent>
 		<groupId>org.onap.sdnc.oam</groupId>
 		<artifactId>installation</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
 	<groupId>org.onap.sdnc.oam</groupId>
 	<artifactId>installation-dgbuilder</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.2.1-SNAPSHOT</version>
 
 	<name>Installation - dgbuilder</name>
 	<description>Creates docker container for dgbuilder</description>
@@ -45,7 +45,7 @@
 									project.properties['sdnc.project.version'].split('\\.');
 								}
 
-								if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
+								if (project.properties['sdnc.project.version'].endsWith("-amsterdam")) {
 									project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
 								} else {
 									project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml
index 3405e5b2..9e3188e2 100644
--- a/installation/dmaap-listener/pom.xml
+++ b/installation/dmaap-listener/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>installation</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <artifactId>installation-dmaap-listener</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
 
     <name>Installation - dmaap-listener</name>
     <description>Creates dmaap-listener Docker container</description>
@@ -45,7 +45,7 @@
                                     versionArray = project.properties['sdnc.project.version'].split('\\.');
                                 }
 
-                                if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT"))
+                                if (project.properties['sdnc.project.version'].endsWith("-amsterdam"))
                                 {
                                     project.properties['project.docker.latesttag.version']=versionArray[0]  + '.' + versionArray[1] + "-STAGING-latest";
                                 } else {
diff --git a/installation/pom.xml b/installation/pom.xml
index 8cf56ed0..11bb9a38 100644
--- a/installation/pom.xml
+++ b/installation/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>sdnc-oam</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
 
     <name>Installation</name>
     <description>Installs SDN-C on local file system</description>
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 97d43da6..6df6ab74 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -5,14 +5,14 @@
 	<parent>
 		<groupId>org.onap.sdnc.oam</groupId>
 		<artifactId>installation</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.2.2-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
 	<groupId>org.onap.sdnc.oam</groupId>
 	<artifactId>installation-sdnc</artifactId>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.2-SNAPSHOT</version>
 
 	<name>Installation - sdnc</name>
 	<description>Creates SDN Controller Docker container</description>
@@ -47,7 +47,7 @@
 									project.properties['sdnc.project.version'].split('\\.');
 								}
 
-								if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
+								if (project.properties['sdnc.project.version'].endsWith("-amsterdam")) {
 									project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
 								} else {
 									project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
diff --git a/installation/ubuntu/pom.xml b/installation/ubuntu/pom.xml
index c702b474..c36999d4 100644
--- a/installation/ubuntu/pom.xml
+++ b/installation/ubuntu/pom.xml
@@ -5,14 +5,14 @@
 	<parent>
 		<groupId>org.onap.sdnc.oam</groupId>
 		<artifactId>installation</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
 	<groupId>org.onap.sdnc.oam</groupId>
 	<artifactId>installation-ubuntu</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.2.1-SNAPSHOT</version>
 
 	<name>Installation - ubuntu</name>
 	<description>Creates base ubuntu Docker container</description>
@@ -44,7 +44,7 @@
 									project.properties['sdnc.project.version'].split('\\.');
 								}
 
-								if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
+								if (project.properties['sdnc.project.version'].endsWith("-amsterdam")) {
 									project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
 								} else {
 									project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml
index ad7f8a09..7fa5e29d 100644
--- a/installation/ueb-listener/pom.xml
+++ b/installation/ueb-listener/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>installation</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <artifactId>installation-ueb-listener</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
 
     <name>Installation - ueb-listener</name>
     <description>Creates ueb-listener Docker container</description>
@@ -18,7 +18,7 @@
     <properties>
         <image.name>onap/sdnc-ueb-listener-image</image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
-        <ccsdk.project.version>0.1.0-SNAPSHOT</ccsdk.project.version>
+        <ccsdk.project.version>0.1.1-SNAPSHOT</ccsdk.project.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
     </properties>
 
@@ -44,7 +44,7 @@
                                     versionArray = project.properties['sdnc.project.version'].split('\\.');
                                 }
 
-                                if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT"))
+                                if (project.properties['sdnc.project.version'].endsWith("-amsterdam"))
                                 {
                                     project.properties['project.docker.latesttag.version']=versionArray[0]  + '.' + versionArray[1] + "-STAGING-latest";
                                 } else {
diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml
index c5a34c55..31bfd652 100644
--- a/platform-logic/generic-resource-api/pom.xml
+++ b/platform-logic/generic-resource-api/pom.xml
@@ -5,11 +5,11 @@
 	<parent>
 	    <groupId>org.onap.sdnc.oam</groupId>
 	    <artifactId>platform-logic</artifactId>
-	    <version>1.2.1-SNAPSHOT</version>
+	    <version>1.2.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>platform-logic-generic-resource-api</artifactId>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Platform Logic : Generic Resource API</name>
diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index 4726202f..e161a5e9 100644
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -5,14 +5,14 @@
 	<parent>
 		<groupId>org.onap.sdnc.oam</groupId>
 		<artifactId>platform-logic</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.2.2-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
 	<groupId>org.onap.sdnc.oam</groupId>
 	<artifactId>platform-logic-installer</artifactId>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.2-SNAPSHOT</version>
 
 	<name>Platform Logic Installer</name>
 	<description>Contains platform-level service logic installer</description>
diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml
index 69ba116d..893c9478 100644
--- a/platform-logic/pom.xml
+++ b/platform-logic/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>sdnc-oam</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>platform-logic</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
 
     <name>Platform Logic </name>
     <description>Contains platform-level service logic</description>
diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml
index 37aff9d3..461d85bc 100644
--- a/platform-logic/restapi-templates/pom.xml
+++ b/platform-logic/restapi-templates/pom.xml
@@ -5,11 +5,11 @@
 	<parent>
 	    <groupId>org.onap.sdnc.oam</groupId>
 	    <artifactId>platform-logic</artifactId>
-	    <version>1.2.1-SNAPSHOT</version>
+	    <version>1.2.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>platform-logic-restapi-templates</artifactId>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Platform Logic : REST API templates</name>
diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml
index fb3a9a94..5371b7c2 100644
--- a/platform-logic/setup/pom.xml
+++ b/platform-logic/setup/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>platform-logic</artifactId>
-        <version>1.2.1-SNAPSHOT</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
 
 	<artifactId>platform-logic-setup</artifactId>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Platform Logic : Setup</name>
@@ -17,7 +17,7 @@
 
 
 	<properties>
-		<ccsdk.distribution.version>0.1.0-SNAPSHOT</ccsdk.distribution.version>
+		<ccsdk.distribution.version>0.1.1-SNAPSHOT</ccsdk.distribution.version>
 	</properties>
 
 	<build>
diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml
index ea433886..f8a0f819 100644
--- a/platform-logic/vnfapi/pom.xml
+++ b/platform-logic/vnfapi/pom.xml
@@ -5,14 +5,14 @@
 	<parent>
 		<groupId>org.onap.sdnc.oam</groupId>
 		<artifactId>platform-logic</artifactId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.2.2-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
 	<groupId>org.onap.sdnc.oam</groupId>
 	<artifactId>platform-logic-vnfapi</artifactId>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.2-SNAPSHOT</version>
 
 	<name>Platform Logic : VNF-API</name>
 	<description>Contains platform-level service logic for the VNF-API</description>
diff --git a/pom.xml b/pom.xml
index b7a75a55..cbe11bbd 100755
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
 	<organization>
 		<name>AT&amp;T</name>
 	</organization>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.2-SNAPSHOT</version>
 
 
 </project>
diff --git a/version.properties b/version.properties
index 1291f242..b00af220 100644
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 release_name=1
 sprint_number=2
-feature_revision=1
+feature_revision=2
 
 base_version=${release_name}.${sprint_number}.${feature_revision}