diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 4791823bc74845..6685a2a97b2d1d 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -2249,7 +2249,7 @@ "general": { "bzlTransitiveDigest": "uLzmPag+drHdv4SHM6VTDi4HKycGdoUKF422fH5bqrg=", "accumulatedFileDigests": { - "@@//src/test/tools/bzlmod:MODULE.bazel.lock": "9b201dcdccf124c713cccf9312c677c31b50bb300096e97eea688b3a7d75d189", + "@@//src/test/tools/bzlmod:MODULE.bazel.lock": "38e96ee0c3217da5ada5c377da7df10d9ff874e53bf6a2f85052d61303761483", "@@//:MODULE.bazel": "f6641578eaa9690d1685ac61b35622a2c9c65ab421288b76c50c7b701263e1ad" }, "envVariables": {}, @@ -2555,7 +2555,7 @@ }, "//tools/android:android_extensions.bzl%remote_android_tools_extensions": { "general": { - "bzlTransitiveDigest": "T7VvFpkurZDpJKrEfo+wjORFppVOs/3W9Ih09X2T+Rk=", + "bzlTransitiveDigest": "cYQAQLvXLcGKYAEPkqiqYQRwsgSZKLzIOW+kUbDcNZI=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -2582,7 +2582,7 @@ }, "//tools/test:extensions.bzl%remote_coverage_tools_extension": { "general": { - "bzlTransitiveDigest": "JCWRSv97xkZhZ2TJJ9nQw9O+FBifHDjdYYTuj522QJY=", + "bzlTransitiveDigest": "AL+K5m+GCP3XRzLPqpKAq4GsjIVDXgUveWm8nih4ju0=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { diff --git a/src/test/tools/bzlmod/MODULE.bazel.lock b/src/test/tools/bzlmod/MODULE.bazel.lock index 7aed4481e6213a..7feb5ba14cdaa6 100644 --- a/src/test/tools/bzlmod/MODULE.bazel.lock +++ b/src/test/tools/bzlmod/MODULE.bazel.lock @@ -986,12 +986,13 @@ "name": "apple_support~1.5.0~apple_cc_configure_extension~local_config_apple_cc_toolchains" } } - } + }, + "recordedRepoMappingEntries": [] } }, "@@bazel_tools//tools/android:android_extensions.bzl%remote_android_tools_extensions": { "general": { - "bzlTransitiveDigest": "T7VvFpkurZDpJKrEfo+wjORFppVOs/3W9Ih09X2T+Rk=", + "bzlTransitiveDigest": "cYQAQLvXLcGKYAEPkqiqYQRwsgSZKLzIOW+kUbDcNZI=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -1013,7 +1014,8 @@ "url": "https://maven.google.com/com/android/tools/r8/8.2.33/r8-8.2.33.jar" } } - } + }, + "recordedRepoMappingEntries": [] } }, "@@bazel_tools//tools/cpp:cc_configure.bzl%cc_configure_extension": { @@ -1036,7 +1038,8 @@ "name": "bazel_tools~cc_configure_extension~local_config_cc_toolchains" } } - } + }, + "recordedRepoMappingEntries": [] } }, "@@bazel_tools//tools/osx:xcode_configure.bzl%xcode_configure_extension": { @@ -1054,7 +1057,8 @@ "remote_xcode": "" } } - } + }, + "recordedRepoMappingEntries": [] } }, "@@bazel_tools//tools/sh:sh_configure.bzl%sh_configure_extension": { @@ -1070,12 +1074,13 @@ "name": "bazel_tools~sh_configure_extension~local_config_sh" } } - } + }, + "recordedRepoMappingEntries": [] } }, "@@bazel_tools//tools/test:extensions.bzl%remote_coverage_tools_extension": { "general": { - "bzlTransitiveDigest": "JCWRSv97xkZhZ2TJJ9nQw9O+FBifHDjdYYTuj522QJY=", + "bzlTransitiveDigest": "AL+K5m+GCP3XRzLPqpKAq4GsjIVDXgUveWm8nih4ju0=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -1090,12 +1095,13 @@ ] } } - } + }, + "recordedRepoMappingEntries": [] } }, "@@rules_java~7.3.2//java:extensions.bzl%toolchains": { "general": { - "bzlTransitiveDigest": "XNzVf6RECZd/BbdZ+jK9RvszGCjGCSKVensdhWs5ZZ0=", + "bzlTransitiveDigest": "Bm4ulErUcJjZtKeAt2etkB6sGO8evCgHQxbw4Px8q60=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -1630,12 +1636,13 @@ "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_win//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_win//:jdk\",\n)\n" } } - } + }, + "recordedRepoMappingEntries": [] } }, "@@rules_jvm_external~4.4.2//:extensions.bzl%maven": { "general": { - "bzlTransitiveDigest": "JPl0oPHVGIlHapLN2T+oN/u7EqLrXEobzFvcQByPLrU=", + "bzlTransitiveDigest": "yXprMX4LqzJwuZlbtT9WNeu7p2iEYw7j4R1NP9pc4Ow=", "accumulatedFileDigests": { "@@rules_jvm_external~4.4.2//:rules_jvm_external_deps_install.json": "10442a5ae27d9ff4c2003e5ab71643bf0d8b48dcf968b4173fa274c3232a8c06" }, @@ -2717,12 +2724,13 @@ "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/sdk-core/2.17.183/sdk-core-2.17.183.jar" } } - } + }, + "recordedRepoMappingEntries": [] } }, "@@rules_jvm_external~4.4.2//:non-module-deps.bzl%non_module_deps": { "general": { - "bzlTransitiveDigest": "CtmQiAryK4Nm7iRKfhzpqt4SDrAT2Yj3ToESSpNieg8=", + "bzlTransitiveDigest": "Td87llNSs5GZ/kAxu6pAqfEXBZ3HdkSqRmUzvIfbFWg=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -2737,12 +2745,13 @@ ] } } - } + }, + "recordedRepoMappingEntries": [] } }, "@@rules_python~0.22.1//python/extensions:python.bzl%python": { "general": { - "bzlTransitiveDigest": "vB4dz4nFvCLbccbcx4QfmjkyHD1c4gmNbm+iXKrY7aE=", + "bzlTransitiveDigest": "NGtTMUqs2EEJeXu6mXdpmYRrQGZiJV7S3mxeod3Hm7M=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -2754,12 +2763,13 @@ "toolchains": [] } } - } + }, + "recordedRepoMappingEntries": [] } }, "@@rules_python~0.22.1//python/extensions/private:internal_deps.bzl%internal_deps": { "general": { - "bzlTransitiveDigest": "iWtjpSs1rEgVFlK6Y+vm9Nj+n4ozq0JBjm5mMc6SWak=", + "bzlTransitiveDigest": "5c1tkdV6L67SQOZWc9MUoS5ZnsSxeDKsh9urs01jZSM=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -3202,7 +3212,8 @@ "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" } } - } + }, + "recordedRepoMappingEntries": [] } } } diff --git a/tools/build_defs/repo/http.bzl b/tools/build_defs/repo/http.bzl index 187beee1f1b67e..12f9d8e9a26bf2 100644 --- a/tools/build_defs/repo/http.bzl +++ b/tools/build_defs/repo/http.bzl @@ -192,8 +192,6 @@ def _http_file_impl(ctx): return _update_integrity_attr(ctx, _http_file_attrs, download_info) _HTTP_JAR_BUILD = """\ -load("{rules_java_defs}", "java_import") - package(default_visibility = ["//visibility:public"]) java_import( @@ -226,7 +224,6 @@ def _http_jar_impl(ctx): ctx.file("WORKSPACE", "workspace(name = \"{name}\")".format(name = ctx.name)) ctx.file("jar/BUILD", _HTTP_JAR_BUILD.format( file_name = downloaded_file_name, - rules_java_defs = str(Label("@rules_java//java:defs.bzl")), )) return _update_integrity_attr(ctx, _http_jar_attrs, download_info) diff --git a/tools/build_defs/repo/jvm.bzl b/tools/build_defs/repo/jvm.bzl index a3ea79e17e5386..5584ee11398a32 100644 --- a/tools/build_defs/repo/jvm.bzl +++ b/tools/build_defs/repo/jvm.bzl @@ -288,11 +288,6 @@ def jvm_maven_import_external( srcjar_urls = kwargs.pop("srcjar_urls", None) rule_name = kwargs.pop("rule_name", "java_import") - rules_java_defs = str(Label("@rules_java//java:defs.bzl")) - rule_load = kwargs.pop( - "rule_load", - 'load("{}", "java_import")'.format(rules_java_defs), - ) if fetch_sources: src_coordinates = struct( @@ -315,7 +310,6 @@ def jvm_maven_import_external( srcjar_urls = srcjar_urls, canonical_id = artifact, rule_name = rule_name, - rule_load = rule_load, tags = tags, **kwargs )