commit 462faf4eeee618d7dbbe8551b7969ad2d2ee9f79
author Andrew Grimberg <agrimberg@linuxfoundation.org> Wed Aug 12 22:36:11 2020 +0000
committer Gerrit Code Review <gerrit@onap.org> Wed Aug 12 22:36:11 2020 +0000
tree 25f8eaebe76f1db7aa6bf2210d14890f5ec4c693
parent 3971af533b7e7f4b6f5c06c7f96372e05496f73d
parent 8f01bf58fb77cf81df0b009567ab0a41cb76ef58

Merge "Deprecate optf/fgps"

global-jjb

diff --git a/global-jjb b/global-jjb
index 64faafa..762400e 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 64faafae2362d36e4d5c3e8d5fe6579b9d09cf55
+Subproject commit 762400ee2c77d0cb936ca1757bc2ac1515042436

jjb/multicloud/multicloud-framework-java.yaml

diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 3233118..d28e62e 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -6,6 +6,7 @@
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk11
     mvn-settings: 'multicloud-framework-settings'
     subproject:
       - 'multivimbroker':
@@ -102,6 +103,7 @@
     project: 'multicloud/framework'
     project-name: 'multicloud-framework-artifactbroker'
     branch: 'master'
+    java-version: openjdk11
     mvn-params: '-f artifactbroker/pom.xml'
     mvn-settings: 'multicloud-framework-settings'
     mvn-goals: 'clean install'
@@ -115,5 +117,6 @@
     project: multicloud/framework
     project-name: 'multicloud-framework-artifactbroker'
     branch: 'master'
+    java-version: openjdk11
     mvn-params: '-f artifactbroker/pom.xml'
     mvn-settings: 'multicloud-framework-settings'