Merge "Workaround for javadoc issue"

diff --git a/global-jjb b/global-jjb
index cf8b441..2399be2 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit cf8b441e368ad0ce9e8c2e0b8ddb7aad0d7d690c
+Subproject commit 2399be2ca1402a7d1043089c3c57d623d9bfc064

diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 971356d..f154f4a 100644 (file)
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -9,6 +9,7 @@
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
+          mvn-opts: '-Ddocker.skip=true'
           maven-versions-plugin: true
           cron: ''
       - gerrit-maven-docker-stage:

diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index 4d1f3de..89b9460 100644 (file)
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -31,8 +31,12 @@
           build-node: ubuntu1804-docker-8c-8g
     project: 'cli'
     stream:
-      - 'master':
-          branch: 'master'
+        - 'master':
+                branch: 'master'
+                java-version: openjdk11
+        - 'frankfurt':
+                branch: 'frankfurt'
+                java-version: openjdk8
     mvn-settings: 'cli-settings'
     files: '**'
     archive-artifacts: ''