From a6785bf4f9e357cbcd1e5f264122e6725db8d08b Mon Sep 17 00:00:00 2001 From: vasraz Date: Fri, 9 Jul 2021 00:27:09 +0100 Subject: [SDC] Update maven to 3.6 Issue-ID: CIMAN-406 Signed-off-by: Vasyl Razinkov Change-Id: Iba0c5ac2a8e1b92adb707729e6fe5a24f6a5670a --- jjb/sdc/sdc-csit.yaml | 2 +- jjb/sdc/sdc-onap-ui-angular.yaml | 2 +- jjb/sdc/sdc-onap-ui-common.yaml | 2 +- jjb/sdc/sdc-sdc-be-common.yaml | 2 +- jjb/sdc/sdc-sdc-distribution-client.yaml | 4 ++-- jjb/sdc/sdc-sdc-docker-base.yaml | 20 +------------------- jjb/sdc/sdc-sdc-pubsub.yaml | 2 +- jjb/sdc/sdc-sdc-tosca.yaml | 2 +- jjb/sdc/sdc-sdc-workflow-designer.yaml | 20 +------------------- jjb/sdc/sdc.yaml | 6 +++--- 10 files changed, 13 insertions(+), 49 deletions(-) (limited to 'jjb') diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index c053518bf..714aa7712 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -24,6 +24,6 @@ - 'honolulu': branch: 'honolulu' java-version: openjdk11 - maven-version: 'mvn36' + mvn-version: 'mvn36' mvn-settings: 'sdc-settings' mvn-global-settings: global-settings diff --git a/jjb/sdc/sdc-onap-ui-angular.yaml b/jjb/sdc/sdc-onap-ui-angular.yaml index f7c811cdd..beaa4c141 100644 --- a/jjb/sdc/sdc-onap-ui-angular.yaml +++ b/jjb/sdc/sdc-onap-ui-angular.yaml @@ -30,7 +30,7 @@ files: '**' archive-artifacts: '' build-timeout: 60 - maven-version: 'mvn35' + mvn-version: 'mvn36' - project: name: sdc-onap-ui-angular-sonar diff --git a/jjb/sdc/sdc-onap-ui-common.yaml b/jjb/sdc/sdc-onap-ui-common.yaml index 28d0a787d..5d8734812 100644 --- a/jjb/sdc/sdc-onap-ui-common.yaml +++ b/jjb/sdc/sdc-onap-ui-common.yaml @@ -24,7 +24,7 @@ files: '**' archive-artifacts: '' build-timeout: 60 - maven-version: 'mvn35' + mvn-version: 'mvn36' - project: name: sdc-onap-ui-common-sonar diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml index c7e66c2d9..4f0c9c553 100644 --- a/jjb/sdc/sdc-sdc-be-common.yaml +++ b/jjb/sdc/sdc-sdc-be-common.yaml @@ -27,7 +27,7 @@ files: '**' archive-artifacts: '' build-timeout: 60 - maven-version: 'mvn35' + mvn-version: 'mvn36' - project: name: sdc-sdc-be-common-sonar diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index c3b9ce346..6bf7795b2 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -30,7 +30,7 @@ files: '**' archive-artifacts: '' build-timeout: 60 - maven-version: 'mvn35' + mvn-version: 'mvn36' - project: name: sdc-sdc-distribution-client-integration-pairwise @@ -48,7 +48,7 @@ files: '**' archive-artifacts: '' build-timeout: 60 - maven-version: 'mvn35' + mvn-version: 'mvn36' mvn-params: ' -P integration-pairwise' - project: diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml index d83b2e502..e6b4c2617 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -29,25 +29,7 @@ files: '**' archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g - maven-version: 'mvn35' - -#- project: -# name: sdc-sdc-docker-base-arm64 -# project-name: 'sdc-sdc-docker-base-arm64' -# jobs: -# - '{project-name}-{stream}-sdc-merge-java': -# build-node: 'ubuntu1804-docker-8c-8g' -# docker-pom: 'pom.xml' -# mvn-profile: 'default' -# project: 'sdc/sdc-docker-base' -# stream: -# - 'master': -# branch: 'master' -# mvn-settings: 'sdc-sdc-docker-base-settings' -# files: '**' -# archive-artifacts: '' -# build-node: ubuntu1804-docker-arm64-4c-2g -# maven-version: 'mvn35' + mvn-version: 'mvn36' - project: name: sdc-sdc-docker-base-info diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml index 5cdb6fc9b..337361257 100644 --- a/jjb/sdc/sdc-sdc-pubsub.yaml +++ b/jjb/sdc/sdc-sdc-pubsub.yaml @@ -24,7 +24,7 @@ files: '**' archive-artifacts: '' build-timeout: 60 - maven-version: 'mvn35' + mvn-version: 'mvn36' - project: name: sdc-sdc-pubsub-sonar diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index a86d3b2de..7730967a7 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -28,7 +28,7 @@ files: '**' archive-artifacts: '' build-timeout: 60 - maven-version: 'mvn35' + mvn-version: 'mvn36' - project: name: sdc-sdc-tosca-sonar diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index abc59665a..fa8c83abf 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -36,26 +36,8 @@ docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1804-builder-4c-4g - maven-version: 'mvn35' + mvn-version: 'mvn36' -#- project: -# name: sdc-sdc-workflow-designer-arm64 -# project-name: 'sdc-sdc-workflow-designer-arm64' -# jobs: -# - '{project-name}-{stream}-docker-java-daily': -# mvn-params: '-Dmaven.test.skip=true' -# project: 'sdc/sdc-workflow-designer' -# stream: -# - 'master': -# branch: 'master' -# mvn-settings: 'sdc-sdc-workflow-designer-settings' -# files: '**' -# archive-artifacts: '' -# docker-pom: 'pom.xml' -# mvn-profile: docker -# build-node: ubuntu1804-docker-arm64-4c-2g -# maven-version: 'mvn35' -# - project: name: sdc-sdc-workflow-designer-sonar jobs: diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index bd12fb310..95b8c7282 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -73,7 +73,7 @@ files: '**' archive-artifacts: '' build-node: ubuntu1804-docker-8c-8g - maven-version: 'mvn36' + mvn-version: 'mvn36' - project: name: sdc-sonar @@ -95,7 +95,7 @@ mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' - maven-version: 'mvn36' + mvn-version: 'mvn36' - project: name: sdc-clm @@ -109,7 +109,7 @@ project-name: 'sdc' build-node: ubuntu1804-docker-8c-8g branch: 'master' - maven-version: 'mvn36' + mvn-version: 'mvn36' mvn-settings: 'sdc-settings' java-version: openjdk11 -- cgit 1.2.3-korg