From 2340b7228d9e373abdb983c92e76bc40da609ab6 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 23 Jun 2022 07:08:52 -0400 Subject: [PATCH] Use maven 3.8.3 for ccsdk,sdnc Update CCSDK and SDNC jobs to use maven versio 3.8.3, needed for projects based on OpenDaylight Sulfur version and above Issue-ID: CCSDK-3697 Signed-off-by: Dan Timoney Change-Id: Ife7f4670472e04829a4ee39bdcfa12d5a7c57570 --- jjb/ccsdk/apps.yaml | 8 ++++---- jjb/ccsdk/ccsdk-oran.yaml | 6 +++--- jjb/ccsdk/cds.yaml | 10 +++++----- jjb/ccsdk/distribution.yaml | 6 +++--- jjb/ccsdk/features.yaml | 8 ++++---- jjb/ccsdk/parent.yaml | 6 +++--- jjb/ccsdk/sli.yaml | 8 ++++---- jjb/sdnc/sdnc-apps.yaml | 10 +++++----- jjb/sdnc/sdnc-northbound.yaml | 8 ++++---- jjb/sdnc/sdnc-oam.yaml | 4 ++-- 10 files changed, 37 insertions(+), 37 deletions(-) diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 2044e818c..c24be5c81 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -37,7 +37,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' 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 @@ -65,7 +65,7 @@ project-name: 'ccsdk-apps' branch: 'master' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-apps-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -85,7 +85,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-apps-settings' build-node: ubuntu1804-builder-4c-4g @@ -121,7 +121,7 @@ jobs: - gerrit-whitesource-scan java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-apps-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml index 88ccf2ee9..e7dd94802 100644 --- a/jjb/ccsdk/ccsdk-oran.yaml +++ b/jjb/ccsdk/ccsdk-oran.yaml @@ -32,7 +32,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-oran-settings' files: '**' archive-artifacts: '' @@ -57,7 +57,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-oran-settings' mvn-opts: '-Ddocker.skip=true' build-node: centos7-builder-4c-4g @@ -85,7 +85,7 @@ project-name: 'ccsdk-oran' branch: 'master' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-oran-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index f0870f62d..4f29391ed 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -31,7 +31,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' 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 @@ -70,7 +70,7 @@ - 'frankfurt': branch: 'frankfurt' java-version: openjdk8 - mvn-version: 'mvn36' + mvn-version: 'mvn38' 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 @@ -98,7 +98,7 @@ project-name: 'ccsdk-cds' branch: 'master' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-cds-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -118,7 +118,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-cds-settings' build-node: centos7-builder-4c-4g @@ -137,7 +137,7 @@ jobs: - gerrit-whitesource-scan java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-cds-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 265a69636..fe9281b72 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -33,7 +33,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' @@ -76,7 +76,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-distribution-settings' build-node: centos7-docker-8c-8g @@ -98,7 +98,7 @@ - gerrit-whitesource-scan: java-opts: '-Xmx2048m' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-distribution-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 27bddebd0..f93a0a762 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -25,7 +25,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' 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 @@ -54,7 +54,7 @@ project-name: 'ccsdk-features' branch: 'master' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-features-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' @@ -74,7 +74,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-features-settings' mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' build-node: centos7-builder-4c-4g @@ -95,7 +95,7 @@ jobs: - gerrit-whitesource-scan java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-features-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index fb6955209..294f68fc4 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -38,7 +38,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' 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 @@ -65,7 +65,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-parent-settings' build-node: centos7-builder-4c-4g @@ -84,7 +84,7 @@ jobs: - gerrit-whitesource-scan java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-parent-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml index f0ac46b6a..d68b38f38 100644 --- a/jjb/ccsdk/sli.yaml +++ b/jjb/ccsdk/sli.yaml @@ -25,7 +25,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' 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 @@ -53,7 +53,7 @@ project-name: 'ccsdk-sli' branch: 'master' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-sli-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -73,7 +73,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-sli-settings' build-node: centos7-builder-4c-4g @@ -92,7 +92,7 @@ jobs: - gerrit-whitesource-scan java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-sli-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index efa64ec0f..276da7ce6 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -41,7 +41,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version : "mvn36" + mvn-version : "mvn38" mvn-settings: 'sdnc-apps-settings' # due to a strange macro / variable translation problem this needs to be @@ -51,7 +51,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn36" + maven-version: "mvn38" build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -71,11 +71,11 @@ project-name: 'sdnc-apps' branch: 'master' java-version: openjdk11 - mvn-version : "mvn36" + mvn-version : "mvn38" mvn-settings: 'sdnc-apps-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn36" + maven-version: "mvn38" # #- project: @@ -111,7 +111,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version : "mvn36" + mvn-version : "mvn38" mvn-settings: 'sdnc-apps-settings' - project: diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 0da9c8ccb..8d18edb77 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -22,7 +22,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: "mvn36" + mvn-version: "mvn38" mvn-settings: 'sdnc-northbound-settings' # due to a strange macro / variable translation problem this needs to be @@ -32,7 +32,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" + maven-version: "mvn38" build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -54,7 +54,7 @@ mvn-settings: 'sdnc-northbound-settings' mvn-goals: 'clean install' java-version: openjdk11 - mvn-version: "mvn36" + mvn-version: "mvn38" mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: @@ -74,7 +74,7 @@ branch: 'jakarta' mvn-settings: 'sdnc-northbound-settings' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' - project: name: sdnc-northbound-info diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index f38b1de4c..720a6ad4f 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -31,7 +31,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: "mvn36" + mvn-version: "mvn38" mvn-settings: 'sdnc-oam-settings' files: '**' archive-artifacts: '' @@ -75,7 +75,7 @@ branch: 'jakarta' mvn-settings: 'sdnc-oam-settings' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' - project: name: sdnc-oam-info -- 2.16.6