Update to java_tools v14.0 (#286)

Closes #286

COPYBARA_INTEGRATE_REVIEW=#286 from bazelbuild:hvd_javatools_14 1ba7e5f
PiperOrigin-RevId: 745056329
Change-Id: If9674fb772281cff1aa51cf50b23961469f845cf

Author: hvadehra

.bazelci/presubmit.yml

@@ -3,7 +3,11 @@ build_targets: &build_targets
   - "//..."
   # can't build some analysis tests on older Bazel versions
   - "-//test/java/..."
-  - "@remote_java_tools//java_tools/..."
+  # build java_tools from source
+  - "@remote_java_tools//:ijar_cc_binary"
+  - "@remote_java_tools//:one_version_cc_bin"
+  - "@remote_java_tools//:proguard"
+  - "@remote_java_tools//:singlejar_cc_bin"
   # can't build @remote_java_tools_X repos for other platforms
   - "-//toolchains/..."
   # TODO: re-enable docs after moving them out of https://bazel.build/reference/be/java
@@ -12,7 +16,11 @@ build_targets: &build_targets
 
 build_targets_bazel6: &build_targets_bazel6
   - "//:all"
-  - "@remote_java_tools//java_tools/..."
+  # build java_tools from source
+  - "@remote_java_tools//:ijar_cc_binary"
+  - "@remote_java_tools//:one_version_cc_bin"
+  - "@remote_java_tools//:proguard"
+  - "@remote_java_tools//:singlejar_cc_bin"
   - "//examples/..."
 
 build_targets_integration: &build_targets_integration

.bazelrc

@@ -9,6 +9,10 @@ common --tool_java_runtime_version=remotejdk_8
 # Hide Java 8 deprecation warnings.
 common --javacopt=-Xlint:-options
 
+# Enable modern C++ features, for compiling java_tools from source
+build --cxxopt=-std=c++17
+build --host_cxxopt=-std=c++17
+
 # Some tests relies on dynamic libs that are not interface libs
 # the latter are always enabled on Windows: https://github.com/bazelbuild/bazel/blob/1f5414408467171581b6142e93f67fe730d722cf/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java#L2430
 # we can't use a transition because toolchain deps exceed the default --analysis_testing_deps_limit.

MODULE.bazel

@@ -10,6 +10,7 @@ bazel_dep(name = "rules_cc", version = "0.0.15")
 bazel_dep(name = "bazel_features", version = "1.11.0")
 bazel_dep(name = "bazel_skylib", version = "1.6.1")
 bazel_dep(name = "protobuf", version = "27.0", repo_name = "com_google_protobuf")
+bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
 
 # Required by @remote_java_tools, which is loaded via module extension.
 bazel_dep(name = "rules_license", version = "0.0.3")

java/repositories.bzl

@@ -22,33 +22,33 @@ load("//toolchains:remote_java_repository.bzl", "remote_java_repository")
 
 # visible for tests
 JAVA_TOOLS_CONFIG = {
-    "version": "v13.18",
+    "version": "v14.0",
     "release": "true",
     "artifacts": {
         "java_tools_linux": {
-            "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.18/java_tools_linux-v13.18.zip",
-            "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v13.18/java_tools_linux-v13.18.zip",
-            "sha": "0da77fca085dd477a057581f26fe677d88e4b9f542c517d813e50553829f66a0",
+            "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v14.0/java_tools_linux-v14.0.zip",
+            "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v14.0/java_tools_linux-v14.0.zip",
+            "sha": "51ed941d6c62e432e59cc3b6ad3503639cc138ee7a02ed6bf0bbbb16ded418c9",
         },
         "java_tools_windows": {
-            "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.18/java_tools_windows-v13.18.zip",
-            "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v13.18/java_tools_windows-v13.18.zip",
-            "sha": "e07c1604a492a5f316e8d8142446d2b297066d243d4ed3d54324aa89122ca862",
+            "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v14.0/java_tools_windows-v14.0.zip",
+            "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v14.0/java_tools_windows-v14.0.zip",
+            "sha": "3f918fb9c24b04bcd6088ed62c240cfbb1a4bb50376e394151d34d60e8e71cdf",
         },
         "java_tools_darwin_x86_64": {
-            "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.18/java_tools_darwin_x86_64-v13.18.zip",
-            "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v13.18/java_tools_darwin_x86_64-v13.18.zip",
-            "sha": "ecc155c338ab106324dbd036364478b0fd85d4f12d11a95268b6c436b4bb41a2",
+            "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v14.0/java_tools_darwin_x86_64-v14.0.zip",
+            "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v14.0/java_tools_darwin_x86_64-v14.0.zip",
+            "sha": "94daf7d9586943261114de6bde97053597ce031bb8d76672688843b33b7ff610",
         },
         "java_tools_darwin_arm64": {
-            "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.18/java_tools_darwin_arm64-v13.18.zip",
-            "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v13.18/java_tools_darwin_arm64-v13.18.zip",
-            "sha": "d11cdccc9e906f68137b882d75d485122f3c6a9b50374b6bb2e526384114f897",
+            "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v14.0/java_tools_darwin_arm64-v14.0.zip",
+            "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v14.0/java_tools_darwin_arm64-v14.0.zip",
+            "sha": "5f12ea12d0381058dac8aa85ad3656c3a7ab85b8c5d8cd98e4ab57bd8fbf8bee",
         },
         "java_tools": {
-            "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.18/java_tools-v13.18.zip",
-            "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v13.18/java_tools-v13.18.zip",
-            "sha": "1945286e31ca21184b672290caa83cc3470dcdbd00ce0af34f02d24398974ebf",
+            "mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v14.0/java_tools-v14.0.zip",
+            "github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v14.0/java_tools-v14.0.zip",
+            "sha": "1c2074e3ffb8c5bd22d5e65964535f70ba7b1bcd4e688f5d89f79f72a1b625bf",
         },
     },
 }

java/rules_java_deps.bzl

@@ -164,6 +164,41 @@ def platforms_repo():
         urls = ["https://github.com/bazelbuild/platforms/releases/download/0.0.11/platforms-0.0.11.tar.gz"],
     )
 
+def zlib_repo():
+    maybe(
+        http_archive,
+        name = "zlib",
+        sha256 = "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23",
+        urls = ["https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz"],
+        strip_prefix = "zlib-1.3.1",
+        build_file_content = """
+cc_library(
+    name = "zlib",
+    srcs = glob(["*.c"]),
+    hdrs = glob(["*.h"]),
+    copts = select({
+        "@platforms//os:windows": [],
+        "//conditions:default": [
+            "-Wno-deprecated-non-prototype",
+            "-Wno-unused-variable",
+            "-Wno-implicit-function-declaration",
+        ],
+    }),
+    includes = ["."],
+    visibility = ["//visibility:public"],
+)
+            """,
+    )
+
+def absl_repo():
+    maybe(
+        http_archive,
+        name = "com_google_absl",
+        sha256 = "f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3",
+        strip_prefix = "abseil-cpp-20240722.0",
+        urls = ["https://github.com/abseil/abseil-cpp/archive/refs/tags/20240722.0.tar.gz"],
+    )
+
 def rules_java_dependencies():
     """An utility method to load non-toolchain dependencies of rules_java.
 
@@ -174,3 +209,5 @@ def rules_java_dependencies():
     rules_cc_repo()
     protobuf_repo()
     platforms_repo()
+    zlib_repo()
+    absl_repo()

test/repo/.bazelrc

@@ -1,3 +1,7 @@
 build:bzlmod --experimental_enable_bzlmod
 
 common --incompatible_disallow_empty_glob
+
+# Enable modern C++ features, for compiling java_tools from source
+build --cxxopt=-std=c++17
+build --host_cxxopt=-std=c++17

test/repo/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_binary", "java_library", "java_test")  # copybara-use-repo-external-label
-load("@rules_java//toolchains:default_java_toolchain.bzl", "default_java_toolchain")  # copybara-use-repo-external-label
+load("@rules_java//toolchains:default_java_toolchain.bzl", "NONPREBUILT_TOOLCHAIN_CONFIGURATION", "default_java_toolchain")  # copybara-use-repo-external-label
 load("@rules_shell//shell:sh_test.bzl", "sh_test")
 
 java_library(
@@ -50,4 +50,5 @@ sh_test(
 default_java_toolchain(
     name = "my_funky_toolchain",
     bootclasspath = ["@bazel_tools//tools/jdk:platformclasspath"],
+    configuration = NONPREBUILT_TOOLCHAIN_CONFIGURATION,
 )