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 <dtimoney@att.com>

diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index ac7b637..9ba264e 100644 (file)
--- 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 391ee0e..7380359 100644 (file)
--- 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