Update to use released Quebec dependencies

Update properties to use released ONAP version of dependencies.  Added new property for version of
docker-maven-plugin and set to use latest version to ensure compatibility with Java 21

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

diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index 3313355..97a474b 100644 (file)
--- a/installation/admportal/pom.xml
+++ b/installation/admportal/pom.xml
@@ -49,7 +49,7 @@
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>0.28.0</version>
+                <version>${docker.maven.plugin.version}</version>
                 <inherited>false</inherited>
                 <configuration>
 

diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml
index 63c4444..2263237 100644 (file)
--- a/installation/ansible-server/pom.xml
+++ b/installation/ansible-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>installation</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>installation-ansible-server</artifactId>
@@ -81,7 +81,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/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml
index c776cda..3db2e69 100644 (file)
--- a/installation/dmaap-listener/pom.xml
+++ b/installation/dmaap-listener/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>installation</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>installation-dmaap-listener</artifactId>
@@ -170,7 +170,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/installation/pom.xml b/installation/pom.xml
index 960d1a2..3461a82 100644 (file)
--- a/installation/pom.xml
+++ b/installation/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>sdnc-oam</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>installation</artifactId>

diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml
index b10cab3..d47af46 100644 (file)
--- a/installation/sdnc-web/pom.xml
+++ b/installation/sdnc-web/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>installation</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>installation-sdnc-web</artifactId>
@@ -159,7 +159,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/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index df2d2a1..8c95979 100644 (file)
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>installation</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>installation-sdnc</artifactId>
@@ -183,7 +183,7 @@
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>0.39.0</version>
+                <version>${docker.maven.plugin.version}</version>
                 <inherited>false</inherited>
                 <configuration>
                     <images>

diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml
index aac811e..19dbf2e 100644 (file)
--- a/installation/ueb-listener/pom.xml
+++ b/installation/ueb-listener/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>installation</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>installation-ueb-listener</artifactId>
@@ -170,7 +170,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/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml
index cd68db7..81a734d 100644 (file)
--- a/platform-logic/datachange/pom.xml
+++ b/platform-logic/datachange/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>platform-logic</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-datachange</artifactId>

diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml
index 0404241..3236a02 100644 (file)
--- a/platform-logic/generic-resource-api/pom.xml
+++ b/platform-logic/generic-resource-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>platform-logic</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-generic-resource-api</artifactId>

diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index d38cb2c..1e0242b 100644 (file)
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>platform-logic</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-installer</artifactId>

diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml
index 8335c1b..aeadc65 100644 (file)
--- a/platform-logic/lcm/pom.xml
+++ b/platform-logic/lcm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>platform-logic</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-lcm</artifactId>

diff --git a/platform-logic/optical-service/pom.xml b/platform-logic/optical-service/pom.xml
index d59186f..2a8af5a 100644 (file)
--- a/platform-logic/optical-service/pom.xml
+++ b/platform-logic/optical-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>platform-logic</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-optical-service</artifactId>

diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml
index a77cbc7..9d2d411 100644 (file)
--- a/platform-logic/pom.xml
+++ b/platform-logic/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>sdnc-oam</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic</artifactId>

diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml
index c97a818..12292f5 100644 (file)
--- a/platform-logic/restapi-templates/pom.xml
+++ b/platform-logic/restapi-templates/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>platform-logic</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-restapi-templates</artifactId>

diff --git a/platform-logic/restconfapi-yang/pom.xml b/platform-logic/restconfapi-yang/pom.xml
index 3890dd6..e28a2d1 100644 (file)
--- a/platform-logic/restconfapi-yang/pom.xml
+++ b/platform-logic/restconfapi-yang/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>platform-logic</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-restconfapi-yang</artifactId>

diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml
index d24cd05..005d259 100644 (file)
--- a/platform-logic/setup/pom.xml
+++ b/platform-logic/setup/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>platform-logic</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-setup</artifactId>

diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml
index b2008a6..2b0fc9e 100644 (file)
--- a/platform-logic/vnfapi/pom.xml
+++ b/platform-logic/vnfapi/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>platform-logic</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-vnfapi</artifactId>

diff --git a/pom.xml b/pom.xml
index 79dcd5f..2466118 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>sdnc-oam</artifactId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam</name>
@@ -25,18 +25,20 @@
         <sdnc.project.version>${project.version}</sdnc.project.version>
 
         <!-- All Version definition is placed in org.onap.ccsdk.parent/odlparent-lite -->
-        <ccsdk.oran.a1adapter.version>2.1.0</ccsdk.oran.a1adapter.version>
-        <sdnc.northbound.version>3.1.0</sdnc.northbound.version> <!-- Used by installation/sdnc -->
-        <ccsdk.distribution.version>2.1.0</ccsdk.distribution.version> 
-        <ccsdk.sli.version>2.1.1</ccsdk.sli.version>
-        <ccsdk.features.version>2.1.0</ccsdk.features.version>
+        <ccsdk.oran.a1adapter.version>2.2.0</ccsdk.oran.a1adapter.version>
+        <sdnc.northbound.version>3.2.0</sdnc.northbound.version> <!-- Used by installation/sdnc -->
+        <ccsdk.distribution.version>2.2.0</ccsdk.distribution.version> 
+        <ccsdk.sli.version>2.2.0</ccsdk.sli.version>
+        <ccsdk.features.version>2.2.0</ccsdk.features.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
         <ccsdk.bierman.api.version>1.0.0</ccsdk.bierman.api.version>
         <!-- docker images versions -->
-        <ccsdk.docker.alpine.j11.version>2.1.0</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener -->
-        <ccsdk.docker.odlsli.alpine.version>2.1.0</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc -->
-        <ccsdk.docker.ansible.server.version>2.1.0</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server -->
-        <ccsdk.docker.ubuntu.version>2.1.0</ccsdk.docker.ubuntu.version> <!-- Used by admportal -->
+        <ccsdk.docker.alpine.j11.version>2.2.0</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener -->
+        <ccsdk.docker.odlsli.alpine.version>2.2.0</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc -->
+        <ccsdk.docker.ansible.server.version>2.2.0</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server -->
+        <ccsdk.docker.ubuntu.version>2.2.0</ccsdk.docker.ubuntu.version> <!-- Used by admportal -->
+
+        <docker.maven.plugin.version>0.47.0</docker.maven.plugin.version>
     </properties>
 
     <modules>

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