[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.
SeleniumHQ · Nov 29, 2024 · ff7fa52 · ff7fa52
1 parent 5e3d04f
commit ff7fa52
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 71 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -19,7 +19,7 @@ bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True)
 
 bazel_dep(name = "rules_dotnet", version = "0.16.1")
 bazel_dep(name = "rules_java", version = "7.11.1")
-bazel_dep(name = "rules_jvm_external", version = "6.3")
+bazel_dep(name = "rules_jvm_external", version = "6.6")
 bazel_dep(name = "rules_nodejs", version = "6.3.0")
 bazel_dep(name = "rules_oci", version = "1.7.6")
 bazel_dep(name = "rules_pkg", version = "0.10.1")
@@ -182,23 +182,23 @@ maven.install(
         "dev.failsafe:failsafe:3.3.2",
         "io.grpc:grpc-context:1.68.1",
         "io.lettuce:lettuce-core:6.5.0.RELEASE",
-        "io.netty:netty-buffer:4.1.115.Final",
-        "io.netty:netty-codec-http:4.1.115.Final",
-        "io.netty:netty-codec-http2:4.1.115.Final",
-        "io.netty:netty-common:4.1.115.Final",
-        "io.netty:netty-handler:4.1.115.Final",
-        "io.netty:netty-handler-proxy:4.1.115.Final",
-        "io.netty:netty-transport:4.1.115.Final",
-        "io.opentelemetry:opentelemetry-api:1.44.1",
-        "io.opentelemetry:opentelemetry-context:1.44.1",
-        "io.opentelemetry:opentelemetry-exporter-logging:1.44.1",
-        "io.opentelemetry:opentelemetry-sdk:1.44.1",
-        "io.opentelemetry:opentelemetry-sdk-common:1.44.1",
-        "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.44.1",
-        "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.44.1",
-        "io.opentelemetry:opentelemetry-sdk-testing:1.44.1",
-        "io.opentelemetry:opentelemetry-sdk-trace:1.44.1",
-        "io.opentelemetry.semconv:opentelemetry-semconv:1.25.0-alpha",
+        "io.netty:netty-buffer",
+        "io.netty:netty-codec-http",
+        "io.netty:netty-codec-http2",
+        "io.netty:netty-common",
+        "io.netty:netty-handler",
+        "io.netty:netty-handler-proxy",
+        "io.netty:netty-transport",
+        "io.opentelemetry:opentelemetry-api",
+        "io.opentelemetry:opentelemetry-context",
+        "io.opentelemetry:opentelemetry-exporter-logging",
+        "io.opentelemetry:opentelemetry-sdk",
+        "io.opentelemetry:opentelemetry-sdk-common",
+        "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure",
+        "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi",
+        "io.opentelemetry:opentelemetry-sdk-testing",
+        "io.opentelemetry:opentelemetry-sdk-trace",
+        "io.opentelemetry.semconv:opentelemetry-semconv:1.28.0-alpha",
         "it.ozimov:embedded-redis:0.7.3",
         "net.bytebuddy:byte-buddy:1.15.10",
         "org.htmlunit:htmlunit-core-js:4.6.0",
@@ -209,20 +209,25 @@ maven.install(
         "org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
         "org.hsqldb:hsqldb:2.7.4",
         "org.jspecify:jspecify:1.0.0",
-        "org.junit.jupiter:junit-jupiter-api:5.11.3",
-        "org.junit.jupiter:junit-jupiter-engine:5.11.3",
-        "org.junit.jupiter:junit-jupiter-params:5.11.3",
-        "org.junit.platform:junit-platform-launcher:1.11.3",
-        "org.junit.platform:junit-platform-reporting:1.11.3",
-        "org.junit.platform:junit-platform-commons:1.11.3",
-        "org.junit.platform:junit-platform-engine:1.11.3",
+        "org.junit.jupiter:junit-jupiter-api",
+        "org.junit.jupiter:junit-jupiter-engine",
+        "org.junit.jupiter:junit-jupiter-params",
+        "org.junit.platform:junit-platform-launcher",
+        "org.junit.platform:junit-platform-reporting",
+        "org.junit.platform:junit-platform-commons",
+        "org.junit.platform:junit-platform-engine",
         "org.mockito:mockito-core:5.14.2",
         "org.redisson:redisson:3.39.0",
         "org.slf4j:slf4j-api:2.0.16",
         "org.slf4j:slf4j-jdk14:2.0.16",
         "org.tomlj:tomlj:1.1.1",
         "org.zeromq:jeromq:0.6.0",
     ],
+    boms = [
+        "io.opentelemetry:opentelemetry-bom:1.44.1",
+        "io.netty:netty-bom:4.1.115.Final",
+        "org.junit:junit-bom:5.11.3",
+    ],
     excluded_artifacts = [
         "org.hamcrest:hamcrest-all",  # Replaced by hamcrest 2
         "org.hamcrest:hamcrest-core",
@@ -235,6 +240,7 @@ maven.install(
     repositories = [
         "https://repo1.maven.org/maven2",
     ],
+    resolver = "maven",
     strict_visibility = True,
 )
 use_repo(maven, "maven", "unpinned_maven")

diff --git a/java/maven_install.json b/java/maven_install.json
@@ -1,14 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": 329453186,
-  "__RESOLVED_ARTIFACTS_HASH": -9148858,
-  "conflict_resolution": {
-    "com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.11.0",
-    "com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.28.0",
-    "com.google.guava:guava:31.1-jre": "com.google.guava:guava:33.3.1-jre",
-    "com.google.j2objc:j2objc-annotations:1.3": "com.google.j2objc:j2objc-annotations:3.0.0",
-    "org.mockito:mockito-core:4.3.1": "org.mockito:mockito-core:5.14.2"
-  },
+  "__INPUT_ARTIFACTS_HASH": -756051712,
+  "__RESOLVED_ARTIFACTS_HASH": -748733705,
   "artifacts": {
     "com.beust:jcommander": {
       "shasums": {
@@ -138,10 +131,10 @@
     },
     "com.google.errorprone:error_prone_annotations": {
       "shasums": {
-        "jar": "f3fc8a3a0a4020706a373b00e7f57c2512dd26d1f83d28c7d38768f8682b231e",
-        "sources": "2936e9b315d790d8a6364f0574bcec9c8b2d78688b317e1765c4a16f9ef80632"
+        "jar": "357cd6cfb067c969226c442451502aee13800a24e950fdfde77bcdb4565a668d",
+        "sources": "7ce688ed1582a67097228c050192b7cfd00479a81d2b921f7cd5116994f1402d"
       },
-      "version": "2.28.0"
+      "version": "2.3.2"
     },
     "com.google.googlejavaformat:google-java-format": {
       "shasums": {
@@ -173,17 +166,16 @@
     },
     "com.google.guava:listenablefuture": {
       "shasums": {
-        "jar": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99",
-        "sources": null
+        "jar": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99"
       },
       "version": "9999.0-empty-to-avoid-conflict-with-guava"
     },
     "com.google.j2objc:j2objc-annotations": {
       "shasums": {
-        "jar": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64",
-        "sources": "bd60019a0423c3a025ef6ab24fe0761f5f45ffb48a8cca74a01b678de1105d38"
+        "jar": "21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b",
+        "sources": "ba4df669fec153fa4cd0ef8d02c6d3ef0702b7ac4cabe080facf3b6e490bb972"
       },
-      "version": "3.0.0"
+      "version": "1.3"
     },
     "com.google.truth:truth": {
       "shasums": {
@@ -355,10 +347,10 @@
     },
     "io.opentelemetry.semconv:opentelemetry-semconv": {
       "shasums": {
-        "jar": "745a86a75ecb5e03f464f05ea2dc76e0f04d07273c5509fa74f393bff9b222b7",
-        "sources": "58a375cd34943d8dd4f64233b19fee6a5094e3ae533f77d527e75c276626d49e"
+        "jar": "e8ab86e93cef09e421a6213f4cf18421fcc6e1f9cf0ab94b9a31ed4460ddf553",
+        "sources": "b0588ae0617071c30451fe0f4916b2cde7aa8d24b542ee696a7bf59f7d7f46a8"
       },
-      "version": "1.25.0-alpha"
+      "version": "1.28.0-alpha"
     },
     "io.opentelemetry:opentelemetry-api": {
       "shasums": {
@@ -446,10 +438,10 @@
     },
     "io.projectreactor:reactor-core": {
       "shasums": {
-        "jar": "44f055fbd033b6c976c53fb2e04b59027e79fb2312c37d2eaa54c77ea1ea80fe",
-        "sources": "fee913ed4e41d79ce1cf7db4526d23e848719083b65a4041dea590f91b1ef2f6"
+        "jar": "6e235f0be9732ebd6a42c585dfd53274065978bfbc28d721d7ecf487fde27b52",
+        "sources": "57e48b121636923ec362aa337556150edc8bc29ccba686c21d36016e05207b23"
       },
-      "version": "3.6.6"
+      "version": "3.6.2"
     },
     "io.reactivex.rxjava3:rxjava": {
       "shasums": {
@@ -530,10 +522,10 @@
     },
     "org.apache.commons:commons-lang3": {
       "shasums": {
-        "jar": "7b96bf3ee68949abb5bc465559ac270e0551596fa34523fddf890ec418dde13c",
-        "sources": "ab3b86afb898f1026dbe43aaf71e9c1d719ec52d6e41887b362d86777c299b6f"
+        "jar": "d919d904486c037f8d193412da0c92e22a9fa24230b9d67a57855c5c31c7e94e",
+        "sources": "325a4551eee7d99f7616aa05b00ee3ca9d0cdc8face1b252a9864f2d945c58b3"
       },
-      "version": "3.14.0"
+      "version": "3.12.0"
     },
     "org.apache.commons:commons-text": {
       "shasums": {
@@ -614,10 +606,10 @@
     },
     "org.checkerframework:checker-qual": {
       "shasums": {
-        "jar": "3fbc2e98f05854c3df16df9abaa955b91b15b3ecac33623208ed6424640ef0f6",
-        "sources": "d6bdee58964cd05aabfca4e44947d3cbdada6bf617ed618b62b3b0d5a21de339"
+        "jar": "ab0468b1ba35bb2ae45f61a60dc4960bd887660ab8f05113a662a7e675eae776",
+        "sources": "cbe362ef1dfacb927e0e4bf78a97b1b92ba50ca38b4406ae58b8c11e41ef2075"
       },
-      "version": "3.43.0"
+      "version": "3.9.1"
     },
     "org.dom4j:dom4j": {
       "shasums": {
@@ -733,10 +725,10 @@
     },
     "org.ow2.asm:asm": {
       "shasums": {
-        "jar": "adf46d5e34940bdf148ecdd26a9ee8eea94496a72034ff7141066b3eea5c4e9d",
-        "sources": "11dfd88129204be18c0f592f8e066d0c07d8a6bc001f6c7b2cce5ff0588d5d71"
+        "jar": "0df97574914aee92fd349d0cb4e00f3345d45b2c239e0bb50f0a90ead47888e0",
+        "sources": "829bc5eb0ccd705a7c8afbf7cdc4b7e9a9f733d3a1a954b9afffd99c8e063366"
       },
-      "version": "9.7"
+      "version": "9.0"
     },
     "org.ow2.asm:asm-analysis": {
       "shasums": {
@@ -1042,9 +1034,6 @@
       "io.opentelemetry:opentelemetry-api-incubator",
       "io.opentelemetry:opentelemetry-sdk-common"
     ],
-    "io.projectreactor:reactor-core": [
-      "org.reactivestreams:reactive-streams"
-    ],
     "io.reactivex.rxjava3:rxjava": [
       "org.reactivestreams:reactive-streams"
     ],
@@ -1182,9 +1171,6 @@
       "eu.neilalexander:jnacl"
     ]
   },
-  "skipped": [
-    "com.google.guava:listenablefuture:jar:sources"
-  ],
   "packages": {
     "com.beust:jcommander": [
       "com.beust.ah",
@@ -1957,9 +1943,6 @@
       "net.bytebuddy.agent",
       "net.bytebuddy.agent.utility.nullability"
     ],
-    "net.bytebuddy:byte-buddy:jar:sources": [
-      "net.bytebuddy.build"
-    ],
     "net.sf.saxon:Saxon-HE": [
       "net.sf.saxon",
       "net.sf.saxon.dom",
@@ -2063,8 +2046,7 @@
       "org.apache.commons.lang3.text",
       "org.apache.commons.lang3.text.translate",
       "org.apache.commons.lang3.time",
-      "org.apache.commons.lang3.tuple",
-      "org.apache.commons.lang3.util"
+      "org.apache.commons.lang3.tuple"
     ],
     "org.apache.commons:commons-text": [
       "org.apache.commons.text",
@@ -2551,32 +2533,38 @@
       "org.checkerframework.checker.calledmethods.qual",
       "org.checkerframework.checker.compilermsgs.qual",
       "org.checkerframework.checker.fenum.qual",
+      "org.checkerframework.checker.formatter",
       "org.checkerframework.checker.formatter.qual",
       "org.checkerframework.checker.guieffect.qual",
       "org.checkerframework.checker.i18n.qual",
+      "org.checkerframework.checker.i18nformatter",
       "org.checkerframework.checker.i18nformatter.qual",
       "org.checkerframework.checker.index.qual",
       "org.checkerframework.checker.initialization.qual",
       "org.checkerframework.checker.interning.qual",
       "org.checkerframework.checker.lock.qual",
-      "org.checkerframework.checker.mustcall.qual",
+      "org.checkerframework.checker.nullness",
       "org.checkerframework.checker.nullness.qual",
       "org.checkerframework.checker.optional.qual",
       "org.checkerframework.checker.propkey.qual",
+      "org.checkerframework.checker.regex",
       "org.checkerframework.checker.regex.qual",
       "org.checkerframework.checker.signature.qual",
+      "org.checkerframework.checker.signedness",
       "org.checkerframework.checker.signedness.qual",
       "org.checkerframework.checker.tainting.qual",
+      "org.checkerframework.checker.units",
       "org.checkerframework.checker.units.qual",
       "org.checkerframework.common.aliasing.qual",
       "org.checkerframework.common.initializedfields.qual",
       "org.checkerframework.common.reflection.qual",
       "org.checkerframework.common.returnsreceiver.qual",
       "org.checkerframework.common.subtyping.qual",
-      "org.checkerframework.common.util.count.report.qual",
+      "org.checkerframework.common.util.report.qual",
       "org.checkerframework.common.value.qual",
       "org.checkerframework.dataflow.qual",
-      "org.checkerframework.framework.qual"
+      "org.checkerframework.framework.qual",
+      "org.checkerframework.framework.util"
     ],
     "org.dom4j:dom4j": [
       "org.dom4j",