From d32e697ebf04bb1b3d64dbc7640629870cf8f54a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michael=20D=C3=9Crre?= 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 Change-Id: Ifd8f08c81e7a0ba138f145779e86dd864ecf9744 Signed-off-by: Michael DÜrre --- 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 | 4 ++-- saltstack-server/pom.xml | 2 +- ubuntu/pom.xml | 2 +- version.properties | 2 +- 24 files changed, 47 insertions(+), 38 deletions(-) diff --git a/alpine/java11/pom.xml b/alpine/java11/pom.xml index 109740e0..2a931bb1 100644 --- a/alpine/java11/pom.xml +++ b/alpine/java11/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-alpine-root - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT distribution-j11-alpine diff --git a/alpine/pom.xml b/alpine/pom.xml index 57a641d0..5c5d2598 100644 --- a/alpine/pom.xml +++ b/alpine/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT distribution-alpine-root diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml index a5761524..8663c1ae 100644 --- a/ansible-server/pom.xml +++ b/ansible-server/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.distribution distribution-root - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT org.onap.ccsdk.distribution ansible-server - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom ccsdk-distribution :: ${project.artifactId} diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 3ecc8218..80c08515 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT dependencies @@ -22,7 +22,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 2.2.1 + 2.3.1-SNAPSHOT import pom diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml index 4c5bf400..251a0393 100644 --- a/dgbuilder-docker/pom.xml +++ b/dgbuilder-docker/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT org.onap.ccsdk.distribution diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml index c2b76a19..4cd623cd 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT org.onap.ccsdk.distribution diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 533be365..785c8f4d 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-odlsli - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT distribution-odlsli-alpine diff --git a/odlsli/pom.xml b/odlsli/pom.xml index 0b744c09..f8413c78 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT distribution-odlsli diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index 58249905..cdc3ba79 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT distribution-opendaylight diff --git a/opendaylight/silicon/pom.xml b/opendaylight/silicon/pom.xml index 5781b942..317ef46e 100644 --- a/opendaylight/silicon/pom.xml +++ b/opendaylight/silicon/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-opendaylight - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT distribution-odl-silicon @@ -19,7 +19,7 @@ - 0.14.1 + 0.14.2 diff --git a/opendaylight/silicon/silicon-alpine/pom.xml b/opendaylight/silicon/silicon-alpine/pom.xml index 4f741ac0..7b85371e 100644 --- a/opendaylight/silicon/silicon-alpine/pom.xml +++ b/opendaylight/silicon/silicon-alpine/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-odl-silicon - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT distribution-odl-silicon-docker @@ -20,8 +20,9 @@ onap/ccsdk-odl-silicon-alpine-image onap-karaf - 0.13.3 - 7.3.13 + 0.13.5 + 7.3.16 + 1.13.4 @@ -79,14 +80,6 @@ - - com.highstreet-technologies.aaa - aaa-shiro - ${odl.shiro.version} - ${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-shiro/${odl.shiro.version} - aaa-shiro-${odl.shiro.version}.jar - * - com.highstreet-technologies.aaa aaa-authn-api @@ -103,6 +96,22 @@ pax-web-jetty-${odl.ops4j.version}.jar * + + com.highstreet-technologies.netconf + netconf-util + ${odl.netconf.version} + ${project.build.directory}/docker-stage/system/org/opendaylight/netconf/netconf-util/${odl.netconf.version} + netconf-util-${odl.netconf.version}.jar + * + + + com.highstreet-technologies.netconf + sal-netconf-connector + ${odl.netconf.version} + ${project.build.directory}/docker-stage/system/org/opendaylight/netconf/sal-netconf-connector/${odl.netconf.version} + sal-netconf-connector-${odl.netconf.version}.jar + * + false true diff --git a/platform-logic/a1Adapter-api/pom.xml b/platform-logic/a1Adapter-api/pom.xml index abd1f0f3..51e607f2 100644 --- a/platform-logic/a1Adapter-api/pom.xml +++ b/platform-logic/a1Adapter-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT platform-logic-a1Adapterapi diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml index d9d84b1a..1f94ee41 100644 --- a/platform-logic/asdc-api/pom.xml +++ b/platform-logic/asdc-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT platform-logic-asdcapi diff --git a/platform-logic/cMNotify-api/pom.xml b/platform-logic/cMNotify-api/pom.xml index a78b388b..a40272c5 100644 --- a/platform-logic/cMNotify-api/pom.xml +++ b/platform-logic/cMNotify-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT platform-logic-cMNotifyai diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 61d14d5a..037b2d7c 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT platform-logic-installer diff --git a/platform-logic/oofpcipoc-api/pom.xml b/platform-logic/oofpcipoc-api/pom.xml index 605a7664..5a9dd4f8 100644 --- a/platform-logic/oofpcipoc-api/pom.xml +++ b/platform-logic/oofpcipoc-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT platform-logic-oofpcipocapi diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 2807fed4..8f056c51 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT distribution-platform-logic diff --git a/platform-logic/ran-slice-api/pom.xml b/platform-logic/ran-slice-api/pom.xml index 44331a5f..a0d78b00 100644 --- a/platform-logic/ran-slice-api/pom.xml +++ b/platform-logic/ran-slice-api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT platform-logic-ranSlice diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 21fdd5f6..65229e11 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT platform-logic-restapi-templates diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml index a0fd79ce..0597c5aa 100644 --- a/platform-logic/sliapi/pom.xml +++ b/platform-logic/sliapi/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-platform-logic - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT platform-logic-sliapi diff --git a/pom.xml b/pom.xml index 6b422789..b1faf1df 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent oparent - 2.3.0 + 2.3.1 org.onap.ccsdk.distribution distribution-root - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom ccsdk-distribution diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml index cc707784..5382a687 100644 --- a/saltstack-server/pom.xml +++ b/saltstack-server/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT saltstack-server diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml index f7f79482..07cc64de 100644 --- a/ubuntu/pom.xml +++ b/ubuntu/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.distribution distribution-root - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT distribution-ubuntu diff --git a/version.properties b/version.properties index 8e5be7b0..beacb7c7 100644 --- a/version.properties +++ b/version.properties @@ -6,7 +6,7 @@ release_name=1 sprint_number=3 -feature_revision=0 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision} -- 2.16.6