Fix maven deps after 5e63f2d

The changes to the Maven deps specification got lost in a merge conflict resolution of 5e63f2d. Closes #22145. PiperOrigin-RevId: 629135777 Change-Id: I15e58ead4148b2e2ca677342aafbfe2694c78b1d
bazelbuild · Apr 29, 2024 · d0af714 · d0af714
1 parent 3a94994
commit d0af714
Show file tree

Hide file tree

Showing 3 changed files with 279 additions and 90 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -76,19 +76,20 @@ single_version_override(
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.install(
     artifacts = [
+        # keep sorted
         "com.beust:jcommander:1.82",
         "com.github.ben-manes.caffeine:caffeine:3.0.5",
         "com.github.kevinstern:software-and-algorithms:1.0",
         "com.github.stephenc.jcip:jcip-annotations:1.0-1",
-        "com.google.api-client:google-api-client-gson:1.35.2",
         "com.google.api-client:google-api-client:1.35.2",
+        "com.google.api-client:google-api-client-gson:1.35.2",
         "com.google.auth:google-auth-library-credentials:1.6.0",
         "com.google.auth:google-auth-library-oauth2-http:1.6.0",
-        "com.google.auto.service:auto-service-annotations:1.0.1",
+        "com.google.auto:auto-common:1.2.1",
         "com.google.auto.service:auto-service:1.0",
-        "com.google.auto.value:auto-value-annotations:1.9",
+        "com.google.auto.service:auto-service-annotations:1.0.1",
         "com.google.auto.value:auto-value:1.8.2",
-        "com.google.auto:auto-common:1.2.1",
+        "com.google.auto.value:auto-value-annotations:1.9",
         "com.google.code.findbugs:jsr305:3.0.2",
         "com.google.code.gson:gson:2.9.0",
         "com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0",
@@ -97,18 +98,18 @@ maven.install(
         "com.google.errorprone:error_prone_check_api:2.23.0",
         "com.google.errorprone:error_prone_core:2.23.0",
         "com.google.errorprone:error_prone_type_annotations:2.23.0",
-        "com.google.flogger:flogger-system-backend:0.5.1",
         "com.google.flogger:flogger:0.5.1",
+        "com.google.flogger:flogger-system-backend:0.5.1",
         "com.google.flogger:google-extensions:0.5.1",
         "com.google.guava:failureaccess:1.0.1",
         "com.google.guava:guava:33.0.0-jre",
-        "com.google.http-client:google-http-client-gson:1.42.0",
         "com.google.http-client:google-http-client:1.42.0",
+        "com.google.http-client:google-http-client-gson:1.42.0",
         "com.google.j2objc:j2objc-annotations:1.3",
         "com.google.turbine:turbine:0.5.0",
         "com.ryanharter.auto.value:auto-value-gson-extension:1.3.1",
-        "com.ryanharter.auto.value:auto-value-gson-runtime:1.3.1",
         "com.ryanharter.auto.value:auto-value-gson-factory:1.3.1",
+        "com.ryanharter.auto.value:auto-value-gson-runtime:1.3.1",
         "com.squareup:javapoet:1.12.0",
         "commons-collections:commons-collections:3.2.2",
         "commons-lang:commons-lang:2.6",
@@ -118,24 +119,25 @@ maven.install(
         "io.grpc:grpc-context:1.48.1",
         "io.grpc:grpc-core:1.48.1",
         "io.grpc:grpc-netty:1.48.1",
-        "io.grpc:grpc-protobuf-lite:1.48.1",
         "io.grpc:grpc-protobuf:1.48.1",
+        "io.grpc:grpc-protobuf-lite:1.48.1",
         "io.grpc:grpc-stub:1.48.1",
         "io.netty:netty-buffer:4.1.93.Final",
-        "io.netty:netty-codec-http2:4.1.93.Final",
-        "io.netty:netty-codec-http:4.1.93.Final",
         "io.netty:netty-codec:4.1.93.Final",
+        "io.netty:netty-codec-http:4.1.93.Final",
+        "io.netty:netty-codec-http2:4.1.93.Final",
         "io.netty:netty-common:4.1.93.Final",
-        "io.netty:netty-handler-proxy:4.1.93.Final",
         "io.netty:netty-handler:4.1.93.Final",
-        "io.netty:netty-resolver-dns:4.1.93.Final",
+        "io.netty:netty-handler-proxy:4.1.93.Final",
         "io.netty:netty-resolver:4.1.93.Final",
+        "io.netty:netty-resolver-dns:4.1.93.Final",
         "io.netty:netty-tcnative-boringssl-static:jar:linux-aarch_64:2.0.56.Final",
         "io.netty:netty-tcnative-boringssl-static:jar:linux-x86_64:2.0.56.Final",
         "io.netty:netty-tcnative-boringssl-static:jar:osx-aarch_64:2.0.56.Final",
         "io.netty:netty-tcnative-boringssl-static:jar:osx-x86_64:2.0.56.Final",
         "io.netty:netty-tcnative-boringssl-static:jar:windows-x86_64:2.0.56.Final",
         "io.netty:netty-tcnative-classes:2.0.56.Final",
+        "io.netty:netty-transport:4.1.93.Final",
         "io.netty:netty-transport-classes-epoll:4.1.93.Final",
         "io.netty:netty-transport-classes-kqueue:4.1.93.Final",
         "io.netty:netty-transport-native-epoll:jar:linux-aarch_64:4.1.93.Final",
@@ -147,24 +149,25 @@ maven.install(
         "io.netty:netty-transport-native-unix-common:jar:linux-x86_64:4.1.93.Final",
         "io.netty:netty-transport-native-unix-common:jar:osx-aarch_64:4.1.93.Final",
         "io.netty:netty-transport-native-unix-common:jar:osx-x86_64:4.1.93.Final",
-        "io.netty:netty-transport:4.1.93.Final",
         "io.reactivex.rxjava3:rxjava:3.1.2",
         "it.unimi.dsi:fastutil:7.2.1",
         "javax.activation:javax.activation-api:1.2.0",
         "javax.annotation:javax.annotation-api:1.3.2",
         "javax.inject:javax.inject:1",
-        "net.bytebuddy:byte-buddy-agent:1.14.5",
         "net.bytebuddy:byte-buddy:1.14.5",
+        "net.bytebuddy:byte-buddy-agent:1.14.5",
         "org.apache.commons:commons-compress:1.20",
         "org.apache.commons:commons-pool2:2.8.0",
         "org.apache.tomcat:tomcat-annotations-api:8.0.5",
         "org.apache.velocity:velocity:1.7",
         "org.checkerframework:checker-qual:3.19.0",
+        "org.openjdk.jmh:jmh-core:1.37",
+        "org.openjdk.jmh:jmh-generator-annprocess:1.37",
+        "org.ow2.asm:asm:9.2",
         "org.ow2.asm:asm-analysis:9.2",
         "org.ow2.asm:asm-commons:9.2",
         "org.ow2.asm:asm-tree:9.2",
         "org.ow2.asm:asm-util:9.2",
-        "org.ow2.asm:asm:9.2",
         "org.pcollections:pcollections:3.1.4",
         "org.threeten:threeten-extra:1.5.0",
         "org.tukaani:xz:1.9",