From f9681eb841eee018b5d1f15bd5a6a46d504a97fc Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Tue, 8 Oct 2019 09:57:53 -0700 Subject: [PATCH] Appc jobs to maven 3.5 Maven 3.5 is required for the new version of Opendaylight. Change-Id: Ic25032f3b3a1cc61a3dc57e849ce76a3bf3f90a6 Signed-off-by: Patrick Brady Issue-ID: APPC-1749 --- jjb/appc/appc-deployment.yaml | 2 ++ jjb/appc/appc-master.yaml | 3 +++ jjb/appc/appc-parent.yaml | 1 + 3 files changed, 6 insertions(+) diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index 4f6cb6ff0..4e261e063 100644 --- a/jjb/appc/appc-deployment.yaml +++ b/jjb/appc/appc-deployment.yaml @@ -12,6 +12,7 @@ - 'master': branch: 'master' mvn-settings: 'appc-deployment-settings' + maven-version: "mvn35" files: '**' archive-artifacts: '' docker-pom: 'pom.xml' @@ -50,6 +51,7 @@ - 'master': branch: 'master' mvn-settings: 'appc-deployment-settings' + maven-version: "mvn35" files: '**' archive-artifacts: '' docker-pom: 'pom.xml' diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index 76226987b..4b23263a4 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -25,6 +25,7 @@ - 'master': branch: 'master' mvn-settings: 'appc-settings' + maven-version: "mvn35" files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g @@ -39,6 +40,7 @@ project-name: 'appc' branch: 'master' mvn-settings: 'appc-settings' + maven-version: "mvn35" mvn-goals: 'clean install' mvn-opts: '-Xmx4096m' @@ -55,6 +57,7 @@ project-name: 'appc' branch: 'master' mvn-settings: 'appc-settings' + maven-version: "mvn35" - project: name: appc-info diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml index 7a931c0ef..eafd4b9b5 100644 --- a/jjb/appc/appc-parent.yaml +++ b/jjb/appc/appc-parent.yaml @@ -23,6 +23,7 @@ - 'master': branch: 'master' mvn-settings: 'appc-parent-settings' + maven-version: "mvn35" build-node: ubuntu1604-builder-2c-1g - project: -- 2.16.6