summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.bazelrc4
-rw-r--r--Documentation/dev-bazel.txt7
2 files changed, 5 insertions, 6 deletions
diff --git a/.bazelrc b/.bazelrc
index 5b0fa814a6..72138d2db8 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -2,7 +2,7 @@ build --workspace_status_command="python3 ./tools/workspace_status.py"
build --repository_cache=~/.gerritcodereview/bazel-cache/repository
build --action_env=PATH
build --disk_cache=~/.gerritcodereview/bazel-cache/cas
-build --java_toolchain=//tools:error_prone_warnings_toolchain_java11
+build --java_toolchain=//tools:error_prone_warnings_toolchain
# Enable strict_action_env flag to. For more information on this feature see
# https://groups.google.com/forum/#!topic/bazel-discuss/_VmRfMyyHBk.
@@ -13,6 +13,6 @@ build --incompatible_strict_action_env
test --build_tests_only
test --test_output=errors
-test --java_toolchain=//tools:error_prone_warnings_toolchain_java11
+test --java_toolchain=//tools:error_prone_warnings_toolchain
import %workspace%/tools/remote-bazelrc
diff --git a/Documentation/dev-bazel.txt b/Documentation/dev-bazel.txt
index bf45836dad..5d71b41093 100644
--- a/Documentation/dev-bazel.txt
+++ b/Documentation/dev-bazel.txt
@@ -55,17 +55,16 @@ Java 8 is a legacy Java release and support for Java 8 will be discontinued
in future gerrit releases. To build Gerrit with Java 8 language level, run:
```
- $ bazel build --java_toolchain //tools:error_prone_warnings_toolchain :release
+ $ bazel build :release
```
[[java-11]]
==== Java 11 support
-Java language level 11 is the default. To build Gerrit with Java 11 language
-level, run:
+To build Gerrit with Java 11 language level, run:
```
- $ bazel build :release
+ $ bazel build --java_toolchain=//tools:error_prone_warnings_toolchain_java11 :release
```
[[java-13]]