X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fccsdk%2Fsli-adaptors.yaml;h=bd553e1123679f81172a1897cb23f043fad639b9;hb=05edcb7c82ff7e2cbeadcb8837d7e5fed995ac64;hp=ad92332ef770ff20781f0bdc8923066bbd0a1448;hpb=96a6f2ddbeab9a1af37fafa15a751cd560c86875;p=ci-management.git

diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index ad92332ef..bd553e112 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -10,9 +10,6 @@
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
           cron: ''
-      - '{project-name}-maven-javadoc-jobs':
-          mvn-site-id: ecomp-site
-          javadoc-path: org.onap.$PROJECT/$STREAM
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
@@ -20,8 +17,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-adaptors-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
@@ -30,7 +29,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -49,10 +47,11 @@
     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'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn35"
 
 - project:
     name: ccsdk-sli-adaptors-clm
@@ -64,13 +63,13 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
-    maven-version: "mvn35"
     build-node: ubuntu1804-builder-4c-4g
 
-
 - project:
     name: ccsdk-sli-adaptors-info
     project-name: ccsdk-sli-adaptors
@@ -86,6 +85,8 @@
     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
     mvn-clean-install: true