From 86f902bfed2ae8041121af19b8395827683d5f78 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 19 Jan 2023 06:40:05 -0500 Subject: [PATCH] Update CCSDK and SDNC to use JDK 17 compiler Update CCSDK and SDNC jenkins jobs to use Java 17 compiler rather than Java 11. Issue-ID: CCSDK-3813 Signed-off-by: Dan Timoney Change-Id: Id87b2f917f28c937382161f7d20dce7c79ac44fd --- jjb/ccsdk/apps.yaml | 6 +++--- jjb/ccsdk/ccsdk-oran.yaml | 6 +++--- jjb/ccsdk/cds.yaml | 6 +++--- jjb/ccsdk/distribution.yaml | 4 ++-- jjb/ccsdk/features.yaml | 6 +++--- jjb/ccsdk/odl-legacy.yaml | 6 +++--- jjb/ccsdk/sli.yaml | 6 +++--- jjb/sdnc/sdnc-apps.yaml | 6 +++--- jjb/sdnc/sdnc-northbound.yaml | 6 +++--- jjb/sdnc/sdnc-oam.yaml | 4 ++-- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 47285c81d..b16836987 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -38,7 +38,7 @@ branch: 'jakarta' - 'kohn': branch: 'kohn' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-apps-settings' # due to a strange macro / variable translation problem this needs to be @@ -65,7 +65,7 @@ project: 'ccsdk/apps' project-name: 'ccsdk-apps' branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-apps-settings' mvn-goals: 'clean install' @@ -81,7 +81,7 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-apps-settings' build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml index 452c7aef8..4332472e3 100644 --- a/jjb/ccsdk/ccsdk-oran.yaml +++ b/jjb/ccsdk/ccsdk-oran.yaml @@ -32,7 +32,7 @@ branch: 'jakarta' - 'kohn': branch: 'kohn' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-oran-settings' files: '**' @@ -53,7 +53,7 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-oran-settings' mvn-opts: '-Ddocker.skip=true' @@ -83,7 +83,7 @@ project: 'ccsdk/oran' project-name: 'ccsdk-oran' branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-oran-settings' mvn-goals: 'clean install' diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index a0447dbb6..ae8e83393 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -31,7 +31,7 @@ branch: 'jakarta' - 'kohn': branch: 'kohn' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-cds-settings' # due to a strange macro / variable translation problem this needs to be @@ -97,7 +97,7 @@ project: 'ccsdk/cds' project-name: 'ccsdk-cds' branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-cds-settings' mvn-goals: 'clean install' @@ -113,7 +113,7 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-cds-settings' build-node: centos8-builder-4c-4g diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 195c9e93e..b48f01b0a 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -33,7 +33,7 @@ branch: 'jakarta' - 'kohn': branch: 'kohn' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-distribution-settings' files: '**' @@ -72,7 +72,7 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-distribution-settings' build-node: centos7-docker-8c-8g diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 0694a87dd..b581395ac 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -25,7 +25,7 @@ branch: 'jakarta' - 'kohn': branch: 'kohn' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-features-settings' # due to a strange macro / variable translation problem this needs to be @@ -53,7 +53,7 @@ project: 'ccsdk/features' project-name: 'ccsdk-features' branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-features-settings' mvn-goals: 'clean install' @@ -69,7 +69,7 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-features-settings' mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' diff --git a/jjb/ccsdk/odl-legacy.yaml b/jjb/ccsdk/odl-legacy.yaml index 2f76c8cce..e3546b150 100644 --- a/jjb/ccsdk/odl-legacy.yaml +++ b/jjb/ccsdk/odl-legacy.yaml @@ -27,7 +27,7 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-odl-legacy-settings' # due to a strange macro / variable translation problem this needs to be @@ -54,7 +54,7 @@ project: 'ccsdk/odl-legacy' project-name: 'ccsdk-odl-legacy' branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-odl-legacy-settings' mvn-goals: 'clean install' @@ -70,7 +70,7 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-odl-legacy-settings' build-node: centos7-builder-4c-4g diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml index 212cbe32e..1da1fdaf5 100644 --- a/jjb/ccsdk/sli.yaml +++ b/jjb/ccsdk/sli.yaml @@ -25,7 +25,7 @@ branch: 'jakarta' - 'kohn': branch: 'kohn' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-sli-settings' # due to a strange macro / variable translation problem this needs to be @@ -52,7 +52,7 @@ project: 'ccsdk/sli' project-name: 'ccsdk-sli' branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-sli-settings' mvn-goals: 'clean install' @@ -68,7 +68,7 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-sli-settings' build-node: centos7-builder-4c-4g diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index feeea2e6d..b92ed487b 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -41,7 +41,7 @@ branch: 'jakarta' - 'kohn': branch: 'kohn' - java-version: openjdk11 + java-version: openjdk17 mvn-version : "mvn38" mvn-settings: 'sdnc-apps-settings' @@ -70,7 +70,7 @@ project: 'sdnc/apps' project-name: 'sdnc-apps' branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version : "mvn38" mvn-settings: 'sdnc-apps-settings' mvn-goals: 'clean install' @@ -106,7 +106,7 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version : "mvn38" mvn-settings: 'sdnc-apps-settings' diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 8b88af378..a2f070fc4 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -22,7 +22,7 @@ branch: 'jakarta' - 'kohn': branch: 'kohn' - java-version: openjdk11 + java-version: openjdk17 mvn-version: "mvn38" mvn-settings: 'sdnc-northbound-settings' @@ -53,7 +53,7 @@ branch: 'master' mvn-settings: 'sdnc-northbound-settings' mvn-goals: 'clean install' - java-version: openjdk11 + java-version: openjdk17 mvn-version: "mvn38" mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -69,7 +69,7 @@ - 'master': branch: 'master' mvn-settings: 'sdnc-northbound-settings' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' - project: diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 31737b590..9ffb8296c 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -31,7 +31,7 @@ branch: 'jakarta' - 'kohn': branch: 'kohn' - java-version: openjdk11 + java-version: openjdk17 mvn-version: "mvn38" mvn-settings: 'sdnc-oam-settings' files: '**' @@ -71,7 +71,7 @@ - 'master': branch: 'master' mvn-settings: 'sdnc-oam-settings' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' - project: -- 2.16.6