X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fccsdk%2Fdistribution.yaml;h=a644435275b25c23173b829b90d4de3f104055ea;hb=05edcb7c82ff7e2cbeadcb8837d7e5fed995ac64;hp=47e616bf6adf05ac8db5760e5c4da5cd71af89b8;hpb=3250951bf7d4d83851bf79b0a635c50e5eb3b0c0;p=ci-management.git

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 47e616bf6..a64443527 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -16,7 +16,6 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn35"
           maven-versions-plugin: true
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
@@ -25,14 +24,13 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1804-docker-8c-8g
@@ -67,8 +65,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'
     build-node: ubuntu1804-docker-8c-8g
 
@@ -89,6 +89,8 @@
     jobs:
       - gerrit-whitesource-scan:
           java-opts: '-Xmx2048m'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true