From 26ea92bfa57c2706c10c82714ff9a3094c6a39ad Mon Sep 17 00:00:00 2001 From: keertk Date: Tue, 11 Jul 2023 21:59:45 +0530 Subject: [PATCH 1/6] Update distdir_deps.bzl with java_tools v12.5 rc1 --- distdir_deps.bzl | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/distdir_deps.bzl b/distdir_deps.bzl index 45f8248a697f00..c577ec7d7afdba 100644 --- a/distdir_deps.bzl +++ b/distdir_deps.bzl @@ -67,11 +67,10 @@ DIST_DEPS = { "rules_java_builtin", "rules_java_builtin_for_testing", ], - "archive": "rules_java-6.1.1.tar.gz", - "sha256": "76402a50ae6859d50bd7aed8c1b8ef09dae5c1035bb3ca7d276f7f3ce659818a", - "urls": ["https://github.com/bazelbuild/rules_java/releases/download/6.1.1/rules_java-6.1.1.tar.gz"], - "patches": ["//third_party:rules_java_6.1.0.patch"], - "patch_args": ["-p1"], + "archive": "d1196d250c17dfffed52db13c75d4f9b9cd20617.tar.gz", + "sha256": "e18bdf05d049841bd934987c9f3d1146974c23e085b8ce0ef3145bdddd468a70", + "strip_prefix": "rules_java-d1196d250c17dfffed52db13c75d4f9b9cd20617", + "urls": ["https://github.com/bazelbuild/rules_java/archive/d1196d250c17dfffed52db13c75d4f9b9cd20617.tar.gz"], "workspace_file_content": "", "used_in": [ "additional_distfiles", From 642c32aa6e07d76654ac4210e7119e84e7bf2f82 Mon Sep 17 00:00:00 2001 From: keertk Date: Tue, 11 Jul 2023 22:04:12 +0530 Subject: [PATCH 2/6] Add archive_override to MODULE.bazel --- MODULE.bazel | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 52623e4a4acd85..59912df5ea8b7c 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -28,10 +28,11 @@ single_version_override( patches = ["//third_party:rules_jvm_external_5.2.patch"], ) -single_version_override( +archive_override( module_name = "rules_java", - patch_strip = 1, - patches = ["//third_party:rules_java_6.1.0.patch"], + urls = ["https://github.com/bazelbuild/rules_java/archive/d1196d250c17dfffed52db13c75d4f9b9cd20617.tar.gz"], + integrity = "sha256-4YvfBdBJhBvZNJh8nz0RRpdMI+CFuM4O8xRb3d1GinA=", + strip_prefix = "rules_java-d1196d250c17dfffed52db13c75d4f9b9cd20617", ) maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") From 64830142e7003c2e91dd20aed4dbfdda0a2ed48d Mon Sep 17 00:00:00 2001 From: keertk Date: Tue, 11 Jul 2023 22:04:46 +0530 Subject: [PATCH 3/6] Delete rules_java_6.1.0.patch --- third_party/rules_java_6.1.0.patch | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 third_party/rules_java_6.1.0.patch diff --git a/third_party/rules_java_6.1.0.patch b/third_party/rules_java_6.1.0.patch deleted file mode 100644 index cab394f7f9fdbe..00000000000000 --- a/third_party/rules_java_6.1.0.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/BUILD b/BUILD -index 9840747..c138b7f 100644 ---- a/BUILD -+++ b/BUILD -@@ -12,8 +12,9 @@ filegroup( - "BUILD", - "LICENSE", - "MODULE.bazel", -+ "WORKSPACE", - "//java:srcs", - "//toolchains:srcs", - ], -- visibility = ["//distro:__pkg__"], -+ visibility = ["//visibility:public"], - ) From 30aa092cfe50435ae370c4a4bc9938eff52ce3fb Mon Sep 17 00:00:00 2001 From: keertk Date: Thu, 13 Jul 2023 17:53:04 +0530 Subject: [PATCH 4/6] Update distdir_deps.bzl with final rules_java 6.2.2 --- distdir_deps.bzl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/distdir_deps.bzl b/distdir_deps.bzl index c577ec7d7afdba..ff882354f0eb4f 100644 --- a/distdir_deps.bzl +++ b/distdir_deps.bzl @@ -67,10 +67,9 @@ DIST_DEPS = { "rules_java_builtin", "rules_java_builtin_for_testing", ], - "archive": "d1196d250c17dfffed52db13c75d4f9b9cd20617.tar.gz", - "sha256": "e18bdf05d049841bd934987c9f3d1146974c23e085b8ce0ef3145bdddd468a70", - "strip_prefix": "rules_java-d1196d250c17dfffed52db13c75d4f9b9cd20617", - "urls": ["https://github.com/bazelbuild/rules_java/archive/d1196d250c17dfffed52db13c75d4f9b9cd20617.tar.gz"], + "archive": "rules_java-6.2.2.tar.gz", + "sha256": "847527aa7f74712e0a63af2670ba3ddc04e8ea3d8930a7947c17aebfb29d5294", + "urls": ["https://github.com/bazelbuild/rules_java/releases/download/6.2.2/rules_java-6.2.2.tar.gz"], "workspace_file_content": "", "used_in": [ "additional_distfiles", From 73c8858d5195f072bbb316a3bf1289de1646d91a Mon Sep 17 00:00:00 2001 From: keertk Date: Thu, 13 Jul 2023 17:53:54 +0530 Subject: [PATCH 5/6] Update MODULE.tools with final rules_java 6.2.2 --- src/MODULE.tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MODULE.tools b/src/MODULE.tools index 593e6216211a0c..8f1a3fdd2ed156 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.6") -bazel_dep(name = "rules_java", version = "6.1.1") +bazel_dep(name = "rules_java", version = "6.2.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 5b30bc4f23037f5651063e24c1881328720d6bcb Mon Sep 17 00:00:00 2001 From: keertk Date: Thu, 13 Jul 2023 17:54:39 +0530 Subject: [PATCH 6/6] Update MODULE.bazel with final rules_java 6.2.2 --- MODULE.bazel | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 59912df5ea8b7c..beaff95d59e5af 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -16,7 +16,7 @@ bazel_dep(name = "stardoc", version = "0.5.3", repo_name = "io_bazel_skydoc") bazel_dep(name = "zstd-jni", version = "1.5.2-3") bazel_dep(name = "zlib", version = "1.2.13") bazel_dep(name = "rules_cc", version = "0.0.6") -bazel_dep(name = "rules_java", version = "6.1.1") +bazel_dep(name = "rules_java", version = "6.2.2") bazel_dep(name = "rules_proto", version = "5.3.0-21.7") bazel_dep(name = "rules_jvm_external", version = "5.2") bazel_dep(name = "rules_python", version = "0.19.0") @@ -28,13 +28,6 @@ single_version_override( patches = ["//third_party:rules_jvm_external_5.2.patch"], ) -archive_override( - module_name = "rules_java", - urls = ["https://github.com/bazelbuild/rules_java/archive/d1196d250c17dfffed52db13c75d4f9b9cd20617.tar.gz"], - integrity = "sha256-4YvfBdBJhBvZNJh8nz0RRpdMI+CFuM4O8xRb3d1GinA=", - strip_prefix = "rules_java-d1196d250c17dfffed52db13c75d4f9b9cd20617", -) - maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") maven.install( # We don't yet specify the maven coordinates in the MODULE.bazel to avoid duplicating information.