diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2023-11-13 08:10:44 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2023-11-13 08:20:01 +0100 |
| commit | 3c9d554480f05d67a64bf6ae926b8057f66e9731 (patch) | |
| tree | ea2882e3aa6294d360a3bcb6cb2bcfd3461f02d8 | |
| parent | a63c7a583b0bd917c118e259d2237252d0adc3ca (diff) | |
Bazel: Remove left over --java_toolchain option
Change Ib3b923db7b switched to using toolchain resolution for java
rules and bumped Bazel version to 5.x. The new Bazel version deprecated
--java_toolchain option, so that option effectively turned to be a
no-op. However in some places this option was missed to be removed.
That's why `tool/maven/api.sh install` utility is reporting this warning
WARNING: Option 'java_toolchain' is deprecated
Release-Notes: skip
Change-Id: Ic72859e24c9da037b9ac4a16278f14350038fdf1
| -rw-r--r-- | Documentation/dev-bazel.txt | 2 | ||||
| -rwxr-xr-x | tools/eclipse/project.py | 3 | ||||
| -rw-r--r-- | tools/maven/package.bzl | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/dev-bazel.txt b/Documentation/dev-bazel.txt index d1a5bcf23f..08529dfcba 100644 --- a/Documentation/dev-bazel.txt +++ b/Documentation/dev-bazel.txt @@ -54,7 +54,7 @@ To check the installed version of Java, open a terminal window and run: To build Gerrit with Java 11 language level, run: ``` - $ bazel build --java_toolchain=//tools:error_prone_warnings_toolchain_java11 :release + $ bazel build :release ``` [[java-17]] diff --git a/tools/eclipse/project.py b/tools/eclipse/project.py index d574ecf7b7..dc136ed2cc 100755 --- a/tools/eclipse/project.py +++ b/tools/eclipse/project.py @@ -96,8 +96,7 @@ def _build_bazel_cmd(*args): build = True cmd.append(arg) if custom_java: - cmd.append('--host_java_toolchain=@bazel_tools//tools/jdk:toolchain_java%s' % custom_java) - cmd.append('--java_toolchain=@bazel_tools//tools/jdk:toolchain_java%s' % custom_java) + cmd.append('--config=java%s' % custom_java) return cmd diff --git a/tools/maven/package.bzl b/tools/maven/package.bzl index eacb02b9f4..b25656da7f 100644 --- a/tools/maven/package.bzl +++ b/tools/maven/package.bzl @@ -40,7 +40,7 @@ def maven_package( src = {}, doc = {}, war = {}): - build_cmd = ["bazel_cmd", "build", "--java_toolchain=//tools:error_prone_warnings_toolchain_java11"] + build_cmd = ["bazel_cmd", "build"] mvn_cmd = ["python", "tools/maven/mvn.py", "-v", version] api_cmd = mvn_cmd[:] api_targets = [] |