From 4d29ac9da6f5beb5e1ee63bdd51ba8145072cc06 Mon Sep 17 00:00:00 2001
From: Alex Rodionov <p0deje@gmail.com>
Date: Fri, 29 Mar 2024 14:08:24 -0700
Subject: [PATCH] [bazel] Fix maven_bom targets

---
 MODULE.bazel                                  |  8 ++-
 java/src/org/openqa/selenium/grid/BUILD.bazel | 55 ++++++++++---------
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index a3b58a5979a2a..517b1be08a9a0 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -124,10 +124,14 @@ use_repo(pip, "py_dev_requirements")
 
 register_toolchains("@pythons_hub//:all")
 
-single_version_override(
+# https://github.com/bazelbuild/rules_jvm_external/pull/1079
+archive_override(
     module_name = "rules_jvm_external",
-    patches = ["//java:rules_jvm_external_javadoc.patch"],
+    integrity = "sha256-yS8Qes1PLbYbe10b1WSgl0Auqn/1Wlxg8O3wSr7a/Sg=",
     patch_strip = 1,
+    patches = ["//java:rules_jvm_external_javadoc.patch"],
+    strip_prefix = "rules_jvm_external-f572a26116c7ef71d8842dd056c2605782f7be8d",
+    urls = ["https://github.com/bazelbuild/rules_jvm_external/archive/f572a26116c7ef71d8842dd056c2605782f7be8d.tar.gz"],
 )
 
 java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")
diff --git a/java/src/org/openqa/selenium/grid/BUILD.bazel b/java/src/org/openqa/selenium/grid/BUILD.bazel
index cf915977bb161..87b5451d5e168 100644
--- a/java/src/org/openqa/selenium/grid/BUILD.bazel
+++ b/java/src/org/openqa/selenium/grid/BUILD.bazel
@@ -7,6 +7,7 @@ load(
     "java_export",
     "java_library",
     "javadoc",
+    "maven_bom",
     "merge_jars",
 )
 load("//java:version.bzl", "SE_VERSION")
@@ -90,33 +91,33 @@ java_library(
     ],
 )
 
-# # Generated from: bazel query 'kind(maven_publish, set(//java/... //third_party/...))' | sort
-# # with the selenium rc, bom dependencies (naturally), and CDP implementations removed.
-# maven_bom(
-#     name = "bom",
-#     bom_pom_template = "bom-pom-template.xml",
-#     dependencies_maven_coordinates = "org.seleniumhq.selenium:selenium-dependencies-bom:%s" % SE_VERSION,
-#     dependencies_pom_template = "bom-pom-template.xml",
-#     java_exports = [
-#         "//java/src/org/openqa/selenium/chrome:chrome",
-#         "//java/src/org/openqa/selenium/chromium:chromium",
-#         "//java/src/org/openqa/selenium/edge:edge",
-#         "//java/src/org/openqa/selenium/firefox:firefox",
-#         "//java/src/org/openqa/selenium/grid/sessionmap/jdbc:jdbc",
-#         "//java/src/org/openqa/selenium/grid/sessionmap/redis:redis",
-#         "//java/src/org/openqa/selenium/grid:grid",
-#         "//java/src/org/openqa/selenium/ie:ie",
-#         "//java/src/org/openqa/selenium/json:json",
-#         "//java/src/org/openqa/selenium/manager:manager",
-#         "//java/src/org/openqa/selenium/remote/http:http",
-#         "//java/src/org/openqa/selenium/remote:remote",
-#         "//java/src/org/openqa/selenium/safari:safari",
-#         "//java/src/org/openqa/selenium/support:support",
-#         "//java/src/org/openqa/selenium:client-combined",
-#         "//java/src/org/openqa/selenium:core",
-#     ] + CDP_DEPS,
-#     maven_coordinates = "org.seleniumhq.selenium:selenium-bom:%s" % SE_VERSION,
-# )
+# Generated from: bazel query 'kind(maven_publish, set(//java/... //third_party/...))' | sort
+# with the selenium rc, bom dependencies (naturally), and CDP implementations removed.
+maven_bom(
+    name = "bom",
+    bom_pom_template = "bom-pom-template.xml",
+    dependencies_maven_coordinates = "org.seleniumhq.selenium:selenium-dependencies-bom:%s" % SE_VERSION,
+    dependencies_pom_template = "bom-pom-template.xml",
+    java_exports = [
+        "//java/src/org/openqa/selenium/chrome:chrome",
+        "//java/src/org/openqa/selenium/chromium:chromium",
+        "//java/src/org/openqa/selenium/edge:edge",
+        "//java/src/org/openqa/selenium/firefox:firefox",
+        "//java/src/org/openqa/selenium/grid/sessionmap/jdbc:jdbc",
+        "//java/src/org/openqa/selenium/grid/sessionmap/redis:redis",
+        "//java/src/org/openqa/selenium/grid:grid",
+        "//java/src/org/openqa/selenium/ie:ie",
+        "//java/src/org/openqa/selenium/json:json",
+        "//java/src/org/openqa/selenium/manager:manager",
+        "//java/src/org/openqa/selenium/remote/http:http",
+        "//java/src/org/openqa/selenium/remote:remote",
+        "//java/src/org/openqa/selenium/safari:safari",
+        "//java/src/org/openqa/selenium/support:support",
+        "//java/src/org/openqa/selenium:client-combined",
+        "//java/src/org/openqa/selenium:core",
+    ] + CDP_DEPS,
+    maven_coordinates = "org.seleniumhq.selenium:selenium-bom:%s" % SE_VERSION,
+)
 
 java_export(
     name = "grid",