Build plugins on Java 11 for stable-3.3/master
Gerrit stable-3.3 and master is distributed on Java 11
and the plugin API won't be usable from Java 8 as they are
using the Major version 55.
Do NOT enforce anymore a specific toolchain but let
Bazel use the local JVM.
Change-Id: Ic949afaf0f479d6486e7de712599ff2cbbb05b9f
diff --git a/jenkins/gerrit-bazel-build-plugin-branch.sh b/jenkins/gerrit-bazel-build-plugin-branch.sh
index 98c9012..cc18837 100644
--- a/jenkins/gerrit-bazel-build-plugin-branch.sh
+++ b/jenkins/gerrit-bazel-build-plugin-branch.sh
@@ -1,6 +1,13 @@
#!/bin/bash -e
-. set-java.sh 8
+case "{branch}" in
+ stable-2.16|stable-3.0|stable-3.1|stable-3.2)
+ . set-java.sh 8
+ ;;
+ *)
+ . set-java.sh 11
+ ;;
+esac
echo "Building plugin {name}/{branch} with Gerrit/{gerrit-branch}"
diff --git a/jenkins/gerrit-bazel-build-plugin.sh b/jenkins/gerrit-bazel-build-plugin.sh
index 91219d7..6d168af 100644
--- a/jenkins/gerrit-bazel-build-plugin.sh
+++ b/jenkins/gerrit-bazel-build-plugin.sh
@@ -1,6 +1,13 @@
#!/bin/bash -e
-. set-java.sh 8
+case "{branch}" in
+ stable-2.16|stable-3.0|stable-3.1|stable-3.2)
+ . set-java.sh 8
+ ;;
+ *)
+ . set-java.sh 11
+ ;;
+esac
git checkout -fb {branch} gerrit/{branch}
git submodule update --init
diff --git a/jenkins/gerrit-bazel-plugin-template.yaml b/jenkins/gerrit-bazel-plugin-template.yaml
index 90886a9..0f7cf46 100644
--- a/jenkins/gerrit-bazel-plugin-template.yaml
+++ b/jenkins/gerrit-bazel-plugin-template.yaml
@@ -20,9 +20,6 @@
- job-discover
- job-read
- job-extended-read
- - inject:
- properties-content: >
- BAZEL_OPTS=--java_toolchain=//tools:error_prone_warnings_toolchain
triggers:
- pollscm:
cron: 'H/50 * * * *'
