From 9da87e567eac79254d0e180993882a5493304109 Mon Sep 17 00:00:00 2001 From: Titus Fortner Date: Mon, 18 May 2026 08:24:50 -0500 Subject: [PATCH] [build] bump rules_jvm_external --- MODULE.bazel | 4 +-- .../rules_jvm_external_maven_publisher.patch | 32 ------------------- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 third_party/bazel/rules_jvm_external_maven_publisher.patch diff --git a/MODULE.bazel b/MODULE.bazel index b382b3357aa63..de9b8553b17fc 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -32,7 +32,7 @@ bazel_dep(name = "rules_dotnet", version = "0.21.5") # See below for actual version used bazel_dep(name = "rules_java", version = "9.6.1") -bazel_dep(name = "rules_jvm_external", version = "6.10") +bazel_dep(name = "rules_jvm_external", version = "7.0") bazel_dep(name = "rules_multitool", version = "1.11.1") bazel_dep(name = "rules_nodejs", version = "6.7.4") bazel_dep(name = "rules_oci", version = "2.3.0") @@ -42,13 +42,11 @@ bazel_dep(name = "rules_proto", version = "7.1.0") bazel_dep(name = "rules_ruby", version = "0.26.0") bazel_dep(name = "rules_rs", version = "0.0.61") -# Use latest rules_jvm_external for Bazel 9 compatibility single_version_override( module_name = "rules_jvm_external", patch_strip = 1, patches = [ "//third_party/bazel:rules_jvm_external_javadoc.patch", - "//third_party/bazel:rules_jvm_external_maven_publisher.patch", ], ) diff --git a/third_party/bazel/rules_jvm_external_maven_publisher.patch b/third_party/bazel/rules_jvm_external_maven_publisher.patch deleted file mode 100644 index 72021bcd82e48..0000000000000 --- a/third_party/bazel/rules_jvm_external_maven_publisher.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/maven/MavenPublisher.java b/private/tools/java/com/github/bazelbuild/rules_jvm_external/maven/MavenPublisher.java ---- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/maven/MavenPublisher.java -+++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/maven/MavenPublisher.java -@@ -174,16 +174,18 @@ - Path pom = Paths.get(pomPath); - - List> futures = new ArrayList<>(); - futures.add(upload(repo, credentials, coords, ".pom", pom, signingMetadata, executor)); - -- futures.add( -- upload( -- repo, -- credentials, -- coords, -- "." + getFileExtension(mainArtifactPath), -- Paths.get(mainArtifactPath), -- signingMetadata, -- executor)); -- -+ if (!mainArtifactPath.isEmpty()) { -+ futures.add( -+ upload( -+ repo, -+ credentials, -+ coords, -+ "." + getFileExtension(mainArtifactPath), -+ Paths.get(mainArtifactPath), -+ signingMetadata, -+ executor)); -+ } -+ - if (!Strings.isNullOrEmpty(extraArtifacts)) {