Skip to content

Commit ff7fa52

Browse files
shs96cshs96c
authored
[bazel] Bump rules_jvm_external to 6.6 and use the maven resolver (#14829)
By using the maven resolver, we can make use of BOMs, which mean less duplication of version numbers within the `install` tag.
1 parent 5e3d04f commit ff7fa52

File tree

2 files changed

+65
-71
lines changed

2 files changed

+65
-71
lines changed

‎MODULE.bazel‎

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True)
1919

2020
bazel_dep(name = "rules_dotnet", version = "0.16.1")
2121
bazel_dep(name = "rules_java", version = "7.11.1")
22-
bazel_dep(name = "rules_jvm_external", version = "6.3")
22+
bazel_dep(name = "rules_jvm_external", version = "6.6")
2323
bazel_dep(name = "rules_nodejs", version = "6.3.0")
2424
bazel_dep(name = "rules_oci", version = "1.7.6")
2525
bazel_dep(name = "rules_pkg", version = "0.10.1")
@@ -182,23 +182,23 @@ maven.install(
182182
"dev.failsafe:failsafe:3.3.2",
183183
"io.grpc:grpc-context:1.68.1",
184184
"io.lettuce:lettuce-core:6.5.0.RELEASE",
185-
"io.netty:netty-buffer:4.1.115.Final",
186-
"io.netty:netty-codec-http:4.1.115.Final",
187-
"io.netty:netty-codec-http2:4.1.115.Final",
188-
"io.netty:netty-common:4.1.115.Final",
189-
"io.netty:netty-handler:4.1.115.Final",
190-
"io.netty:netty-handler-proxy:4.1.115.Final",
191-
"io.netty:netty-transport:4.1.115.Final",
192-
"io.opentelemetry:opentelemetry-api:1.44.1",
193-
"io.opentelemetry:opentelemetry-context:1.44.1",
194-
"io.opentelemetry:opentelemetry-exporter-logging:1.44.1",
195-
"io.opentelemetry:opentelemetry-sdk:1.44.1",
196-
"io.opentelemetry:opentelemetry-sdk-common:1.44.1",
197-
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.44.1",
198-
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.44.1",
199-
"io.opentelemetry:opentelemetry-sdk-testing:1.44.1",
200-
"io.opentelemetry:opentelemetry-sdk-trace:1.44.1",
201-
"io.opentelemetry.semconv:opentelemetry-semconv:1.25.0-alpha",
185+
"io.netty:netty-buffer",
186+
"io.netty:netty-codec-http",
187+
"io.netty:netty-codec-http2",
188+
"io.netty:netty-common",
189+
"io.netty:netty-handler",
190+
"io.netty:netty-handler-proxy",
191+
"io.netty:netty-transport",
192+
"io.opentelemetry:opentelemetry-api",
193+
"io.opentelemetry:opentelemetry-context",
194+
"io.opentelemetry:opentelemetry-exporter-logging",
195+
"io.opentelemetry:opentelemetry-sdk",
196+
"io.opentelemetry:opentelemetry-sdk-common",
197+
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure",
198+
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi",
199+
"io.opentelemetry:opentelemetry-sdk-testing",
200+
"io.opentelemetry:opentelemetry-sdk-trace",
201+
"io.opentelemetry.semconv:opentelemetry-semconv:1.28.0-alpha",
202202
"it.ozimov:embedded-redis:0.7.3",
203203
"net.bytebuddy:byte-buddy:1.15.10",
204204
"org.htmlunit:htmlunit-core-js:4.6.0",
@@ -209,20 +209,25 @@ maven.install(
209209
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
210210
"org.hsqldb:hsqldb:2.7.4",
211211
"org.jspecify:jspecify:1.0.0",
212-
"org.junit.jupiter:junit-jupiter-api:5.11.3",
213-
"org.junit.jupiter:junit-jupiter-engine:5.11.3",
214-
"org.junit.jupiter:junit-jupiter-params:5.11.3",
215-
"org.junit.platform:junit-platform-launcher:1.11.3",
216-
"org.junit.platform:junit-platform-reporting:1.11.3",
217-
"org.junit.platform:junit-platform-commons:1.11.3",
218-
"org.junit.platform:junit-platform-engine:1.11.3",
212+
"org.junit.jupiter:junit-jupiter-api",
213+
"org.junit.jupiter:junit-jupiter-engine",
214+
"org.junit.jupiter:junit-jupiter-params",
215+
"org.junit.platform:junit-platform-launcher",
216+
"org.junit.platform:junit-platform-reporting",
217+
"org.junit.platform:junit-platform-commons",
218+
"org.junit.platform:junit-platform-engine",
219219
"org.mockito:mockito-core:5.14.2",
220220
"org.redisson:redisson:3.39.0",
221221
"org.slf4j:slf4j-api:2.0.16",
222222
"org.slf4j:slf4j-jdk14:2.0.16",
223223
"org.tomlj:tomlj:1.1.1",
224224
"org.zeromq:jeromq:0.6.0",
225225
],
226+
boms = [
227+
"io.opentelemetry:opentelemetry-bom:1.44.1",
228+
"io.netty:netty-bom:4.1.115.Final",
229+
"org.junit:junit-bom:5.11.3",
230+
],
226231
excluded_artifacts = [
227232
"org.hamcrest:hamcrest-all", # Replaced by hamcrest 2
228233
"org.hamcrest:hamcrest-core",
@@ -235,6 +240,7 @@ maven.install(
235240
repositories = [
236241
"https://repo1.maven.org/maven2",
237242
],
243+
resolver = "maven",
238244
strict_visibility = True,
239245
)
240246
use_repo(maven, "maven", "unpinned_maven")

‎java/maven_install.json‎

Lines changed: 34 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": 329453186,
4-
"__RESOLVED_ARTIFACTS_HASH": -9148858,
5-
"conflict_resolution": {
6-
"com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.11.0",
7-
"com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.28.0",
8-
"com.google.guava:guava:31.1-jre": "com.google.guava:guava:33.3.1-jre",
9-
"com.google.j2objc:j2objc-annotations:1.3": "com.google.j2objc:j2objc-annotations:3.0.0",
10-
"org.mockito:mockito-core:4.3.1": "org.mockito:mockito-core:5.14.2"
11-
},
3+
"__INPUT_ARTIFACTS_HASH": -756051712,
4+
"__RESOLVED_ARTIFACTS_HASH": -748733705,
125
"artifacts": {
136
"com.beust:jcommander": {
147
"shasums": {
@@ -138,10 +131,10 @@
138131
},
139132
"com.google.errorprone:error_prone_annotations": {
140133
"shasums": {
141-
"jar": "f3fc8a3a0a4020706a373b00e7f57c2512dd26d1f83d28c7d38768f8682b231e",
142-
"sources": "2936e9b315d790d8a6364f0574bcec9c8b2d78688b317e1765c4a16f9ef80632"
134+
"jar": "357cd6cfb067c969226c442451502aee13800a24e950fdfde77bcdb4565a668d",
135+
"sources": "7ce688ed1582a67097228c050192b7cfd00479a81d2b921f7cd5116994f1402d"
143136
},
144-
"version": "2.28.0"
137+
"version": "2.3.2"
145138
},
146139
"com.google.googlejavaformat:google-java-format": {
147140
"shasums": {
@@ -173,17 +166,16 @@
173166
},
174167
"com.google.guava:listenablefuture": {
175168
"shasums": {
176-
"jar": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99",
177-
"sources": null
169+
"jar": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99"
178170
},
179171
"version": "9999.0-empty-to-avoid-conflict-with-guava"
180172
},
181173
"com.google.j2objc:j2objc-annotations": {
182174
"shasums": {
183-
"jar": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64",
184-
"sources": "bd60019a0423c3a025ef6ab24fe0761f5f45ffb48a8cca74a01b678de1105d38"
175+
"jar": "21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b",
176+
"sources": "ba4df669fec153fa4cd0ef8d02c6d3ef0702b7ac4cabe080facf3b6e490bb972"
185177
},
186-
"version": "3.0.0"
178+
"version": "1.3"
187179
},
188180
"com.google.truth:truth": {
189181
"shasums": {
@@ -355,10 +347,10 @@
355347
},
356348
"io.opentelemetry.semconv:opentelemetry-semconv": {
357349
"shasums": {
358-
"jar": "745a86a75ecb5e03f464f05ea2dc76e0f04d07273c5509fa74f393bff9b222b7",
359-
"sources": "58a375cd34943d8dd4f64233b19fee6a5094e3ae533f77d527e75c276626d49e"
350+
"jar": "e8ab86e93cef09e421a6213f4cf18421fcc6e1f9cf0ab94b9a31ed4460ddf553",
351+
"sources": "b0588ae0617071c30451fe0f4916b2cde7aa8d24b542ee696a7bf59f7d7f46a8"
360352
},
361-
"version": "1.25.0-alpha"
353+
"version": "1.28.0-alpha"
362354
},
363355
"io.opentelemetry:opentelemetry-api": {
364356
"shasums": {
@@ -446,10 +438,10 @@
446438
},
447439
"io.projectreactor:reactor-core": {
448440
"shasums": {
449-
"jar": "44f055fbd033b6c976c53fb2e04b59027e79fb2312c37d2eaa54c77ea1ea80fe",
450-
"sources": "fee913ed4e41d79ce1cf7db4526d23e848719083b65a4041dea590f91b1ef2f6"
441+
"jar": "6e235f0be9732ebd6a42c585dfd53274065978bfbc28d721d7ecf487fde27b52",
442+
"sources": "57e48b121636923ec362aa337556150edc8bc29ccba686c21d36016e05207b23"
451443
},
452-
"version": "3.6.6"
444+
"version": "3.6.2"
453445
},
454446
"io.reactivex.rxjava3:rxjava": {
455447
"shasums": {
@@ -530,10 +522,10 @@
530522
},
531523
"org.apache.commons:commons-lang3": {
532524
"shasums": {
533-
"jar": "7b96bf3ee68949abb5bc465559ac270e0551596fa34523fddf890ec418dde13c",
534-
"sources": "ab3b86afb898f1026dbe43aaf71e9c1d719ec52d6e41887b362d86777c299b6f"
525+
"jar": "d919d904486c037f8d193412da0c92e22a9fa24230b9d67a57855c5c31c7e94e",
526+
"sources": "325a4551eee7d99f7616aa05b00ee3ca9d0cdc8face1b252a9864f2d945c58b3"
535527
},
536-
"version": "3.14.0"
528+
"version": "3.12.0"
537529
},
538530
"org.apache.commons:commons-text": {
539531
"shasums": {
@@ -614,10 +606,10 @@
614606
},
615607
"org.checkerframework:checker-qual": {
616608
"shasums": {
617-
"jar": "3fbc2e98f05854c3df16df9abaa955b91b15b3ecac33623208ed6424640ef0f6",
618-
"sources": "d6bdee58964cd05aabfca4e44947d3cbdada6bf617ed618b62b3b0d5a21de339"
609+
"jar": "ab0468b1ba35bb2ae45f61a60dc4960bd887660ab8f05113a662a7e675eae776",
610+
"sources": "cbe362ef1dfacb927e0e4bf78a97b1b92ba50ca38b4406ae58b8c11e41ef2075"
619611
},
620-
"version": "3.43.0"
612+
"version": "3.9.1"
621613
},
622614
"org.dom4j:dom4j": {
623615
"shasums": {
@@ -733,10 +725,10 @@
733725
},
734726
"org.ow2.asm:asm": {
735727
"shasums": {
736-
"jar": "adf46d5e34940bdf148ecdd26a9ee8eea94496a72034ff7141066b3eea5c4e9d",
737-
"sources": "11dfd88129204be18c0f592f8e066d0c07d8a6bc001f6c7b2cce5ff0588d5d71"
728+
"jar": "0df97574914aee92fd349d0cb4e00f3345d45b2c239e0bb50f0a90ead47888e0",
729+
"sources": "829bc5eb0ccd705a7c8afbf7cdc4b7e9a9f733d3a1a954b9afffd99c8e063366"
738730
},
739-
"version": "9.7"
731+
"version": "9.0"
740732
},
741733
"org.ow2.asm:asm-analysis": {
742734
"shasums": {
@@ -1042,9 +1034,6 @@
10421034
"io.opentelemetry:opentelemetry-api-incubator",
10431035
"io.opentelemetry:opentelemetry-sdk-common"
10441036
],
1045-
"io.projectreactor:reactor-core": [
1046-
"org.reactivestreams:reactive-streams"
1047-
],
10481037
"io.reactivex.rxjava3:rxjava": [
10491038
"org.reactivestreams:reactive-streams"
10501039
],
@@ -1182,9 +1171,6 @@
11821171
"eu.neilalexander:jnacl"
11831172
]
11841173
},
1185-
"skipped": [
1186-
"com.google.guava:listenablefuture:jar:sources"
1187-
],
11881174
"packages": {
11891175
"com.beust:jcommander": [
11901176
"com.beust.ah",
@@ -1957,9 +1943,6 @@
19571943
"net.bytebuddy.agent",
19581944
"net.bytebuddy.agent.utility.nullability"
19591945
],
1960-
"net.bytebuddy:byte-buddy:jar:sources": [
1961-
"net.bytebuddy.build"
1962-
],
19631946
"net.sf.saxon:Saxon-HE": [
19641947
"net.sf.saxon",
19651948
"net.sf.saxon.dom",
@@ -2063,8 +2046,7 @@
20632046
"org.apache.commons.lang3.text",
20642047
"org.apache.commons.lang3.text.translate",
20652048
"org.apache.commons.lang3.time",
2066-
"org.apache.commons.lang3.tuple",
2067-
"org.apache.commons.lang3.util"
2049+
"org.apache.commons.lang3.tuple"
20682050
],
20692051
"org.apache.commons:commons-text": [
20702052
"org.apache.commons.text",
@@ -2551,32 +2533,38 @@
25512533
"org.checkerframework.checker.calledmethods.qual",
25522534
"org.checkerframework.checker.compilermsgs.qual",
25532535
"org.checkerframework.checker.fenum.qual",
2536+
"org.checkerframework.checker.formatter",
25542537
"org.checkerframework.checker.formatter.qual",
25552538
"org.checkerframework.checker.guieffect.qual",
25562539
"org.checkerframework.checker.i18n.qual",
2540+
"org.checkerframework.checker.i18nformatter",
25572541
"org.checkerframework.checker.i18nformatter.qual",
25582542
"org.checkerframework.checker.index.qual",
25592543
"org.checkerframework.checker.initialization.qual",
25602544
"org.checkerframework.checker.interning.qual",
25612545
"org.checkerframework.checker.lock.qual",
2562-
"org.checkerframework.checker.mustcall.qual",
2546+
"org.checkerframework.checker.nullness",
25632547
"org.checkerframework.checker.nullness.qual",
25642548
"org.checkerframework.checker.optional.qual",
25652549
"org.checkerframework.checker.propkey.qual",
2550+
"org.checkerframework.checker.regex",
25662551
"org.checkerframework.checker.regex.qual",
25672552
"org.checkerframework.checker.signature.qual",
2553+
"org.checkerframework.checker.signedness",
25682554
"org.checkerframework.checker.signedness.qual",
25692555
"org.checkerframework.checker.tainting.qual",
2556+
"org.checkerframework.checker.units",
25702557
"org.checkerframework.checker.units.qual",
25712558
"org.checkerframework.common.aliasing.qual",
25722559
"org.checkerframework.common.initializedfields.qual",
25732560
"org.checkerframework.common.reflection.qual",
25742561
"org.checkerframework.common.returnsreceiver.qual",
25752562
"org.checkerframework.common.subtyping.qual",
2576-
"org.checkerframework.common.util.count.report.qual",
2563+
"org.checkerframework.common.util.report.qual",
25772564
"org.checkerframework.common.value.qual",
25782565
"org.checkerframework.dataflow.qual",
2579-
"org.checkerframework.framework.qual"
2566+
"org.checkerframework.framework.qual",
2567+
"org.checkerframework.framework.util"
25802568
],
25812569
"org.dom4j:dom4j": [
25822570
"org.dom4j",

0 commit comments

Comments
 (0)