From: Dan Timoney Date: Wed, 14 May 2025 20:03:54 +0000 (-0400) Subject: Use Java 21 / Maven 3.9 for current CCSDK release X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=78749b8926b88be2c70cfafff536c8d22e3c25a9;p=ci-management.git Use Java 21 / Maven 3.9 for current CCSDK release Latest OpenDaylight version requires Java 21 and Maven version >= 3.9.5 Issue-ID: CCSDK-4089 Change-Id: I3552b62a892c9ba0456d72a97afb705b9c3e3897 Signed-off-by: Dan Timoney --- diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index aa4c796b7..8027be0f8 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -6,7 +6,7 @@ - project-view - project: - name: ccsdk-apps-released-java21 + name: ccsdk-apps-released-java17 project-name: "ccsdk-apps" jobs: - gerrit-maven-verify: @@ -14,7 +14,7 @@ - gerrit-maven-merge: mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: - build-node: ubuntu2004-docker-8c-8g + build-node: centos8-docker-8c-8g sign-artifacts: true mvn-params: "-Dmaven.test.skip=true" cron: "" @@ -36,7 +36,7 @@ branch: "newdelhi" - "montreal": branch: "montreal" - java-version: openjdk21 + java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "ccsdk-apps-settings" # due to a strange macro / variable translation problem this needs to be @@ -46,7 +46,7 @@ deployAtEnd=true files: "**" archive-artifacts: "" - build-node: ubuntu2004-docker-8c-8g + build-node: centos8-docker-8c-8g mvn-snapshot-id: "ecomp-snapshots" nexus-snapshot-repo: "snapshots" @@ -60,7 +60,7 @@ cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: - build-node: ubuntu2004-docker-8c-8g + build-node: ubuntu2204-docker-8c-8g sign-artifacts: true mvn-params: "-Dmaven.test.skip=true" cron: "" @@ -80,7 +80,7 @@ - "master": branch: "master" java-version: openjdk21 - mvn-version: "mvn38" + mvn-version: "mvn39" mvn-settings: "ccsdk-apps-settings" # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined @@ -101,12 +101,12 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2204-builder-4c-4g project: "ccsdk/apps" project-name: "ccsdk-apps" branch: "master" java-version: openjdk21 - mvn-version: "mvn38" + mvn-version: "mvn39" mvn-settings: "ccsdk-apps-settings" mvn-goals: "clean install" mvn-opts: "-Xmx1024m" @@ -122,7 +122,7 @@ - "master": branch: "master" java-version: openjdk21 - mvn-version: "mvn38" + mvn-version: "mvn39" mvn-settings: "ccsdk-apps-settings" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2204-builder-4c-4g diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml index b2df39c83..1ed92ea4b 100644 --- a/jjb/ccsdk/ccsdk-oran.yaml +++ b/jjb/ccsdk/ccsdk-oran.yaml @@ -44,7 +44,7 @@ nexus-snapshot-repo: "snapshots" - project: - name: ccsdk-oran-current-java17 + name: ccsdk-oran-current-java21 project-name: "ccsdk-oran" jobs: - gerrit-maven-verify: @@ -53,14 +53,14 @@ cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: - build-node: centos8-docker-8c-8g + build-node: ubuntu2204-docker-8c-8g sign-artifacts: true mvn-params: "-Dmaven.test.skip=true" mvn-opts: "-Ddocker.skip=true" cron: "@daily" sbom-generator: true - gerrit-maven-docker-stage: - build-node: centos8-docker-8c-8g + build-node: ubuntu2204-docker-8c-8g container-public-registry: "nexus3.onap.org:10001" container-staging-registry: "nexus3.onap.org:10003" mvn-params: "-Dmaven.test.skip=true -Pdocker" @@ -71,14 +71,14 @@ stream: - "master": branch: "master" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-settings: "ccsdk-oran-settings" files: "**" archive-artifacts: "" docker-pom: "pom.xml" mvn-profile: docker - build-node: centos8-docker-8c-8g + build-node: ubuntu2204-docker-8c-8g mvn-snapshot-id: "ecomp-snapshots" nexus-snapshot-repo: "snapshots" @@ -92,11 +92,11 @@ stream: - "master": branch: "master" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-settings: "ccsdk-oran-settings" mvn-opts: "-Ddocker.skip=true --add-opens=java.base/java.util=ALL-UNNAMED" - build-node: centos8-builder-4c-4g + build-node: ubuntu2204-builder-4c-4g - project: name: ccsdk-oran-sonar @@ -109,12 +109,12 @@ - compare-type: REG_EXP pattern: "a1-policy-management/.*" sonar-mvn-goal: "{sonar_mvn_goal}" - build-node: centos8-docker-8c-8g + build-node: ubuntu2204-docker-8c-8g project: "ccsdk/oran" project-name: "ccsdk-oran" branch: "master" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-settings: "ccsdk-oran-settings" mvn-goals: "clean install" mvn-opts: "-Xmx1024m -Ddocker.skip=true" diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index 2d290c1db..f595a5aff 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -44,7 +44,7 @@ nexus-snapshot-repo: "snapshots" - project: - name: ccsdk-cds-current-java17 + name: ccsdk-cds-current-java21 project-name: "ccsdk-cds" jobs: - gerrit-maven-verify: @@ -53,7 +53,7 @@ cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: - build-node: centos8-docker-8c-8g + build-node: ubuntu2204-docker-8c-8g sign-artifacts: true mvn-params: "-Dmaven.test.skip=true" cron: "" @@ -71,8 +71,8 @@ stream: - "master": branch: "master" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-settings: "ccsdk-cds-settings" # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined @@ -81,7 +81,7 @@ deployAtEnd=true files: "**" archive-artifacts: "" - build-node: centos8-docker-8c-8g + build-node: ubuntu2204-docker-8c-8g mvn-snapshot-id: "ecomp-snapshots" nexus-snapshot-repo: "snapshots" @@ -93,12 +93,12 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - build-node: centos8-builder-4c-4g + build-node: ubuntu2204-builder-4c-4g project: "ccsdk/cds" project-name: "ccsdk-cds" branch: "master" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-settings: "ccsdk-cds-settings" mvn-goals: "clean install" mvn-opts: "-Xmx1024m" @@ -113,8 +113,8 @@ stream: - "master": branch: "master" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-settings: "ccsdk-cds-settings" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" - build-node: centos8-builder-4c-4g + build-node: ubuntu2204-builder-4c-4g diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 390e4c087..241e54ef8 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -45,7 +45,7 @@ nexus-snapshot-repo: "snapshots" - project: - name: ccsdk-distribution-current-java17 + name: ccsdk-distribution-current-java21 project-name: "ccsdk-distribution" jobs: - gerrit-maven-verify: @@ -54,7 +54,7 @@ cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: - build-node: centos8-docker-8c-8g + build-node: ubuntu2204-docker-8c-8g sign-artifacts: true mvn-params: "-Dmaven.test.skip=true" maven-versions-plugin: true @@ -62,7 +62,7 @@ sbom-generator: true - gerrit-maven-docker-stage: cron: "@daily" - build-node: centos8-docker-8c-8g + build-node: ubuntu2204-docker-8c-8g container-public-registry: "nexus3.onap.org:10001" container-staging-registry: "nexus3.onap.org:10003" mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker" @@ -74,14 +74,14 @@ stream: - "master": branch: "master" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-settings: "ccsdk-distribution-settings" files: "**" archive-artifacts: "" docker-pom: "pom.xml" mvn-profile: docker - build-node: centos8-docker-8c-8g + build-node: ubuntu2204-docker-8c-8g mvn-snapshot-id: "ecomp-snapshots" nexus-snapshot-repo: "snapshots" @@ -95,8 +95,8 @@ stream: - "master": branch: "master" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-settings: "ccsdk-distribution-settings" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" - build-node: centos8-docker-8c-8g + build-node: ubuntu2204-docker-8c-8g diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index a7030e9a0..c42b97a5b 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -42,7 +42,7 @@ nexus-snapshot-repo: "snapshots" - project: - name: ccsdk-features-current-java17 + name: ccsdk-features-current-java21 project-name: "ccsdk-features" jobs: - gerrit-maven-verify: @@ -51,7 +51,7 @@ cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: - build-node: centos8-docker-8c-8g + build-node: ubuntu2204-docker-8c-8g sign-artifacts: true mvn-params: "-Dmaven.test.skip=true" cron: "" @@ -64,8 +64,8 @@ - "master": branch: "master" mvn-opts: "-Xmx3072m" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-settings: "ccsdk-features-settings" # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined @@ -74,7 +74,7 @@ deployAtEnd=true files: "**" archive-artifacts: "" - build-node: centos8-builder-4c-4g + build-node: ubuntu2204-builder-4c-4g mvn-snapshot-id: "ecomp-snapshots" nexus-snapshot-repo: "snapshots" @@ -86,12 +86,12 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - build-node: centos8-builder-4c-4g + build-node: ubuntu2204-builder-4c-4g project: "ccsdk/features" project-name: "ccsdk-features" branch: "master" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-settings: "ccsdk-features-settings" mvn-goals: "clean install" mvn-opts: "-Xmx3072m" @@ -106,8 +106,8 @@ stream: - "master": branch: "master" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-settings: "ccsdk-features-settings" mvn-opts: "-Xmx3072m --add-opens=java.base/java.util=ALL-UNNAMED" - build-node: centos8-builder-4c-4g + build-node: ubuntu2204-builder-4c-4g diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 9a263af8d..3606030d0 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -38,7 +38,7 @@ archive-artifacts: "" - project: - name: ccsdk-parent-current-java17 + name: ccsdk-parent-current-java21 project-name: "ccsdk-parent" jobs: - gerrit-maven-verify: @@ -47,7 +47,7 @@ cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: - build-node: centos8-docker-8c-8g + build-node: ubuntu2204-docker-8c-8g sign-artifacts: true mvn-params: "-Dmaven.test.skip=true" cron: "" @@ -70,8 +70,8 @@ mvn-params: "-Dmaven.test.skip=true -Drevision=3.0.0" - "{project-name}-gerrit-release-jobs": mvn-params: "-Drevision=3.0.0" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-settings: "ccsdk-parent-settings" # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined @@ -91,8 +91,8 @@ stream: - "master": branch: "master" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-settings: "ccsdk-parent-settings" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" - build-node: centos8-builder-4c-4g + build-node: ubuntu2204-builder-4c-4g diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml index 0b92f821e..c520e2f36 100644 --- a/jjb/ccsdk/sli.yaml +++ b/jjb/ccsdk/sli.yaml @@ -39,7 +39,7 @@ nexus-snapshot-repo: "snapshots" - project: - name: ccsdk-sli-current-java17 + name: ccsdk-sli-current-java21 project-name: "ccsdk-sli-current" jobs: - gerrit-maven-verify: @@ -48,7 +48,7 @@ cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: - build-node: centos8-docker-8c-8g + build-node: ubuntu2204-docker-8c-8g sign-artifacts: true mvn-params: "-Dmaven.test.skip=true" cron: "" @@ -60,8 +60,8 @@ stream: - "master": branch: "master" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-settings: "ccsdk-sli-settings" # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined @@ -70,7 +70,7 @@ deployAtEnd=true files: "**" archive-artifacts: "" - build-node: centos8-builder-4c-4g + build-node: ubuntu2204-builder-4c-4g mvn-snapshot-id: "ecomp-snapshots" nexus-snapshot-repo: "snapshots" @@ -82,12 +82,12 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - build-node: centos8-builder-4c-4g + build-node: ubuntu2204-builder-4c-4g project: "ccsdk/sli" project-name: "ccsdk-sli" branch: "master" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-settings: "ccsdk-sli-settings" mvn-goals: "clean install" mvn-opts: "-Xmx1024m" @@ -102,8 +102,8 @@ stream: - "master": branch: "master" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-settings: "ccsdk-sli-settings" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" - build-node: centos8-builder-4c-4g + build-node: ubuntu2204-builder-4c-4g