From ddbcd0f5d1ce29acd9d28f3a30a4b1f21f7e6974 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 29 Apr 2021 14:43:31 -0400 Subject: [PATCH] Fix Java and maven versions for SDNC CLM jobs Fix SDNC jobs to use Java 11 and maven 3.6 Change-Id: Ie671dfdd63dd7700c0504396e9905dc6564eef4f Issue-ID: SDNC-1530 Signed-off-by: Dan Timoney --- jjb/sdnc/sdnc-northbound.yaml | 5 ++++- jjb/sdnc/sdnc-oam.yaml | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index ac7b63791..9ba264e76 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -53,7 +53,8 @@ branch: 'master' mvn-settings: 'sdnc-northbound-settings' mvn-goals: 'clean install' - maven-version: "mvn35" + java-version: openjdk11 + mvn-version: "mvn36" mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: @@ -68,6 +69,8 @@ - 'master': branch: 'master' mvn-settings: 'sdnc-northbound-settings' + java-version: openjdk11 + mvn-version: 'mvn36' - project: name: sdnc-northbound-info diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 391ee0e0a..7380359f0 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -71,6 +71,8 @@ - 'master': branch: 'master' mvn-settings: 'sdnc-oam-settings' + java-version: openjdk11 + mvn-version: 'mvn36' - project: name: sdnc-oam-info -- 2.16.6