From 7ec6b1efaeed1820912aa85d04d58d75c5f96664 Mon Sep 17 00:00:00 2001
From: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Date: Fri, 29 Oct 2021 08:08:28 +0200
Subject: mirgate dist to sr2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
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>
---
 opendaylight/pom.xml                        |  2 +-
 opendaylight/silicon/pom.xml                |  4 ++--
 opendaylight/silicon/silicon-alpine/pom.xml | 31 +++++++++++++++++++----------
 3 files changed, 23 insertions(+), 14 deletions(-)

(limited to 'opendaylight')

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>
-- 
cgit 1.2.3-korg