From 42a35294d376ee9fc46eb984751faa238893624b Mon Sep 17 00:00:00 2001 From: Keerthana Kumar Date: Mon, 2 Oct 2023 13:53:34 +0000 Subject: [PATCH 1/7] Update rules_java 6.3.2 --- MODULE.bazel | 2 +- src/MODULE.tools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index a4f732a550093a..6c4e61c4c9b7d2 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -21,7 +21,7 @@ bazel_dep(name = "zlib", version = "1.2.13") # The following are required when building without WORKSPACE SUFFIX bazel_dep(name = "rules_cc", version = "0.0.9") -bazel_dep(name = "rules_java", version = "5.5.0") +bazel_dep(name = "rules_java", version = "6.3.2") bazel_dep(name = "rules_proto", version = "4.0.0") # TODO(pcloudy): Add remoteapis and googleapis as Bazel modules in the BCR. diff --git a/src/MODULE.tools b/src/MODULE.tools index ff9d5e6d221e1c..34205ca7f13bed 100644 --- a/src/MODULE.tools +++ b/src/MODULE.tools @@ -1,7 +1,7 @@ module(name = "bazel_tools") bazel_dep(name = "rules_cc", version = "0.0.9") -bazel_dep(name = "rules_java", version = "5.5.0") +bazel_dep(name = "rules_java", version = "6.3.2") bazel_dep(name = "rules_license", version = "0.0.3") bazel_dep(name = "rules_proto", version = "4.0.0") bazel_dep(name = "rules_python", version = "0.4.0") From 1e4ee9a2e1ca9a68dc9ace408222a3b6056cc791 Mon Sep 17 00:00:00 2001 From: keertk Date: Mon, 2 Oct 2023 08:29:32 -0700 Subject: [PATCH 2/7] Update distdir_deps.bzl --- distdir_deps.bzl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/distdir_deps.bzl b/distdir_deps.bzl index 40d1c599924e59..a7fbc5bcf90a5c 100644 --- a/distdir_deps.bzl +++ b/distdir_deps.bzl @@ -62,12 +62,12 @@ DIST_DEPS = { ], }, "rules_java": { - "archive": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", - "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", - "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178", + "archive": "096c88ff2bdcd1fdcf8cf751f04c975d88e0401e.zip", + "sha256": "36ebb5906a99e467c3d625f7cbd835a427233742b735d07a7276db1408f270b9", + "strip_prefix": "rules_java-096c88ff2bdcd1fdcf8cf751f04c975d88e0401e", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", - "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/096c88ff2bdcd1fdcf8cf751f04c975d88e0401e.zip", + "https://github.com/bazelbuild/rules_java/archive/096c88ff2bdcd1fdcf8cf751f04c975d88e0401e.zip", ], "used_in": [ "additional_distfiles", From f088e07b5df0cec7203d9e16d5f76328b6dd9298 Mon Sep 17 00:00:00 2001 From: keertk Date: Mon, 2 Oct 2023 08:33:45 -0700 Subject: [PATCH 3/7] Update distdir_deps.bzl --- distdir_deps.bzl | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/distdir_deps.bzl b/distdir_deps.bzl index a7fbc5bcf90a5c..e2820b736a222a 100644 --- a/distdir_deps.bzl +++ b/distdir_deps.bzl @@ -62,12 +62,10 @@ DIST_DEPS = { ], }, "rules_java": { - "archive": "096c88ff2bdcd1fdcf8cf751f04c975d88e0401e.zip", - "sha256": "36ebb5906a99e467c3d625f7cbd835a427233742b735d07a7276db1408f270b9", - "strip_prefix": "rules_java-096c88ff2bdcd1fdcf8cf751f04c975d88e0401e", + "archive": "rules_java-6.3.2.tar.gz", + "sha256": "7c82d4412fb837a40e049deea352cfc019d2a247ab9639aa7df12381fb39de60", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/096c88ff2bdcd1fdcf8cf751f04c975d88e0401e.zip", - "https://github.com/bazelbuild/rules_java/archive/096c88ff2bdcd1fdcf8cf751f04c975d88e0401e.zip", + "https://github.com/bazelbuild/rules_java/releases/download/6.3.2/rules_java-6.3.2.tar.gz", ], "used_in": [ "additional_distfiles", From faf84b3b983efd88b3ac17ca77b4da98e995446d Mon Sep 17 00:00:00 2001 From: Keerthana Kumar Date: Mon, 2 Oct 2023 17:54:57 +0000 Subject: [PATCH 4/7] Update rules_java 5.5.1 --- MODULE.bazel | 2 +- distdir_deps.bzl | 6 +++--- src/MODULE.tools | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 6c4e61c4c9b7d2..744b9f1ae2bd9d 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -21,7 +21,7 @@ bazel_dep(name = "zlib", version = "1.2.13") # The following are required when building without WORKSPACE SUFFIX bazel_dep(name = "rules_cc", version = "0.0.9") -bazel_dep(name = "rules_java", version = "6.3.2") +bazel_dep(name = "rules_java", version = "5.5.1") bazel_dep(name = "rules_proto", version = "4.0.0") # TODO(pcloudy): Add remoteapis and googleapis as Bazel modules in the BCR. diff --git a/distdir_deps.bzl b/distdir_deps.bzl index e2820b736a222a..004dce859ab38f 100644 --- a/distdir_deps.bzl +++ b/distdir_deps.bzl @@ -62,10 +62,10 @@ DIST_DEPS = { ], }, "rules_java": { - "archive": "rules_java-6.3.2.tar.gz", - "sha256": "7c82d4412fb837a40e049deea352cfc019d2a247ab9639aa7df12381fb39de60", + "archive": "rules_java-5.5.1.tar.gz", + "sha256": "73b88f34dc251bce7bc6c472eb386a6c2b312ed5b473c81fe46855c248f792e0", "urls": [ - "https://github.com/bazelbuild/rules_java/releases/download/6.3.2/rules_java-6.3.2.tar.gz", + "https://github.com/bazelbuild/rules_java/releases/download/5.5.1/rules_java-5.5.1.tar.gz", ], "used_in": [ "additional_distfiles", diff --git a/src/MODULE.tools b/src/MODULE.tools index 34205ca7f13bed..ca51288b1d8037 100644 --- a/src/MODULE.tools +++ b/src/MODULE.tools @@ -1,7 +1,7 @@ module(name = "bazel_tools") bazel_dep(name = "rules_cc", version = "0.0.9") -bazel_dep(name = "rules_java", version = "6.3.2") +bazel_dep(name = "rules_java", version = "5.5.1") bazel_dep(name = "rules_license", version = "0.0.3") bazel_dep(name = "rules_proto", version = "4.0.0") bazel_dep(name = "rules_python", version = "0.4.0") From 59a39febb3a327527120287e779cc6239c01e1d5 Mon Sep 17 00:00:00 2001 From: keertk Date: Wed, 4 Oct 2023 13:12:34 -0700 Subject: [PATCH 5/7] Add back strip_prefix --- distdir_deps.bzl | 1 + 1 file changed, 1 insertion(+) diff --git a/distdir_deps.bzl b/distdir_deps.bzl index 004dce859ab38f..2f01d99295ae71 100644 --- a/distdir_deps.bzl +++ b/distdir_deps.bzl @@ -64,6 +64,7 @@ DIST_DEPS = { "rules_java": { "archive": "rules_java-5.5.1.tar.gz", "sha256": "73b88f34dc251bce7bc6c472eb386a6c2b312ed5b473c81fe46855c248f792e0", + "strip_prefix": "rules_java-5.5.1", "urls": [ "https://github.com/bazelbuild/rules_java/releases/download/5.5.1/rules_java-5.5.1.tar.gz", ], From 0cad9ff304ad85d7d869fdbd00ded9bf597fb937 Mon Sep 17 00:00:00 2001 From: keertk Date: Wed, 4 Oct 2023 13:44:03 -0700 Subject: [PATCH 6/7] Update distdir_deps.bzl --- distdir_deps.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distdir_deps.bzl b/distdir_deps.bzl index 2f01d99295ae71..c7fc4588e4477d 100644 --- a/distdir_deps.bzl +++ b/distdir_deps.bzl @@ -64,7 +64,7 @@ DIST_DEPS = { "rules_java": { "archive": "rules_java-5.5.1.tar.gz", "sha256": "73b88f34dc251bce7bc6c472eb386a6c2b312ed5b473c81fe46855c248f792e0", - "strip_prefix": "rules_java-5.5.1", + "strip_prefix": "", "urls": [ "https://github.com/bazelbuild/rules_java/releases/download/5.5.1/rules_java-5.5.1.tar.gz", ], From a9f08505ee15dbc370ae4ea6ad351b1992a5d60c Mon Sep 17 00:00:00 2001 From: keertk Date: Wed, 4 Oct 2023 13:45:36 -0700 Subject: [PATCH 7/7] Update bazel_rules_java_test.sh Include partial changes from 5466840ea8f10e9adc59d9a932750f84fa7560d3 --- src/test/shell/bazel/bazel_rules_java_test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/shell/bazel/bazel_rules_java_test.sh b/src/test/shell/bazel/bazel_rules_java_test.sh index 7594e21655b535..21c9acb8374440 100755 --- a/src/test/shell/bazel/bazel_rules_java_test.sh +++ b/src/test/shell/bazel/bazel_rules_java_test.sh @@ -84,9 +84,10 @@ EOF function test_rules_java_repository_builds_itself() { write_default_bazelrc + setup_skylib_support # We test that a built-in @rules_java repository is buildable. - bazel build @rules_java//... &> $TEST_log \ + bazel build -- @rules_java//... -@rules_java//toolchains/... &> $TEST_log \ || fail "Build failed unexpectedly" }