Skip to content

Commit adf0c4c

Browse files
authored
[java] If a dep comes from a BOM, omit the version number (#15682)
1 parent f2d3870 commit adf0c4c

File tree

2 files changed

+290
-137
lines changed

2 files changed

+290
-137
lines changed

MODULE.bazel

+32-33
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,15 @@ bazel_dep(name = "rules_python", version = "1.1.0")
2727
bazel_dep(name = "rules_proto", version = "7.0.2")
2828
bazel_dep(name = "rules_ruby", version = "0.18.0")
2929

30+
# Until `rules_jvm_external` 6.8 ships
31+
git_override(
32+
module_name = "rules_jvm_external",
33+
commit = "d8af22108bd8b353a226140570008231f2921931",
34+
patch_strip = 1,
35+
patches = ["//java:rules_jvm_external_javadoc.patch"],
36+
remote = "https://github.com/bazel-contrib/rules_jvm_external.git",
37+
)
38+
3039
linter = use_extension("@apple_rules_lint//lint:extensions.bzl", "linter")
3140
linter.configure(
3241
name = "java-spotbugs",
@@ -140,16 +149,6 @@ use_repo(pip, "py_dev_requirements")
140149

141150
register_toolchains("@pythons_hub//:all")
142151

143-
# https://github.com/bazelbuild/rules_jvm_external/pull/1079
144-
archive_override(
145-
module_name = "rules_jvm_external",
146-
integrity = "sha256-yS8Qes1PLbYbe10b1WSgl0Auqn/1Wlxg8O3wSr7a/Sg=",
147-
patch_strip = 1,
148-
patches = ["//java:rules_jvm_external_javadoc.patch"],
149-
strip_prefix = "rules_jvm_external-f572a26116c7ef71d8842dd056c2605782f7be8d",
150-
urls = ["https://github.com/bazelbuild/rules_jvm_external/archive/f572a26116c7ef71d8842dd056c2605782f7be8d.tar.gz"],
151-
)
152-
153152
java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")
154153
use_repo(
155154
java_toolchains,
@@ -185,22 +184,22 @@ maven.install(
185184
"dev.failsafe:failsafe:3.3.2",
186185
"io.grpc:grpc-context:1.71.0",
187186
"io.lettuce:lettuce-core:6.5.5.RELEASE",
188-
"io.netty:netty-buffer:4.2.0.Final",
189-
"io.netty:netty-codec-http:4.2.0.Final",
190-
"io.netty:netty-codec-http2:4.2.0.Final",
191-
"io.netty:netty-common:4.2.0.Final",
192-
"io.netty:netty-handler:4.2.0.Final",
193-
"io.netty:netty-handler-proxy:4.2.0.Final",
194-
"io.netty:netty-transport:4.2.0.Final",
195-
"io.opentelemetry:opentelemetry-api:1.48.0",
196-
"io.opentelemetry:opentelemetry-context:1.48.0",
197-
"io.opentelemetry:opentelemetry-exporter-logging:1.48.0",
198-
"io.opentelemetry:opentelemetry-sdk:1.48.0",
199-
"io.opentelemetry:opentelemetry-sdk-common:1.48.0",
200-
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.48.0",
201-
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.48.0",
202-
"io.opentelemetry:opentelemetry-sdk-testing:1.48.0",
203-
"io.opentelemetry:opentelemetry-sdk-trace:1.48.0",
187+
"io.netty:netty-buffer",
188+
"io.netty:netty-codec-http",
189+
"io.netty:netty-codec-http2",
190+
"io.netty:netty-common",
191+
"io.netty:netty-handler",
192+
"io.netty:netty-handler-proxy",
193+
"io.netty:netty-transport",
194+
"io.opentelemetry:opentelemetry-api",
195+
"io.opentelemetry:opentelemetry-context",
196+
"io.opentelemetry:opentelemetry-exporter-logging",
197+
"io.opentelemetry:opentelemetry-sdk",
198+
"io.opentelemetry:opentelemetry-sdk-common",
199+
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure",
200+
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi",
201+
"io.opentelemetry:opentelemetry-sdk-testing",
202+
"io.opentelemetry:opentelemetry-sdk-trace",
204203
"it.ozimov:embedded-redis:0.7.3",
205204
"net.bytebuddy:byte-buddy:1.17.5",
206205
"org.htmlunit:htmlunit-core-js:4.11.0",
@@ -211,13 +210,13 @@ maven.install(
211210
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
212211
"org.hsqldb:hsqldb:2.7.4",
213212
"org.jspecify:jspecify:1.0.0",
214-
"org.junit.jupiter:junit-jupiter-api:5.12.1",
215-
"org.junit.jupiter:junit-jupiter-engine:5.12.1",
216-
"org.junit.jupiter:junit-jupiter-params:5.12.1",
217-
"org.junit.platform:junit-platform-launcher:1.12.1",
218-
"org.junit.platform:junit-platform-reporting:1.12.1",
219-
"org.junit.platform:junit-platform-commons:1.12.1",
220-
"org.junit.platform:junit-platform-engine:1.12.1",
213+
"org.junit.jupiter:junit-jupiter-api",
214+
"org.junit.jupiter:junit-jupiter-engine",
215+
"org.junit.jupiter:junit-jupiter-params",
216+
"org.junit.platform:junit-platform-launcher",
217+
"org.junit.platform:junit-platform-reporting",
218+
"org.junit.platform:junit-platform-commons",
219+
"org.junit.platform:junit-platform-engine",
221220
"org.mockito:mockito-core:5.16.1",
222221
"org.redisson:redisson:3.45.1",
223222
"org.slf4j:slf4j-api:2.0.17",

0 commit comments

Comments
 (0)