Merge "Remove dependency on gr-js-api from gr-diff-builder"
diff --git a/BUILD b/BUILD
index 3989a75..22d441b 100644
--- a/BUILD
+++ b/BUILD
@@ -4,9 +4,9 @@
package(default_visibility = ["//visibility:public"])
config_setting(
- name = "java9",
+ name = "java11",
values = {
- "java_toolchain": "@bazel_tools//tools/jdk:toolchain_java9",
+ "java_toolchain": "@bazel_tools//tools/jdk:toolchain_java11",
},
)
diff --git a/Documentation/dev-bazel.txt b/Documentation/dev-bazel.txt
index 62af1e5..1a4a75d 100644
--- a/Documentation/dev-bazel.txt
+++ b/Documentation/dev-bazel.txt
@@ -31,17 +31,17 @@
`java -version`
-[[java-10]]
-==== Java 10 support
+[[java-12]]
+==== Java 12 support
-Java 10 (and newer) is supported through vanilla java toolchain
+Java 12 (and newer) is supported through vanilla java toolchain
link:https://docs.bazel.build/versions/master/toolchains.html[Bazel option].
-To build Gerrit with Java 10 and newer, specify vanilla java toolchain and
+To build Gerrit with Java 12 and newer, specify vanilla java toolchain and
provide the path to JDK home:
```
$ bazel build \
- --define=ABSOLUTE_JAVABASE=<path-to-java-10> \
+ --define=ABSOLUTE_JAVABASE=<path-to-java-12> \
--host_javabase=@bazel_tools//tools/jdk:absolute_javabase \
--host_java_toolchain=@bazel_tools//tools/jdk:toolchain_vanilla \
--java_toolchain=@bazel_tools//tools/jdk:toolchain_vanilla \
@@ -53,7 +53,7 @@
```
$ bazel test \
- --define=ABSOLUTE_JAVABASE=<path-to-java-10> \
+ --define=ABSOLUTE_JAVABASE=<path-to-java-12> \
--javabase=@bazel_tools//tools/jdk:absolute_javabase \
--host_javabase=@bazel_tools//tools/jdk:absolute_javabase \
--host_java_toolchain=@bazel_tools//tools/jdk:toolchain_vanilla \
@@ -66,7 +66,7 @@
```
$ cat << EOF > ~/.bazelrc
-> build --define=ABSOLUTE_JAVABASE=<path-to-java-10>
+> build --define=ABSOLUTE_JAVABASE=<path-to-java-12>
> build --javabase=@bazel_tools//tools/jdk:absolute_javabase
> build --host_javabase=@bazel_tools//tools/jdk:absolute_javabase
> build --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_vanilla
@@ -78,30 +78,31 @@
all those options.
Note that the follow option must be added to `container.javaOptions`
-in `$gerrit_site/etc/gerrit.config` to run Gerrit with Java 10|11|...:
+in `$gerrit_site/etc/gerrit.config` to run Gerrit with Java 12:
```
[container]
javaOptions = --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED
```
-[[java-9]]
-==== Java 9 support
+[[java-11]]
+==== Java 11 support
-Java 9 is supported through alternative java toolchain
+Java 11 is supported through alternative java toolchain
link:https://docs.bazel.build/versions/master/toolchains.html[Bazel option].
-The Java 9 support is backwards compatible. Java 8 is still the default.
-To build Gerrit with Java 9, specify JDK 9 java toolchain:
+To build Gerrit with Java 11, specify JDK 11 java toolchain:
```
$ bazel build \
- --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_java9 \
- --java_toolchain=@bazel_tools//tools/jdk:toolchain_java9 \
+ --host_javabase=@bazel_tools//tools/jdk:remote_jdk11 \
+ --javabase=@bazel_tools//tools/jdk:remote_jdk11 \
+ --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_java11 \
+ --java_toolchain=@bazel_tools//tools/jdk:toolchain_java11 \
:release
```
Note that the follow option must be added to `container.javaOptions`
-in `$gerrit_site/etc/gerrit.config` to run Gerrit with Java 9:
+in `$gerrit_site/etc/gerrit.config` to run Gerrit with Java 11:
```
[container]
diff --git a/lib/greenmail/BUILD b/lib/greenmail/BUILD
index e8845e2..68da16a 100644
--- a/lib/greenmail/BUILD
+++ b/lib/greenmail/BUILD
@@ -17,7 +17,7 @@
data = ["//lib:LICENSE-Apache2.0"],
exports = ["@greenmail//jar"],
runtime_deps = select({
- "//:java9": POST_JDK8_DEPS,
+ "//:java11": POST_JDK8_DEPS,
"//:java_next": POST_JDK8_DEPS,
"//conditions:default": [],
}),
diff --git a/prologtests/examples/BUILD b/prologtests/examples/BUILD
index 7244f1e..f4ebe90 100644
--- a/prologtests/examples/BUILD
+++ b/prologtests/examples/BUILD
@@ -7,7 +7,7 @@
sh_test(
name = "test_examples",
srcs = select({
- "//:java9": DUMMY,
+ "//:java11": DUMMY,
"//:java_next": DUMMY,
"//conditions:default": ["run.sh"],
}),
diff --git a/tools/bzl/javadoc.bzl b/tools/bzl/javadoc.bzl
index 521cebe..029e5ca 100644
--- a/tools/bzl/javadoc.bzl
+++ b/tools/bzl/javadoc.bzl
@@ -80,7 +80,7 @@
def java_doc(**kwargs):
libs = kwargs.get("libs", [])
libs = libs + select({
- "//:java9": [],
+ "//:java11": [],
"//:java_next": [],
# TODO(davido): Remove this dependency, when Java 8 support is removed.
# auto-value generates @javax.annotation.Generated annotation on generated
diff --git a/tools/bzl/junit.bzl b/tools/bzl/junit.bzl
index 1cf82ea..987c5ca 100644
--- a/tools/bzl/junit.bzl
+++ b/tools/bzl/junit.bzl
@@ -82,7 +82,7 @@
)
jvm_flags = kwargs.get("jvm_flags", [])
jvm_flags = jvm_flags + select({
- "//:java9": POST_JDK8_OPTS,
+ "//:java11": POST_JDK8_OPTS,
"//:java_next": POST_JDK8_OPTS,
"//conditions:default": [],
})
