Fix versions

Update to use released Quebec versions

Issue-ID: SDNC-1858
Change-Id: I45008ac053d2edbbf788ce0c7f8583d304c265d0
Signed-off-by: Dan Timoney <dtimoney@att.com>

diff --git a/.gitignore b/.gitignore
index 05b593a..637ae8b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@ classes
 out/
 .DS_STORE
 .metadata
+*.pem
 
 ## Folders which contain auto generated source code ##
 yang-gen-config

diff --git a/ms/gra/gra-app/pom.xml b/ms/gra/gra-app/pom.xml
index 1bab6b1..8b1cb3b 100644 (file)
--- a/ms/gra/gra-app/pom.xml
+++ b/ms/gra/gra-app/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.sdnc.apps</groupId>
         <artifactId>gra</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.sdnc.apps</groupId>
     <artifactId>gra-app</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>sdnc-apps :: ms :: gra :: ${project.artifactId}</name>

diff --git a/ms/gra/gra-docker/pom.xml b/ms/gra/gra-docker/pom.xml
index 1d4d0d7..657b4a5 100644 (file)
--- a/ms/gra/gra-docker/pom.xml
+++ b/ms/gra/gra-docker/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.sdnc.apps</groupId>
         <artifactId>gra</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.sdnc.apps</groupId>
     <artifactId>gra-docker</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>sdnc-apps :: ms :: gra :: ${project.artifactId}</name>
@@ -285,7 +285,7 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.34.0</version>
+                        <version>${docker.maven.plugin.version}</version>
                         <inherited>false</inherited>
                         <configuration>
                             <images>

diff --git a/ms/gra/pom.xml b/ms/gra/pom.xml
index ccde0f3..e711b79 100644 (file)
--- a/ms/gra/pom.xml
+++ b/ms/gra/pom.xml
@@ -25,11 +25,11 @@
     <parent>
         <groupId>org.onap.sdnc.apps</groupId>
         <artifactId>sdnc-apps-ms</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>gra</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-apps :: ms :: ${project.artifactId}</name>

diff --git a/ms/pom.xml b/ms/pom.xml
index ed89eb9..697e249 100644 (file)
--- a/ms/pom.xml
+++ b/ms/pom.xml
@@ -25,12 +25,12 @@
     <parent>
         <groupId>org.onap.sdnc.apps</groupId>
         <artifactId>sdnc-apps</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <!-- Unnecessary comment to test generated jobs from PR -->
     <artifactId>sdnc-apps-ms</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Micro-services Root</name>

diff --git a/ms/sanity-test/pom.xml b/ms/sanity-test/pom.xml
index 9a08202..16cb349 100644 (file)
--- a/ms/sanity-test/pom.xml
+++ b/ms/sanity-test/pom.xml
@@ -25,11 +25,11 @@
     <parent>
         <groupId>org.onap.sdnc.apps</groupId>
         <artifactId>sdnc-apps-ms</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sanity-test</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-apps :: ms :: ${project.artifactId}</name>

diff --git a/ms/sanity-test/sanity-test-app/pom.xml b/ms/sanity-test/sanity-test-app/pom.xml
index f7e9141..977817f 100644 (file)
--- a/ms/sanity-test/sanity-test-app/pom.xml
+++ b/ms/sanity-test/sanity-test-app/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.sdnc.apps</groupId>
         <artifactId>sanity-test</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.sdnc.apps</groupId>
     <artifactId>sanity-test-app</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>sdnc-apps :: ms :: sanity-test :: ${project.artifactId}</name>

diff --git a/pom.xml b/pom.xml
index 6d4c451..2355d8b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-30-starter-parent</artifactId>
-        <version>3.1.1</version>
+        <version>3.2.0</version>
     </parent>
 
     <groupId>org.onap.sdnc.apps</groupId>
     <artifactId>sdnc-apps</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-apps</name>
@@ -19,11 +19,12 @@
 
     <properties>
         <aaf.cadi.version>2.1.21</aaf.cadi.version>
-        <ccsdk.apps.version>2.1.0-SNAPSHOT</ccsdk.apps.version>
-        <ccsdk.docker.version>2.1.0-STAGING-latest</ccsdk.docker.version>
-        <ccsdk.distribution.version>2.1.0-SNAPSHOT</ccsdk.distribution.version>
-        <sdnc.northbound.version>3.1.0-SNAPSHOT</sdnc.northbound.version>
-        <sdnc.oam.version>3.1.0-SNAPSHOT</sdnc.oam.version>
+        <ccsdk.apps.version>2.2.0</ccsdk.apps.version>
+        <ccsdk.docker.version>2.2.0</ccsdk.docker.version>
+        <ccsdk.distribution.version>2.2.0</ccsdk.distribution.version>
+        <sdnc.northbound.version>3.2.0</sdnc.northbound.version>
+        <sdnc.oam.version>3.2.0</sdnc.oam.version>
+        <docker.maven.plugin.version>0.47.0</docker.maven.plugin.version>
     </properties>
 
     <modules>

diff --git a/version.properties b/version.properties
index c179482..410c0fb 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 release_name=3
-sprint_number=1
+sprint_number=2
 feature_revision=0
 
 base_version=${release_name}.${sprint_number}.${feature_revision}