Update CCSDK and SDNC to use mvn 3.6 and openjdk 11

Update CCSDK and SDNC jobs to use Java 11 compiler with maven version 3.6

Change-Id: I5698d52e8c9d731003188ded9dacc267a02e2054
Issue-ID: SDNC-1242
Signed-off-by: Dan Timoney <dtimoney@att.com>

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index eaa95f4..cd7cb95 100644 (file)
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -31,6 +31,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
     # due to a strange macro / variable translation problem this needs to be
@@ -58,6 +59,7 @@
     project: 'ccsdk/apps'
     project-name: 'ccsdk-apps'
     branch: 'master'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
     mvn-goals: 'clean install'
@@ -75,6 +77,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
     build-node: ubuntu1804-builder-4c-4g
@@ -110,6 +113,7 @@
     project-name: ccsdk-apps
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
     wss-product-name: ccsdk

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index ae46159..5e7fe59 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -28,6 +28,7 @@
           branch: 'elalto'
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
@@ -68,6 +69,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'
     build-node: ubuntu1804-docker-8c-8g
@@ -89,6 +91,7 @@
     jobs:
       - gerrit-whitesource-scan:
           java-opts: '-Xmx2048m'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'
     wss-product-name: ccsdk

diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index f6606ab..97e0f6b 100644 (file)
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -19,6 +19,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-features-settings'
     # due to a strange macro / variable translation problem this needs to be
@@ -47,6 +48,7 @@
     project: 'ccsdk/features'
     project-name: 'ccsdk-features'
     branch: 'master'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-features-settings'
     mvn-goals: 'clean install'
@@ -64,6 +66,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-features-settings'
     mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
@@ -84,6 +87,7 @@
     project-name: ccsdk-features
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-features-settings'
     wss-product-name: ccsdk

diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 06166e0..3fed58c 100644 (file)
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -21,6 +21,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-parent-settings'
     # due to a strange macro / variable translation problem this needs to be
@@ -43,6 +44,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-parent-settings'
     build-node: ubuntu1804-builder-4c-4g
@@ -61,6 +63,7 @@
     project-name: ccsdk-parent
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-parent-settings'
     wss-product-name: ccsdk

diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 5d03a38..5b4d036 100644 (file)
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -22,6 +22,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     # due to a strange macro / variable translation problem this needs to be
@@ -49,6 +50,7 @@
     project: 'ccsdk/sli/adaptors'
     project-name: 'ccsdk-sli-adaptors'
     branch: 'master'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     mvn-goals: 'clean install'
@@ -66,6 +68,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     build-node: ubuntu1804-builder-4c-4g
@@ -85,6 +88,7 @@
     project-name: ccsdk-sli-adaptors
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     wss-product-name: ccsdk

diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index ffe9ca1..45c20a2 100644 (file)
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -22,6 +22,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-core-settings'
     # due to a strange macro / variable translation problem this needs to be
@@ -49,6 +50,7 @@
     project: 'ccsdk/sli/core'
     project-name: 'ccsdk-sli-core'
     branch: 'master'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-core-settings'
     mvn-goals: 'clean install'
@@ -66,6 +68,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-core-settings'
     build-node: ubuntu1804-builder-4c-4g
@@ -84,6 +87,7 @@
     project-name: ccsdk-sli-core
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-core-settings'
     wss-product-name: ccsdk

diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index bcc011d..1ffb3c9 100644 (file)
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -22,6 +22,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-northbound-settings'
     # due to a strange macro / variable translation problem this needs to be
@@ -49,6 +50,7 @@
     project: 'ccsdk/sli/northbound'
     project-name: 'ccsdk-sli-northbound'
     branch: 'master'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-northbound-settings'
     mvn-goals: 'clean install'
@@ -66,6 +68,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-northbound-settings'
     build-node: ubuntu1804-builder-4c-4g
@@ -84,6 +87,7 @@
     project-name: ccsdk-sli-northbound
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-northbound-settings'
     wss-product-name: ccsdk

diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index 4e028f3..b1d5583 100644 (file)
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -22,6 +22,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-plugins-settings'
     # due to a strange macro / variable translation problem this needs to be
@@ -49,6 +50,7 @@
     project: 'ccsdk/sli/plugins'
     project-name: 'ccsdk-sli-plugins'
     branch: 'master'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-plugins-settings'
     mvn-goals: 'clean install'
@@ -66,6 +68,7 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-plugins-settings'
 
@@ -83,6 +86,7 @@
     project-name: ccsdk-sli-plugins
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-plugins-settings'
     wss-product-name: ccsdk

diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml
index e2f8a7f..52ab57d 100644 (file)
--- a/jjb/ccsdk/utils.yaml
+++ b/jjb/ccsdk/utils.yaml
@@ -17,6 +17,7 @@
     stream:
       - 'master':
           branch: 'master'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-utils-settings'
     # due to a strange macro / variable translation problem this needs to be
@@ -39,6 +40,7 @@
     stream:
       - 'master':
           branch: 'master'
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-utils-settings'
 
@@ -56,6 +58,7 @@
     project-name: ccsdk-utils
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-utils-settings'
     wss-product-name: ccsdk

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 0b04a27..0ef4363 100644 (file)
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -32,6 +32,8 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk11
+    mvn-version : "mvn36"
     mvn-settings: 'sdnc-apps-settings'
 
     # due to a strange macro / variable translation problem this needs to be

diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index ee7c79d..a35908a 100644 (file)
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -19,6 +19,8 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk11
+    mvn-version: "mvn36"
     mvn-settings: 'sdnc-northbound-settings'
 
     # due to a strange macro / variable translation problem this needs to be

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 428251a..fb8b054 100644 (file)
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -30,6 +30,8 @@
           branch: 'elalto'
       - 'frankfurt':
           branch: 'frankfurt'
+    java-version: openjdk11
+    mvn-version: "mvn36"
     mvn-settings: 'sdnc-oam-settings'
     maven-version: "mvn35"
     files: '**'