Update CCSDK and SDNC to use mvn 3.6 and openjdk 11

[ci-management.git] / jjb / ccsdk / parent.yaml

diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index a6ff815..3fed58c 100644 (file)
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -19,10 +19,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto-fluorine':
-          branch: 'elalto-fluorine'
-      - 'elalto':
-          branch: 'elalto'
+      - '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
     # passed as a string block to properly get the properties correctly defined
@@ -31,7 +31,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
 
 - project:
     name: ccsdk-parent-clm
@@ -43,10 +42,12 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-parent-settings'
-    maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
-
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: ccsdk-parent-info
@@ -62,6 +63,8 @@
     project-name: ccsdk-parent
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-parent-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true