From 7ec6b1efaeed1820912aa85d04d58d75c5f96664 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Michael=20D=C3=9Crre?=
 <michael.duerre@highstreet-technologies.com>
Date: Fri, 29 Oct 2021 08:08:28 +0200
Subject: [PATCH] mirgate dist to sr2
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

migrate odl and dependencies to sr2

Issue-ID: CCSDK-3514
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Change-Id: Ifd8f08c81e7a0ba138f145779e86dd864ecf9744
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
---
 alpine/java11/pom.xml                       |  2 +-
 alpine/pom.xml                              |  2 +-
 ansible-server/pom.xml                      |  4 ++--
 dependencies/pom.xml                        |  4 ++--
 dgbuilder-docker/pom.xml                    |  2 +-
 dgbuilder/pom.xml                           |  2 +-
 odlsli/odlsli-alpine/pom.xml                |  2 +-
 odlsli/pom.xml                              |  2 +-
 opendaylight/pom.xml                        |  2 +-
 opendaylight/silicon/pom.xml                |  4 ++--
 opendaylight/silicon/silicon-alpine/pom.xml | 31 +++++++++++++++++++----------
 platform-logic/a1Adapter-api/pom.xml        |  2 +-
 platform-logic/asdc-api/pom.xml             |  2 +-
 platform-logic/cMNotify-api/pom.xml         |  2 +-
 platform-logic/installer/pom.xml            |  2 +-
 platform-logic/oofpcipoc-api/pom.xml        |  2 +-
 platform-logic/pom.xml                      |  2 +-
 platform-logic/ran-slice-api/pom.xml        |  2 +-
 platform-logic/restapi-templates/pom.xml    |  2 +-
 platform-logic/sliapi/pom.xml               |  2 +-
 pom.xml                                     |  8 ++++----
 saltstack-server/pom.xml                    |  2 +-
 ubuntu/pom.xml                              |  2 +-
 version.properties                          |  4 ++--
 24 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/alpine/java11/pom.xml b/alpine/java11/pom.xml
index 53e3b0d5..2a931bb1 100644
--- a/alpine/java11/pom.xml
+++ b/alpine/java11/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-alpine-root</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-j11-alpine</artifactId>
diff --git a/alpine/pom.xml b/alpine/pom.xml
index 80036011..5c5d2598 100644
--- a/alpine/pom.xml
+++ b/alpine/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-alpine-root</artifactId>
diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml
index db8f26e0..8663c1ae 100644
--- a/ansible-server/pom.xml
+++ b/ansible-server/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>ansible-server</artifactId>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: ${project.artifactId}</name>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 8b2b1a4d..30945417 100755
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>dependencies</artifactId>
@@ -22,7 +22,7 @@
             <dependency>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-odl-bom</artifactId>
-                <version>2.2.1</version>
+                <version>2.2.3</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml
index 7c297c4b..251a0393 100644
--- a/dgbuilder-docker/pom.xml
+++ b/dgbuilder-docker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml
index ee0431da..4cd623cd 100644
--- a/dgbuilder/pom.xml
+++ b/dgbuilder/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 418c4f19..785c8f4d 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-odlsli</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-odlsli-alpine</artifactId>
diff --git a/odlsli/pom.xml b/odlsli/pom.xml
index 6a83b0cc..f8413c78 100644
--- a/odlsli/pom.xml
+++ b/odlsli/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-odlsli</artifactId>
diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index 691dd637..cdc3ba79 100644
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-opendaylight</artifactId>
diff --git a/opendaylight/silicon/pom.xml b/opendaylight/silicon/pom.xml
index d6df6bbe..317ef46e 100644
--- a/opendaylight/silicon/pom.xml
+++ b/opendaylight/silicon/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-opendaylight</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-odl-silicon</artifactId>
@@ -19,7 +19,7 @@
     </modules>
 
     <properties>
-        <ccsdk.opendaylight.version>0.14.1</ccsdk.opendaylight.version>
+        <ccsdk.opendaylight.version>0.14.2</ccsdk.opendaylight.version>
     </properties>
 
     <dependencyManagement>
diff --git a/opendaylight/silicon/silicon-alpine/pom.xml b/opendaylight/silicon/silicon-alpine/pom.xml
index d897d40b..7b85371e 100644
--- a/opendaylight/silicon/silicon-alpine/pom.xml
+++ b/opendaylight/silicon/silicon-alpine/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-odl-silicon</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-odl-silicon-docker</artifactId>
@@ -20,8 +20,9 @@
     <properties>
         <image.name>onap/ccsdk-odl-silicon-alpine-image</image.name>
         <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId>
-        <odl.shiro.version>0.13.3</odl.shiro.version>
-        <odl.ops4j.version>7.3.13</odl.ops4j.version>
+        <odl.shiro.version>0.13.5</odl.shiro.version>
+        <odl.ops4j.version>7.3.16</odl.ops4j.version>
+        <odl.netconf.version>1.13.4</odl.netconf.version>
     </properties>
 
     <build>
@@ -79,14 +80,6 @@
                         </goals>
                         <configuration>
                             <artifactItems>
-                                <artifactItem>
-                                    <groupId>com.highstreet-technologies.aaa</groupId>
-                                    <artifactId>aaa-shiro</artifactId>
-                                    <version>${odl.shiro.version}</version>
-                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-shiro/${odl.shiro.version}</outputDirectory>
-                                    <destFileName>aaa-shiro-${odl.shiro.version}.jar</destFileName>
-                                    <excludes>*</excludes>
-                                </artifactItem>
                                 <artifactItem>
                                     <groupId>com.highstreet-technologies.aaa</groupId>
                                     <artifactId>aaa-authn-api</artifactId>
@@ -103,6 +96,22 @@
                                     <destFileName>pax-web-jetty-${odl.ops4j.version}.jar</destFileName>
                                     <excludes>*</excludes>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.highstreet-technologies.netconf</groupId>
+                                    <artifactId>netconf-util</artifactId>
+                                    <version>${odl.netconf.version}</version>
+                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/netconf/netconf-util/${odl.netconf.version}</outputDirectory>
+                                    <destFileName>netconf-util-${odl.netconf.version}.jar</destFileName>
+                                    <excludes>*</excludes>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.highstreet-technologies.netconf</groupId>
+                                    <artifactId>sal-netconf-connector</artifactId>
+                                    <version>${odl.netconf.version}</version>
+                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/netconf/sal-netconf-connector/${odl.netconf.version}</outputDirectory>
+                                    <destFileName>sal-netconf-connector-${odl.netconf.version}.jar</destFileName>
+                                    <excludes>*</excludes>
+                                </artifactItem>
                             </artifactItems>
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>true</overWriteSnapshots>
diff --git a/platform-logic/a1Adapter-api/pom.xml b/platform-logic/a1Adapter-api/pom.xml
index a279ef35..51e607f2 100644
--- a/platform-logic/a1Adapter-api/pom.xml
+++ b/platform-logic/a1Adapter-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-platform-logic</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-a1Adapterapi</artifactId>
diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml
index 27128002..1f94ee41 100644
--- a/platform-logic/asdc-api/pom.xml
+++ b/platform-logic/asdc-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-platform-logic</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-asdcapi</artifactId>
diff --git a/platform-logic/cMNotify-api/pom.xml b/platform-logic/cMNotify-api/pom.xml
index 3816e8d7..a40272c5 100644
--- a/platform-logic/cMNotify-api/pom.xml
+++ b/platform-logic/cMNotify-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-platform-logic</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-cMNotifyai</artifactId>
diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index 9159f658..037b2d7c 100644
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-platform-logic</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-installer</artifactId>
diff --git a/platform-logic/oofpcipoc-api/pom.xml b/platform-logic/oofpcipoc-api/pom.xml
index 28f9cc1f..5a9dd4f8 100644
--- a/platform-logic/oofpcipoc-api/pom.xml
+++ b/platform-logic/oofpcipoc-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-platform-logic</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-oofpcipocapi</artifactId>
diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml
index d132f33b..8f056c51 100644
--- a/platform-logic/pom.xml
+++ b/platform-logic/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-platform-logic</artifactId>
diff --git a/platform-logic/ran-slice-api/pom.xml b/platform-logic/ran-slice-api/pom.xml
index 68fe7917..a0d78b00 100644
--- a/platform-logic/ran-slice-api/pom.xml
+++ b/platform-logic/ran-slice-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-platform-logic</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-ranSlice</artifactId>
diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml
index f1a6123d..65229e11 100644
--- a/platform-logic/restapi-templates/pom.xml
+++ b/platform-logic/restapi-templates/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-platform-logic</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-restapi-templates</artifactId>
diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml
index d9054b5b..0597c5aa 100644
--- a/platform-logic/sliapi/pom.xml
+++ b/platform-logic/sliapi/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-platform-logic</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-sliapi</artifactId>
diff --git a/pom.xml b/pom.xml
index f07a3c87..87ee1a93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>oparent</artifactId>
-        <version>2.2.2</version>
+        <version>2.2.3</version>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>distribution-root</artifactId>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution</name>
@@ -32,8 +32,8 @@
     <properties>
         <application.name>distribution</application.name>
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
-        <ccsdk.sli.version>1.3.2</ccsdk.sli.version>
-        <ccsdk.features.version>1.2.4</ccsdk.features.version>
+        <ccsdk.sli.version>1.3.3</ccsdk.sli.version>
+        <ccsdk.features.version>1.2.6</ccsdk.features.version>
         <ccsdk.distribution.version>${project.version}</ccsdk.distribution.version>
 
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml
index 166de8e2..5382a687 100644
--- a/saltstack-server/pom.xml
+++ b/saltstack-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>saltstack-server</artifactId>
diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml
index 1bef21cc..07cc64de 100644
--- a/ubuntu/pom.xml
+++ b/ubuntu/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-ubuntu</artifactId>
diff --git a/version.properties b/version.properties
index da56d9e4..beacb7c7 100644
--- a/version.properties
+++ b/version.properties
@@ -5,8 +5,8 @@
 
 
 release_name=1
-sprint_number=2
-feature_revision=4
+sprint_number=3
+feature_revision=1
 
 base_version=${release_name}.${sprint_number}.${feature_revision}
 
-- 
2.16.6