From cbc4a8b0c77c273c060c3e414071eb8fbcdf5498 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 5 Jun 2025 11:25:56 -0400 Subject: [PATCH 01/16] Use released version of Paris parent poms Update parent pom version to released Paris version Issue-ID: SDNC-1855 Signed-off-by: Dan Timoney Change-Id: I85ff6358138b3cfe0d72d359bc6fb47dfb364cb5 --- SdncReports/pom.xml | 2 +- admportal/pom.xml | 2 +- configbackuprestore/pom.xml | 2 +- pom.xml | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml index 3db0f35b..d96f0935 100644 --- a/SdncReports/pom.xml +++ b/SdncReports/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 3.1.0-SNAPSHOT + 3.1.1 diff --git a/admportal/pom.xml b/admportal/pom.xml index 6cce6771..67afae87 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 3.1.0-SNAPSHOT + 3.1.1 diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml index c95f7939..89190311 100644 --- a/configbackuprestore/pom.xml +++ b/configbackuprestore/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 3.1.0-SNAPSHOT + 3.1.1 org.onap.sdnc.oam.vnfbackup diff --git a/pom.xml b/pom.xml index 3c97b79b..fab09bc8 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 3.1.0-SNAPSHOT + 3.1.1 @@ -25,11 +25,11 @@ ${project.version} - 2.0.0 - 3.0.1 - 2.0.1 - 2.0.1 - 2.0.1 + 2.1.0 + 3.1.0 + 2.1.0 + 2.1.1 + 2.1.0 ${ccsdk.sli.version} 1.0.0 -- 2.16.6 From 8e02d8a64f0e03f4578c646e83b75480b68c76fb Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 18 Jun 2025 14:57:20 -0400 Subject: [PATCH 02/16] Fix errors in ODL startup Fixed errors in version of CCSDK base docker and startODL.sh script that caused problems starting up SDNC controller container. Issue-ID: SDNC-1855 Signed-off-by: Dan Timoney Change-Id: I02e4010d163ab18428a5f79343cb9a2e96bd4e3c --- installation/sdnc/src/main/scripts/startODL.sh | 2 +- pom.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh index 7de8e508..2d9f7499 100755 --- a/installation/sdnc/src/main/scripts/startODL.sh +++ b/installation/sdnc/src/main/scripts/startODL.sh @@ -366,7 +366,7 @@ if $SDNC_DB_INIT; then # Wait for database # printf "Waiting for mysql" - until mysql -h dbhost -u root -p"${MYSQL_ROOT_PASSWORD}" -e "select 1" > /dev/null 2>&1 + until mysql --skip-ssl -h dbhost -u root -p"${MYSQL_ROOT_PASSWORD}" -e "select 1" > /dev/null 2>&1 do printf "." sleep 1 diff --git a/pom.xml b/pom.xml index fab09bc8..052fc75a 100755 --- a/pom.xml +++ b/pom.xml @@ -33,10 +33,10 @@ ${ccsdk.sli.version} 1.0.0 - 2.0.1 - 2.0.1 - 2.0.1 - 2.0.1 + 2.1.0 + 2.1.0 + 2.1.0 + 2.1.0 -- 2.16.6 From 2fa7fbf1c58722020835c30bdd146e19963f0c3c Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 26 Jun 2025 10:35:23 -0400 Subject: [PATCH 03/16] Release version 3.1.0 of sdnc dockers Release version 3.1.0 of SDNC docker containers Issue-ID: SDNC-1855 Signed-off-by: Dan Timoney Change-Id: I8b99254d84cc3e4289fed72473166d5a7f14ffa0 --- releases/3.1.0-container.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 releases/3.1.0-container.yaml diff --git a/releases/3.1.0-container.yaml b/releases/3.1.0-container.yaml new file mode 100644 index 00000000..14e8b72f --- /dev/null +++ b/releases/3.1.0-container.yaml @@ -0,0 +1,19 @@ +--- +distribution_type: 'container' +container_release_tag: '3.1.0' +project: 'sdnc-oam' +log_dir: 'sdnc-oam-maven-docker-stage-master/2154/' +ref: 8e02d8a64f0e03f4578c646e83b75480b68c76fb +containers: + - name: 'sdnc-ansible-server-image' + version: '3.1.0-STAGING-20250626T132743Z' + - name: 'sdnc-aaf-image' + version: '3.1.0-STAGING-20250626T132743Z' + - name: 'sdnc-image' + version: '3.1.0-STAGING-20250626T132743Z' + - name: 'sdnc-web-image' + version: '3.1.0-STAGING-20250626T132743Z' + - name: 'sdnc-ueb-listener-image' + version: '3.1.0-STAGING-20250626T132743Z' + - name: 'sdnc-dmaap-listener-image' + version: '3.1.0-STAGING-20250626T132743Z' -- 2.16.6 From 728307b40050a7e690fe01b1ffeafe39b8ee1783 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 26 Jun 2025 10:49:07 -0400 Subject: [PATCH 04/16] Release version 3.1.0 of sdnc/oam maven artifacts Release version 3.1.0 of sdnc/oam maven artifacts and roll to next snapshot Issue-ID: SDNC-1855 Signed-off-by: Dan Timoney Change-Id: If4abd7936aa9150bd1ebabd61ba4e1edbbd13079 --- .gitignore | 3 +++ installation/ansible-server/pom.xml | 2 +- installation/dmaap-listener/pom.xml | 2 +- installation/pom.xml | 2 +- installation/sdnc-web/pom.xml | 2 +- installation/sdnc/pom.xml | 2 +- installation/ueb-listener/pom.xml | 2 +- platform-logic/datachange/pom.xml | 2 +- platform-logic/generic-resource-api/pom.xml | 2 +- platform-logic/installer/pom.xml | 2 +- platform-logic/lcm/pom.xml | 2 +- platform-logic/optical-service/pom.xml | 2 +- platform-logic/pom.xml | 2 +- platform-logic/restapi-templates/pom.xml | 2 +- platform-logic/restconfapi-yang/pom.xml | 2 +- platform-logic/setup/pom.xml | 2 +- platform-logic/vnfapi/pom.xml | 2 +- pom.xml | 2 +- releases/3.1.0.yaml | 5 +++++ version.properties | 2 +- 20 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 releases/3.1.0.yaml diff --git a/.gitignore b/.gitignore index 33b7de6d..a60d53a5 100755 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,6 @@ local-mode-cache #Yang generated **/restconfapi-yang/src/main/java/ **/yang-gen-sal/ + +# key/certificate files +**/src/main/resources/*.pem diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index f54657fa..63c44444 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT installation-ansible-server diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 3b236e1a..c776cdaa 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT installation-dmaap-listener diff --git a/installation/pom.xml b/installation/pom.xml index 619b16cd..960d1a28 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam sdnc-oam - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT installation diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index ff41f6a8..124f219a 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT installation-sdnc-web diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index bc95bff1..87471e64 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT installation-sdnc diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index faab443d..aac811eb 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT installation-ueb-listener diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml index 46f703ef..cd68db73 100644 --- a/platform-logic/datachange/pom.xml +++ b/platform-logic/datachange/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT platform-logic-datachange diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml index ae1ed8f5..0404241a 100644 --- a/platform-logic/generic-resource-api/pom.xml +++ b/platform-logic/generic-resource-api/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT platform-logic-generic-resource-api diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 3f73c4b2..d38cb2c1 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT platform-logic-installer diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml index 2c5c11fa..8335c1b1 100644 --- a/platform-logic/lcm/pom.xml +++ b/platform-logic/lcm/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT platform-logic-lcm diff --git a/platform-logic/optical-service/pom.xml b/platform-logic/optical-service/pom.xml index 105bb602..d59186f7 100644 --- a/platform-logic/optical-service/pom.xml +++ b/platform-logic/optical-service/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT platform-logic-optical-service diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 3c2192ae..a77cbc7a 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam sdnc-oam - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT platform-logic diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index d6c71395..c97a818e 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT platform-logic-restapi-templates diff --git a/platform-logic/restconfapi-yang/pom.xml b/platform-logic/restconfapi-yang/pom.xml index 0ab54a9e..3890dd63 100644 --- a/platform-logic/restconfapi-yang/pom.xml +++ b/platform-logic/restconfapi-yang/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT platform-logic-restconfapi-yang diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index e43e068a..d24cd050 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT platform-logic-setup diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index 57effff6..b2008a6f 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT platform-logic-vnfapi diff --git a/pom.xml b/pom.xml index 052fc75a..79dcd5f4 100755 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.onap.sdnc.oam sdnc-oam - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT pom sdnc-oam diff --git a/releases/3.1.0.yaml b/releases/3.1.0.yaml new file mode 100644 index 00000000..4f7c92f9 --- /dev/null +++ b/releases/3.1.0.yaml @@ -0,0 +1,5 @@ +--- +distribution_type: 'maven' +version: '3.1.0' +project: 'sdnc-oam' +log_dir: 'sdnc-oam-maven-stage-master/356/' diff --git a/version.properties b/version.properties index c179482f..b4d35cb0 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ release_name=3 sprint_number=1 -feature_revision=0 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision} -- 2.16.6 From 188aa5a24fa5ef746b3cfafec5d552047379c047 Mon Sep 17 00:00:00 2001 From: Kevin Sandi Date: Wed, 13 Aug 2025 12:00:10 -0600 Subject: [PATCH 05/16] Chore: Add dependabot config Issue-ID: CIMAN-33 Change-Id: I223260c3e6d6b87bb220c9284e4053e004fca98c Signed-off-by: Kevin Sandi Signed-off-by: Herbert Eiselt --- .github/dependabot.yml | 15 +++++++++++++++ installation/sdnc-web/pom.xml | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..5fe32abd --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,15 @@ +--- +# SPDX-FileCopyrightText: 2025 The Linux Foundation +# SPDX-License-Identifier: Apache-2.0 + +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index 124f219a..b10cab3a 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -15,7 +15,7 @@ Creates SDN Controller WebUI Docker container - docker.io/bitnami/nginx:1.21-debian-10 + docker.io/bitnami/nginx:1.25-debian-12 onap/sdnc-web-image ${project.version} ${maven.build.timestamp} -- 2.16.6 From cb7fa98f4e0fc246db94207c9cca9f1e2a2804bb Mon Sep 17 00:00:00 2001 From: Kevin Sandi Date: Fri, 19 Sep 2025 12:22:15 -0600 Subject: [PATCH 06/16] CI: Add Github2Gerrit workflow Issue-ID: CIMAN-33 Change-Id: I7486cce54fd59b92f07bc3747135b0cf7eefda01 Signed-off-by: Kevin Sandi --- .github/workflows/call-github2gerrit.yaml | 33 +++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/call-github2gerrit.yaml diff --git a/.github/workflows/call-github2gerrit.yaml b/.github/workflows/call-github2gerrit.yaml new file mode 100644 index 00000000..fa6ae05e --- /dev/null +++ b/.github/workflows/call-github2gerrit.yaml @@ -0,0 +1,33 @@ +--- +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2025 The Linux Foundation + +name: call-github2gerrit-reusable-workflow + +# yamllint disable-line rule:truthy +on: + workflow_dispatch: + pull_request_target: + types: [opened, reopened, edited, synchronize] + branches: + - master + - main + +concurrency: + # yamllint disable-line rule:line-length + group: ${{ github.workflow }}-${{ github.run_id }} + cancel-in-progress: true + +jobs: + call-in-g2g-workflow: + permissions: + contents: read + pull-requests: write + uses: lfit/github2gerrit/.github/workflows/github2gerrit.yaml@main + with: + GERRIT_KNOWN_HOSTS: ${{ vars.GERRIT_KNOWN_HOSTS }} + GERRIT_SSH_USER_G2G: ${{ vars.GERRIT_SSH_USER_G2G }} + GERRIT_SSH_USER_G2G_EMAIL: ${{ vars.GERRIT_SSH_USER_G2G_EMAIL }} + ORGANIZATION: ${{ vars.ORGANIZATION }} + secrets: + GERRIT_SSH_PRIVKEY_G2G: ${{ secrets.GERRIT_SSH_PRIVKEY_G2G }} -- 2.16.6 From 1ba119597ede491f69ab07352f046dc6dd107c33 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michael=20D=C3=BCrre?= Date: Fri, 17 Oct 2025 09:59:43 +0200 Subject: [PATCH 07/16] add odl patches to sdnc MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit add patches for env var and oauth fix to distribution Issue-ID: SDNC-1857 Change-Id: Ie90f71910a9d3512e91f64b5eea444e4b1158ced Signed-off-by: Michael Dürre --- installation/sdnc/pom.xml | 33 ++++++++++++++++++++++++++++ installation/sdnc/src/main/docker/Dockerfile | 4 ++++ 2 files changed, 37 insertions(+) diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 87471e64..df2d2a1a 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -24,6 +24,9 @@ org.onap.sdnc.p12 8443 + + 0.20.8 + 8.0.27 yyyyMMdd'T'HHmmss'Z' ${maven.build.timestamp} @@ -420,6 +423,36 @@ + + copy-with-alternalte-repo + generate-sources + + copy + + + + + com.highstreet-technologies.aaa + aaa-authn-api + ${odl.aaa.version} + ${project.build.directory}/docker-stage/patches + aaa-authn-api-${odl.aaa.version}.jar + * + + + com.highstreet-technologies.org.ops4j.pax.web + pax-web-jetty + ${odl.ops4j.version} + ${project.build.directory}/docker-stage/patches + pax-web-jetty-${odl.ops4j.version}.jar + * + + + + + diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index 4946dfe1..6d9e3aca 100755 --- a/installation/sdnc/src/main/docker/Dockerfile +++ b/installation/sdnc/src/main/docker/Dockerfile @@ -39,6 +39,10 @@ RUN sed -i -e "\|featuresRepositories|s|$|,${sdnr.features.repo},${sdnc.features # Add odl-netconf-topology to boot repositories RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g" $ODL_HOME/etc/org.apache.karaf.features.cfg +# copy patches +COPY patches/pax-web-jetty-${odl.ops4j.version}.jar $ODL_HOME/system/org/ops4j/pax/web/pax-web-jetty/${odl.ops4j.version}/ +COPY patches/aaa-authn-api-${odl.aaa.version}.jar $ODL_HOME/system/org/opendaylight/aaa/aaa-authn-api/${odl.aaa.version}/ + # Add aaa-app-config.xml Only if AAF is set to true (being passed as an argument in docker-maven-plugin configuration) COPY aaa-app-config.xml /tmp/aaa-app-config.xml RUN if "${AAF}" ; then \ -- 2.16.6 From c8a0c7aa69981f8e89a9d216038edd127fdb3033 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 20 Nov 2025 09:31:16 -0500 Subject: [PATCH 08/16] 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 Change-Id: Ica6788049d4440503c3d7e235ad3cec27adab283 --- installation/admportal/pom.xml | 2 +- installation/ansible-server/pom.xml | 4 ++-- installation/dmaap-listener/pom.xml | 4 ++-- installation/pom.xml | 2 +- installation/sdnc-web/pom.xml | 4 ++-- installation/sdnc/pom.xml | 4 ++-- installation/ueb-listener/pom.xml | 4 ++-- platform-logic/datachange/pom.xml | 2 +- platform-logic/generic-resource-api/pom.xml | 2 +- platform-logic/installer/pom.xml | 2 +- platform-logic/lcm/pom.xml | 2 +- platform-logic/optical-service/pom.xml | 2 +- platform-logic/pom.xml | 2 +- platform-logic/restapi-templates/pom.xml | 2 +- platform-logic/restconfapi-yang/pom.xml | 2 +- platform-logic/setup/pom.xml | 2 +- platform-logic/vnfapi/pom.xml | 2 +- pom.xml | 22 ++++++++++++---------- version.properties | 4 ++-- 19 files changed, 36 insertions(+), 34 deletions(-) diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index 33133555..97a474b6 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/pom.xml @@ -49,7 +49,7 @@ io.fabric8 docker-maven-plugin - 0.28.0 + ${docker.maven.plugin.version} false diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index 63c44444..22632370 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT installation-ansible-server @@ -81,7 +81,7 @@ io.fabric8 docker-maven-plugin - 0.34.0 + ${docker.maven.plugin.version} false diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index c776cdaa..3db2e690 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT installation-dmaap-listener @@ -170,7 +170,7 @@ io.fabric8 docker-maven-plugin - 0.34.0 + ${docker.maven.plugin.version} false diff --git a/installation/pom.xml b/installation/pom.xml index 960d1a28..3461a82b 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam sdnc-oam - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT installation diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index b10cab3a..d47af463 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT installation-sdnc-web @@ -159,7 +159,7 @@ io.fabric8 docker-maven-plugin - 0.34.0 + ${docker.maven.plugin.version} false diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index df2d2a1a..8c95979e 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT installation-sdnc @@ -183,7 +183,7 @@ io.fabric8 docker-maven-plugin - 0.39.0 + ${docker.maven.plugin.version} false diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index aac811eb..19dbf2e3 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT installation-ueb-listener @@ -170,7 +170,7 @@ io.fabric8 docker-maven-plugin - 0.34.0 + ${docker.maven.plugin.version} false diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml index cd68db73..81a734d0 100644 --- a/platform-logic/datachange/pom.xml +++ b/platform-logic/datachange/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT platform-logic-datachange diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml index 0404241a..3236a024 100644 --- a/platform-logic/generic-resource-api/pom.xml +++ b/platform-logic/generic-resource-api/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT platform-logic-generic-resource-api diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index d38cb2c1..1e0242be 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT platform-logic-installer diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml index 8335c1b1..aeadc656 100644 --- a/platform-logic/lcm/pom.xml +++ b/platform-logic/lcm/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT platform-logic-lcm diff --git a/platform-logic/optical-service/pom.xml b/platform-logic/optical-service/pom.xml index d59186f7..2a8af5a2 100644 --- a/platform-logic/optical-service/pom.xml +++ b/platform-logic/optical-service/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT platform-logic-optical-service diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index a77cbc7a..9d2d4119 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam sdnc-oam - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT platform-logic diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index c97a818e..12292f5c 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT platform-logic-restapi-templates diff --git a/platform-logic/restconfapi-yang/pom.xml b/platform-logic/restconfapi-yang/pom.xml index 3890dd63..e28a2d1f 100644 --- a/platform-logic/restconfapi-yang/pom.xml +++ b/platform-logic/restconfapi-yang/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT platform-logic-restconfapi-yang diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index d24cd050..005d2592 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT platform-logic-setup diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index b2008a6f..2b0fc9ee 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT platform-logic-vnfapi diff --git a/pom.xml b/pom.xml index 79dcd5f4..24661188 100755 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.onap.sdnc.oam sdnc-oam - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT pom sdnc-oam @@ -25,18 +25,20 @@ ${project.version} - 2.1.0 - 3.1.0 - 2.1.0 - 2.1.1 - 2.1.0 + 2.2.0 + 3.2.0 + 2.2.0 + 2.2.0 + 2.2.0 ${ccsdk.sli.version} 1.0.0 - 2.1.0 - 2.1.0 - 2.1.0 - 2.1.0 + 2.2.0 + 2.2.0 + 2.2.0 + 2.2.0 + + 0.47.0 diff --git a/version.properties b/version.properties index b4d35cb0..410c0fb5 100644 --- 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} -- 2.16.6 From fda25336333ffb8ffe755e0087d7200d9ea09c02 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 21 Nov 2025 15:25:31 -0500 Subject: [PATCH 09/16] Update nginx image for sdnc-web Update nginx image for sdnc-web to resolve docker build issue Issue-ID: SDNC-1858 Signed-off-by: Dan Timoney Change-Id: Ibf3cb44636becc5c35b11f010f86118aa470f7d0 --- installation/sdnc-web/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index d47af463..ba215a2d 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -15,7 +15,7 @@ Creates SDN Controller WebUI Docker container - docker.io/bitnami/nginx:1.25-debian-12 + docker.io/bitnamilegacy/nginx:1.25-debian-12 onap/sdnc-web-image ${project.version} ${maven.build.timestamp} -- 2.16.6 From 11d4b222df330bac858aada6e17fd5a27c5cbb8a Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 4 Dec 2025 11:26:38 -0500 Subject: [PATCH 10/16] Update features version to 2.2.1 Update features version to latest Quebec released version 2.2.1 Issue-ID: SDNC-1858 Signed-off-by: Dan Timoney Change-Id: I0301a94941665ca23c587f7be9310f1b037d6d7a --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 24661188..e94634df 100755 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 3.2.0 2.2.0 2.2.0 - 2.2.0 + 2.2.1 ${ccsdk.sli.version} 1.0.0 -- 2.16.6 From 1f9c84c8a81844c09ab073f868e890c4cc200dc9 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 5 Dec 2025 12:43:30 -0500 Subject: [PATCH 11/16] Fix versions Updated versions of parent poms and removed a workaround in Dockerfile that breaks yangtools dependencies with OpenDaylight Scandium release Issue-ID: SDNC-1858 Signed-off-by: Dan Timoney Change-Id: I7c14a1fc570e2dc0069ac4473aeac0cb12e2eed0 --- SdncReports/pom.xml | 2 +- admportal/pom.xml | 2 +- configbackuprestore/pom.xml | 2 +- installation/sdnc/src/main/docker/Dockerfile | 3 ++- pom.xml | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml index d96f0935..cc08fbe4 100644 --- a/SdncReports/pom.xml +++ b/SdncReports/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 3.1.1 + 3.2.0 diff --git a/admportal/pom.xml b/admportal/pom.xml index 67afae87..6a746b5f 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 3.1.1 + 3.2.0 diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml index 89190311..4436867a 100644 --- a/configbackuprestore/pom.xml +++ b/configbackuprestore/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 3.1.1 + 3.2.0 org.onap.sdnc.oam.vnfbackup diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index 6d9e3aca..90b355cc 100755 --- a/installation/sdnc/src/main/docker/Dockerfile +++ b/installation/sdnc/src/main/docker/Dockerfile @@ -67,8 +67,9 @@ RUN echo org.ops4j.pax.web.ssl.keypassword=\"$SDNC_KEYPASS\" >> $ODL_HOME/etc/cu RUN cp /opt/onap/sdnc/data/properties/svclogic-compiler.properties /opt/onap/sdnc/svclogic/config/svclogic.properties # Short term fix starts: for javax.servlet-api bundle (Replacing 4.0.1 to 3.1.0 as it's unique for javax.servlet-api) -RUN find /opt/opendaylight -name "*features*.xml" -exec sed -i -e 's|4.0.1|3.1.0|g' {} \; +# RUN find /opt/opendaylight -name "*features*.xml" -exec sed -i -e 's|4.0.1|3.1.0|g' {} \; # Short term fix ends +# Commented out by dtimoney : breaks yangtools dependencies in ODL Scandium release # Remediate log4shell vuln RUN apk add zip diff --git a/pom.xml b/pom.xml index e94634df..266d2465 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 3.1.1 + 3.2.0 -- 2.16.6 From fb7c794e7e0c1a86bb4432887fb99071670c5374 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Mon, 8 Dec 2025 13:42:29 -0500 Subject: [PATCH 12/16] Release Quebec SDNC docker container v3.2.0 Release Quebec SDNC docker containers (v3.2.0) Issue-ID: SDNC-1858 Signed-off-by: Dan Timoney Change-Id: I08c74ccd81fe2c4a9c32ec5cfba72447385d0d15 --- releases/3.2.0-container.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 releases/3.2.0-container.yaml diff --git a/releases/3.2.0-container.yaml b/releases/3.2.0-container.yaml new file mode 100644 index 00000000..6116686b --- /dev/null +++ b/releases/3.2.0-container.yaml @@ -0,0 +1,19 @@ +--- +distribution_type: 'container' +container_release_tag: '3.2.0' +project: 'sdnc-oam' +log_dir: 'sdnc-oam-maven-docker-stage-master/2323/' +ref: 1f9c84c8a81844c09ab073f868e890c4cc200dc9 +containers: + - name: 'sdnc-ansible-server-image' + version: '3.2.0-STAGING-20251208T161058Z' + - name: 'sdnc-aaf-image' + version: '3.2.0-STAGING-20251208T161058Z' + - name: 'sdnc-image' + version: '3.2.0-STAGING-20251208T161058Z' + - name: 'sdnc-web-image' + version: '3.2.0-STAGING-20251208T161058Z' + - name: 'sdnc-ueb-listener-image' + version: '3.2.0-STAGING-20251208T161058Z' + - name: 'sdnc-dmaap-listener-image' + version: '3.2.0-STAGING-20251208T161058Z' -- 2.16.6 From 1645548a5bf9813919438ca71be27e7f6c9325fe Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Mon, 8 Dec 2025 13:44:35 -0500 Subject: [PATCH 13/16] Release Quebec SDNC OAM artifacts v3.2.0 Release Quebec SDNC oam maven artifacts (v3.2.0) and roll to next snapshot Issue-ID: SDNC-1858 Signed-off-by: Dan Timoney Change-Id: I066701e8e0fbb5ac3ded836bcee45baadf12e3f5 --- installation/ansible-server/pom.xml | 2 +- installation/dmaap-listener/pom.xml | 2 +- installation/pom.xml | 2 +- installation/sdnc-web/pom.xml | 2 +- installation/sdnc/pom.xml | 2 +- installation/ueb-listener/pom.xml | 2 +- platform-logic/datachange/pom.xml | 2 +- platform-logic/generic-resource-api/pom.xml | 2 +- platform-logic/installer/pom.xml | 2 +- platform-logic/lcm/pom.xml | 2 +- platform-logic/optical-service/pom.xml | 2 +- platform-logic/pom.xml | 2 +- platform-logic/restapi-templates/pom.xml | 2 +- platform-logic/restconfapi-yang/pom.xml | 2 +- platform-logic/setup/pom.xml | 2 +- platform-logic/vnfapi/pom.xml | 2 +- pom.xml | 2 +- releases/3.2.0.yaml | 5 +++++ version.properties | 2 +- 19 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 releases/3.2.0.yaml diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index 22632370..46291dc9 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 3.2.0-SNAPSHOT + 3.2.1-SNAPSHOT installation-ansible-server diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 3db2e690..37c60249 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 3.2.0-SNAPSHOT + 3.2.1-SNAPSHOT installation-dmaap-listener diff --git a/installation/pom.xml b/installation/pom.xml index 3461a82b..b65287b1 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam sdnc-oam - 3.2.0-SNAPSHOT + 3.2.1-SNAPSHOT installation diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index ba215a2d..95ca91e6 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 3.2.0-SNAPSHOT + 3.2.1-SNAPSHOT installation-sdnc-web diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 8c95979e..b1968a89 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 3.2.0-SNAPSHOT + 3.2.1-SNAPSHOT installation-sdnc diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index 19dbf2e3..b62a8aa9 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 3.2.0-SNAPSHOT + 3.2.1-SNAPSHOT installation-ueb-listener diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml index 81a734d0..916f6638 100644 --- a/platform-logic/datachange/pom.xml +++ b/platform-logic/datachange/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.2.0-SNAPSHOT + 3.2.1-SNAPSHOT platform-logic-datachange diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml index 3236a024..aa5181dd 100644 --- a/platform-logic/generic-resource-api/pom.xml +++ b/platform-logic/generic-resource-api/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.2.0-SNAPSHOT + 3.2.1-SNAPSHOT platform-logic-generic-resource-api diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 1e0242be..2f02034b 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.2.0-SNAPSHOT + 3.2.1-SNAPSHOT platform-logic-installer diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml index aeadc656..6fa89ad5 100644 --- a/platform-logic/lcm/pom.xml +++ b/platform-logic/lcm/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.2.0-SNAPSHOT + 3.2.1-SNAPSHOT platform-logic-lcm diff --git a/platform-logic/optical-service/pom.xml b/platform-logic/optical-service/pom.xml index 2a8af5a2..9133f31c 100644 --- a/platform-logic/optical-service/pom.xml +++ b/platform-logic/optical-service/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.2.0-SNAPSHOT + 3.2.1-SNAPSHOT platform-logic-optical-service diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 9d2d4119..77ba3aaf 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam sdnc-oam - 3.2.0-SNAPSHOT + 3.2.1-SNAPSHOT platform-logic diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 12292f5c..96d83f2c 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.2.0-SNAPSHOT + 3.2.1-SNAPSHOT platform-logic-restapi-templates diff --git a/platform-logic/restconfapi-yang/pom.xml b/platform-logic/restconfapi-yang/pom.xml index e28a2d1f..f1c9714f 100644 --- a/platform-logic/restconfapi-yang/pom.xml +++ b/platform-logic/restconfapi-yang/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.2.0-SNAPSHOT + 3.2.1-SNAPSHOT platform-logic-restconfapi-yang diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index 005d2592..35d56d94 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.2.0-SNAPSHOT + 3.2.1-SNAPSHOT platform-logic-setup diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index 2b0fc9ee..b0bbfc20 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.2.0-SNAPSHOT + 3.2.1-SNAPSHOT platform-logic-vnfapi diff --git a/pom.xml b/pom.xml index 266d2465..e8f3b282 100755 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.onap.sdnc.oam sdnc-oam - 3.2.0-SNAPSHOT + 3.2.1-SNAPSHOT pom sdnc-oam diff --git a/releases/3.2.0.yaml b/releases/3.2.0.yaml new file mode 100644 index 00000000..2d3ed527 --- /dev/null +++ b/releases/3.2.0.yaml @@ -0,0 +1,5 @@ +--- +distribution_type: 'maven' +version: '3.2.0' +project: 'sdnc-oam' +log_dir: 'sdnc-oam-maven-stage-master/360/' diff --git a/version.properties b/version.properties index 410c0fb5..47e8a24f 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ release_name=3 sprint_number=2 -feature_revision=0 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision} -- 2.16.6 From 27e31f354684027d31a91819a895be32fc09a54e Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 10 Dec 2025 12:31:41 -0500 Subject: [PATCH 14/16] Use Java 21 alpine base images Update to dmaap-listener and ueb-listener to use Java 21 base images and update parent version to pick up deploy plugin version change Issue-ID: SDNC-1858 Signed-off-by: Dan Timoney Change-Id: I8c82fad78535a89ec74519df9a7674295c7ee208 --- .gitignore | 3 +++ SdncReports/pom.xml | 2 +- admportal/pom.xml | 2 +- configbackuprestore/pom.xml | 2 +- installation/dmaap-listener/pom.xml | 21 ++++++++++++++++++++- .../dmaap-listener/src/main/docker/Dockerfile | 10 ++++++++-- .../src/main/resources/README-custom-certs.md | 3 +++ installation/ueb-listener/pom.xml | 21 ++++++++++++++++++++- .../ueb-listener/src/main/docker/Dockerfile | 9 +++++++-- .../src/main/resources/README-custom-certs.md | 3 +++ pom.xml | 5 +++-- 11 files changed, 70 insertions(+), 11 deletions(-) create mode 100644 installation/dmaap-listener/src/main/resources/README-custom-certs.md create mode 100644 installation/ueb-listener/src/main/resources/README-custom-certs.md diff --git a/.gitignore b/.gitignore index a60d53a5..77145227 100755 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,6 @@ local-mode-cache # key/certificate files **/src/main/resources/*.pem + +# logfiles +*.log diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml index cc08fbe4..334e1ca1 100644 --- a/SdncReports/pom.xml +++ b/SdncReports/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 3.2.0 + 3.2.1 diff --git a/admportal/pom.xml b/admportal/pom.xml index 6a746b5f..fd336e19 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 3.2.0 + 3.2.1 diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml index 4436867a..8cd5c18c 100644 --- a/configbackuprestore/pom.xml +++ b/configbackuprestore/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 3.2.0 + 3.2.1 org.onap.sdnc.oam.vnfbackup diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 37c60249..0a28accb 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -21,7 +21,6 @@ onap/sdnc-dmaap-listener-image ${project.version} ${maven.build.timestamp} - ${ccsdk.docker.alpine.j11.version} ${https_proxy} yyyyMMdd'T'HHmmss'Z' @@ -119,6 +118,26 @@ + + copy-certificates + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/resources + + *.pem + *.md + + false + + + + diff --git a/installation/dmaap-listener/src/main/docker/Dockerfile b/installation/dmaap-listener/src/main/docker/Dockerfile index 51ae3ad1..4d364ef4 100644 --- a/installation/dmaap-listener/src/main/docker/Dockerfile +++ b/installation/dmaap-listener/src/main/docker/Dockerfile @@ -1,8 +1,14 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-alpine-j17-image:${ccsdk.docker.version} AS stage0 +FROM onap/${ccsdk.docker.alpine.image}:${ccsdk.docker.alpine.version} AS stage0 USER root ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties +# Copy any certs +COPY *.md *.pem /etc/ssl/certs/ + +# Install certs +RUN update-ca-certificates + # copy deliverables to opt COPY opt /opt @@ -12,7 +18,7 @@ RUN zip -q -d /opt/onap/sdnc/dmaap-listener/lib/log4j-core-*.jar org/apache/logg # End of stage 0 -FROM onap/ccsdk-alpine-j17-image:${ccsdk.docker.version} +FROM onap/${ccsdk.docker.alpine.image}:${ccsdk.docker.alpine.version} MAINTAINER SDNC Team (onap-sdnc@lists.onap.org) diff --git a/installation/dmaap-listener/src/main/resources/README-custom-certs.md b/installation/dmaap-listener/src/main/resources/README-custom-certs.md new file mode 100644 index 00000000..ac414c11 --- /dev/null +++ b/installation/dmaap-listener/src/main/resources/README-custom-certs.md @@ -0,0 +1,3 @@ +Any .pem files in this directory will be copied to /etc/ssl/certs on the +docker container and installed prior to running apk. This might be needed, +for example, for docker builds to work properly behind a corporate firewall. diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index b62a8aa9..d1bd87fe 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -21,7 +21,6 @@ onap/sdnc-ueb-listener-image ${project.version} ${maven.build.timestamp} - ${ccsdk.docker.alpine.j11.version} ${https_proxy} yyyyMMdd'T'HHmmss'Z' @@ -119,6 +118,26 @@ + + copy-certificates + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/resources + + *.pem + *.md + + false + + + + diff --git a/installation/ueb-listener/src/main/docker/Dockerfile b/installation/ueb-listener/src/main/docker/Dockerfile index 746c6c51..8e1be786 100644 --- a/installation/ueb-listener/src/main/docker/Dockerfile +++ b/installation/ueb-listener/src/main/docker/Dockerfile @@ -1,8 +1,13 @@ # Base alpine with added packages needed for open ecomp -FROM onap/ccsdk-alpine-j17-image:${ccsdk.docker.version} AS stage0 +FROM onap/${ccsdk.docker.alpine.image}:${ccsdk.docker.alpine.version} AS stage0 USER root ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties +# Copy any certs +COPY *.md *.pem /etc/ssl/certs/ + +# Install certs +RUN update-ca-certificates # copy deliverables to opt COPY opt /opt @@ -15,7 +20,7 @@ RUN zip -q -d /opt/onap/sdnc/ueb-listener/lib/log4j-core-*.jar org/apache/loggin # End of stage0 -FROM onap/ccsdk-alpine-j17-image:${ccsdk.docker.version} +FROM onap/${ccsdk.docker.alpine.image}:${ccsdk.docker.alpine.version} MAINTAINER SDNC Team (onap-sdnc@lists.onap.org) ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties diff --git a/installation/ueb-listener/src/main/resources/README-custom-certs.md b/installation/ueb-listener/src/main/resources/README-custom-certs.md new file mode 100644 index 00000000..ac414c11 --- /dev/null +++ b/installation/ueb-listener/src/main/resources/README-custom-certs.md @@ -0,0 +1,3 @@ +Any .pem files in this directory will be copied to /etc/ssl/certs on the +docker container and installed prior to running apk. This might be needed, +for example, for docker builds to work properly behind a corporate firewall. diff --git a/pom.xml b/pom.xml index e8f3b282..75356d06 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 3.2.0 + 3.2.1 @@ -33,7 +33,8 @@ ${ccsdk.sli.version} 1.0.0 - 2.2.0 + ccsdk-alpine-j21-image + 2.2.0 2.2.0 2.2.0 2.2.0 -- 2.16.6 From 9cbed6650e9d7ad06ad3adcd1df6c30df252b29b Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Mon, 15 Dec 2025 10:22:16 -0500 Subject: [PATCH 15/16] Release version 3.2.1 of sdnc/oam dockers Release version 3.2.1 of sdnc/oam docker containers Issue-ID: SDNC-1858 Signed-off-by: Dan Timoney Change-Id: I8330643e40de32dd0f15d19d7973718c5c6897aa --- releases/3.2.1-container.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 releases/3.2.1-container.yaml diff --git a/releases/3.2.1-container.yaml b/releases/3.2.1-container.yaml new file mode 100644 index 00000000..51205507 --- /dev/null +++ b/releases/3.2.1-container.yaml @@ -0,0 +1,19 @@ +--- +distribution_type: 'container' +container_release_tag: '3.2.1' +project: 'sdnc-oam' +log_dir: 'sdnc-oam-maven-docker-stage-master/2331/' +ref: 27e31f354684027d31a91819a895be32fc09a54e +containers: + - name: 'sdnc-ansible-server-image' + version: '3.2.1-STAGING-20251215T142951Z' + - name: 'sdnc-aaf-image' + version: '3.2.1-STAGING-20251215T142951Z' + - name: 'sdnc-image' + version: '3.2.1-STAGING-20251215T142951Z' + - name: 'sdnc-web-image' + version: '3.2.1-STAGING-20251215T142951Z' + - name: 'sdnc-ueb-listener-image' + version: '3.2.1-STAGING-20251215T142951Z' + - name: 'sdnc-dmaap-listener-image' + version: '3.2.1-STAGING-20251215T142951Z' -- 2.16.6 From 511021eaea77a79878da33281840bd30d23c7497 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Mon, 15 Dec 2025 10:25:29 -0500 Subject: [PATCH 16/16] Release version 3.2.1 of sdnc/oam maven artifacts Release version 3.2.1 of sdnc/oam maven artifacts and roll snapshot Issue-ID: SDNC-1858 Signed-off-by: Dan Timoney Change-Id: Ibc186e38c2493e9f0dfa3f6bbde9b51284c6ec2a --- installation/ansible-server/pom.xml | 2 +- installation/dmaap-listener/pom.xml | 2 +- installation/pom.xml | 2 +- installation/sdnc-web/pom.xml | 2 +- installation/sdnc/pom.xml | 2 +- installation/ueb-listener/pom.xml | 2 +- platform-logic/datachange/pom.xml | 2 +- platform-logic/generic-resource-api/pom.xml | 2 +- platform-logic/installer/pom.xml | 2 +- platform-logic/lcm/pom.xml | 2 +- platform-logic/optical-service/pom.xml | 2 +- platform-logic/pom.xml | 2 +- platform-logic/restapi-templates/pom.xml | 2 +- platform-logic/restconfapi-yang/pom.xml | 2 +- platform-logic/setup/pom.xml | 2 +- platform-logic/vnfapi/pom.xml | 2 +- pom.xml | 2 +- releases/3.2.1.yaml | 5 +++++ version.properties | 2 +- 19 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 releases/3.2.1.yaml diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index 46291dc9..532c5150 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 3.2.1-SNAPSHOT + 3.2.2-SNAPSHOT installation-ansible-server diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 0a28accb..8ab8ab32 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 3.2.1-SNAPSHOT + 3.2.2-SNAPSHOT installation-dmaap-listener diff --git a/installation/pom.xml b/installation/pom.xml index b65287b1..6006e816 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam sdnc-oam - 3.2.1-SNAPSHOT + 3.2.2-SNAPSHOT installation diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index 95ca91e6..e84badfa 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 3.2.1-SNAPSHOT + 3.2.2-SNAPSHOT installation-sdnc-web diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index b1968a89..56276b69 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 3.2.1-SNAPSHOT + 3.2.2-SNAPSHOT installation-sdnc diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index d1bd87fe..1feabed1 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam installation - 3.2.1-SNAPSHOT + 3.2.2-SNAPSHOT installation-ueb-listener diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml index 916f6638..78ec5ab9 100644 --- a/platform-logic/datachange/pom.xml +++ b/platform-logic/datachange/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.2.1-SNAPSHOT + 3.2.2-SNAPSHOT platform-logic-datachange diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml index aa5181dd..2d0ebc43 100644 --- a/platform-logic/generic-resource-api/pom.xml +++ b/platform-logic/generic-resource-api/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.2.1-SNAPSHOT + 3.2.2-SNAPSHOT platform-logic-generic-resource-api diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 2f02034b..d32f93ef 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.2.1-SNAPSHOT + 3.2.2-SNAPSHOT platform-logic-installer diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml index 6fa89ad5..50d7719e 100644 --- a/platform-logic/lcm/pom.xml +++ b/platform-logic/lcm/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.2.1-SNAPSHOT + 3.2.2-SNAPSHOT platform-logic-lcm diff --git a/platform-logic/optical-service/pom.xml b/platform-logic/optical-service/pom.xml index 9133f31c..942dc115 100644 --- a/platform-logic/optical-service/pom.xml +++ b/platform-logic/optical-service/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.2.1-SNAPSHOT + 3.2.2-SNAPSHOT platform-logic-optical-service diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 77ba3aaf..11049189 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam sdnc-oam - 3.2.1-SNAPSHOT + 3.2.2-SNAPSHOT platform-logic diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 96d83f2c..52086e32 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.2.1-SNAPSHOT + 3.2.2-SNAPSHOT platform-logic-restapi-templates diff --git a/platform-logic/restconfapi-yang/pom.xml b/platform-logic/restconfapi-yang/pom.xml index f1c9714f..80241360 100644 --- a/platform-logic/restconfapi-yang/pom.xml +++ b/platform-logic/restconfapi-yang/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.2.1-SNAPSHOT + 3.2.2-SNAPSHOT platform-logic-restconfapi-yang diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index 35d56d94..7cd5cf06 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.2.1-SNAPSHOT + 3.2.2-SNAPSHOT platform-logic-setup diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index b0bbfc20..6a45e458 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam platform-logic - 3.2.1-SNAPSHOT + 3.2.2-SNAPSHOT platform-logic-vnfapi diff --git a/pom.xml b/pom.xml index 75356d06..f8469b35 100755 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.onap.sdnc.oam sdnc-oam - 3.2.1-SNAPSHOT + 3.2.2-SNAPSHOT pom sdnc-oam diff --git a/releases/3.2.1.yaml b/releases/3.2.1.yaml new file mode 100644 index 00000000..4255e7f2 --- /dev/null +++ b/releases/3.2.1.yaml @@ -0,0 +1,5 @@ +--- +distribution_type: 'maven' +version: '3.2.1' +project: 'sdnc-oam' +log_dir: 'sdnc-oam-maven-stage-master/361/' diff --git a/version.properties b/version.properties index 47e8a24f..ee1f7a9d 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ release_name=3 sprint_number=2 -feature_revision=1 +feature_revision=2 base_version=${release_name}.${sprint_number}.${feature_revision} -- 2.16.6