Skip to content

Commit 4d29ac9

Browse files
committed
[bazel] Fix maven_bom targets
1 parent 6831e8e commit 4d29ac9

File tree

2 files changed

+34
-29
lines changed

2 files changed

+34
-29
lines changed

MODULE.bazel

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,14 @@ use_repo(pip, "py_dev_requirements")
124124

125125
register_toolchains("@pythons_hub//:all")
126126

127-
single_version_override(
127+
# https://github.com/bazelbuild/rules_jvm_external/pull/1079
128+
archive_override(
128129
module_name = "rules_jvm_external",
129-
patches = ["//java:rules_jvm_external_javadoc.patch"],
130+
integrity = "sha256-yS8Qes1PLbYbe10b1WSgl0Auqn/1Wlxg8O3wSr7a/Sg=",
130131
patch_strip = 1,
132+
patches = ["//java:rules_jvm_external_javadoc.patch"],
133+
strip_prefix = "rules_jvm_external-f572a26116c7ef71d8842dd056c2605782f7be8d",
134+
urls = ["https://github.com/bazelbuild/rules_jvm_external/archive/f572a26116c7ef71d8842dd056c2605782f7be8d.tar.gz"],
131135
)
132136

133137
java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")

java/src/org/openqa/selenium/grid/BUILD.bazel

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ load(
77
"java_export",
88
"java_library",
99
"javadoc",
10+
"maven_bom",
1011
"merge_jars",
1112
)
1213
load("//java:version.bzl", "SE_VERSION")
@@ -90,33 +91,33 @@ java_library(
9091
],
9192
)
9293

93-
# # Generated from: bazel query 'kind(maven_publish, set(//java/... //third_party/...))' | sort
94-
# # with the selenium rc, bom dependencies (naturally), and CDP implementations removed.
95-
# maven_bom(
96-
# name = "bom",
97-
# bom_pom_template = "bom-pom-template.xml",
98-
# dependencies_maven_coordinates = "org.seleniumhq.selenium:selenium-dependencies-bom:%s" % SE_VERSION,
99-
# dependencies_pom_template = "bom-pom-template.xml",
100-
# java_exports = [
101-
# "//java/src/org/openqa/selenium/chrome:chrome",
102-
# "//java/src/org/openqa/selenium/chromium:chromium",
103-
# "//java/src/org/openqa/selenium/edge:edge",
104-
# "//java/src/org/openqa/selenium/firefox:firefox",
105-
# "//java/src/org/openqa/selenium/grid/sessionmap/jdbc:jdbc",
106-
# "//java/src/org/openqa/selenium/grid/sessionmap/redis:redis",
107-
# "//java/src/org/openqa/selenium/grid:grid",
108-
# "//java/src/org/openqa/selenium/ie:ie",
109-
# "//java/src/org/openqa/selenium/json:json",
110-
# "//java/src/org/openqa/selenium/manager:manager",
111-
# "//java/src/org/openqa/selenium/remote/http:http",
112-
# "//java/src/org/openqa/selenium/remote:remote",
113-
# "//java/src/org/openqa/selenium/safari:safari",
114-
# "//java/src/org/openqa/selenium/support:support",
115-
# "//java/src/org/openqa/selenium:client-combined",
116-
# "//java/src/org/openqa/selenium:core",
117-
# ] + CDP_DEPS,
118-
# maven_coordinates = "org.seleniumhq.selenium:selenium-bom:%s" % SE_VERSION,
119-
# )
94+
# Generated from: bazel query 'kind(maven_publish, set(//java/... //third_party/...))' | sort
95+
# with the selenium rc, bom dependencies (naturally), and CDP implementations removed.
96+
maven_bom(
97+
name = "bom",
98+
bom_pom_template = "bom-pom-template.xml",
99+
dependencies_maven_coordinates = "org.seleniumhq.selenium:selenium-dependencies-bom:%s" % SE_VERSION,
100+
dependencies_pom_template = "bom-pom-template.xml",
101+
java_exports = [
102+
"//java/src/org/openqa/selenium/chrome:chrome",
103+
"//java/src/org/openqa/selenium/chromium:chromium",
104+
"//java/src/org/openqa/selenium/edge:edge",
105+
"//java/src/org/openqa/selenium/firefox:firefox",
106+
"//java/src/org/openqa/selenium/grid/sessionmap/jdbc:jdbc",
107+
"//java/src/org/openqa/selenium/grid/sessionmap/redis:redis",
108+
"//java/src/org/openqa/selenium/grid:grid",
109+
"//java/src/org/openqa/selenium/ie:ie",
110+
"//java/src/org/openqa/selenium/json:json",
111+
"//java/src/org/openqa/selenium/manager:manager",
112+
"//java/src/org/openqa/selenium/remote/http:http",
113+
"//java/src/org/openqa/selenium/remote:remote",
114+
"//java/src/org/openqa/selenium/safari:safari",
115+
"//java/src/org/openqa/selenium/support:support",
116+
"//java/src/org/openqa/selenium:client-combined",
117+
"//java/src/org/openqa/selenium:core",
118+
] + CDP_DEPS,
119+
maven_coordinates = "org.seleniumhq.selenium:selenium-bom:%s" % SE_VERSION,
120+
)
120121

121122
java_export(
122123
name = "grid",

0 commit comments

Comments
 (0)