Update deps freezing script to work with bzlmod

.tar-exclude-from-file.conf

@@ -1,6 +1,5 @@
 bin
 docs
-frozen_deps_install.json
 maven_install.json
 pmd-ruleset.xml
 

BUILD.bazel

@@ -7,7 +7,7 @@ buildifier(
     visibility = ["//visibility:private"],
 )
 
-# gazelle:java_maven_install_file frozen_deps_install.json
+# gazelle:java_maven_install_file contrib_rules_jvm_deps_install.json
 # gazelle:prefix github.com/bazel-contrib/rules_jvm
 
 # gazelle:repository go_repository name=org_golang_x_tools_go_vcs importpath=golang.org/x/tools/go/vcs

README.md

@@ -514,7 +514,7 @@ dependencies are loaded using a call to `maven_install`, but we don't
 want to force users to remember to load our own dependencies for
 us. Instead, to add a new dependency to the project:
 
-1. Update `frozen_deps` in the `WORKSPACE` file
+1. Update `contrib_rules_jvm_deps` in the `MODULE.bazel` file
 2. Run `./tools/update-dependencies.sh`
 3. Commit the updated files.
 

WORKSPACE

@@ -40,76 +40,6 @@ load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_ARTIFACTS")
 load("@rules_jvm_external//:defs.bzl", "maven_install")
 load("//third_party:protobuf_version.bzl", "PROTOBUF_JAVA_VERSION")
 
-# This only exists to give us a target to use with `./tools/update-dependencies.sh`.
-# If you update this, then please re-run that script and commit the changes to repo.
-maven_install(
-    name = "frozen_deps",
-    artifacts = [
-        "com.google.code.findbugs:jsr305:3.0.2",
-        "com.google.errorprone:error_prone_annotations:2.11.0",
-        "com.google.guava:guava:30.1.1-jre",
-        "commons-cli:commons-cli:1.5.0",
-        "io.grpc:grpc-api:1.40.0",
-        "io.grpc:grpc-core:1.40.0",
-        "io.grpc:grpc-netty:1.40.0",
-        "io.grpc:grpc-services:1.40.0",
-        "io.grpc:grpc-stub:1.40.0",
-        "org.slf4j:slf4j-simple:1.7.32",
-        "com.google.googlejavaformat:google-java-format:1.15.0",
-
-        # These can be versioned independently of the versions in `repositories.bzl`
-        # so long as the version numbers are higher.
-        "org.junit.jupiter:junit-jupiter-engine:5.8.2",
-        "org.junit.jupiter:junit-jupiter-api:5.8.2",
-        "org.junit.platform:junit-platform-launcher:1.8.2",
-        "org.junit.platform:junit-platform-reporting:1.8.2",
-        "org.junit.vintage:junit-vintage-engine:5.8.2",
-
-        # Open Test Alliance for the JVM dep
-        "org.opentest4j:opentest4j:1.2.0",
-
-        # Checkstyle deps
-        "com.puppycrawl.tools:checkstyle:10.2",
-
-        # PMD deps
-        "net.sourceforge.pmd:pmd-dist:6.55.0",
-
-        # Spotbugs deps
-        # We don't want to force people to use 1.8-beta
-        # but we can't use the `maven` macros because
-        # we've not loaded rules yet. Fortunately, the
-        # expansion is easy :)
-        {
-            "group": "com.github.spotbugs",
-            "artifact": "spotbugs",
-            "version": "4.7.0",
-            "exclusions": [
-                {
-                    "group": "org.slf4j",
-                    "artifact": "slf4j-api",
-                },
-            ],
-        },
-        "org.slf4j:slf4j-api:1.7.32",
-        "org.slf4j:slf4j-jdk14:1.7.32",
-
-        # We explicitly declare a protobuf runtime version
-        # so that it coincides with the one we use to generate the code.
-        "com.google.protobuf:protobuf-java:{}".format(PROTOBUF_JAVA_VERSION),
-    ] + IO_GRPC_GRPC_JAVA_ARTIFACTS,
-    fail_if_repin_required = True,
-    fetch_sources = True,
-    generate_compat_repositories = True,
-    maven_install_json = "@contrib_rules_jvm//:frozen_deps_install.json",
-    repositories = [
-        "https://repo1.maven.org/maven2",
-    ],
-)
-
-load("@frozen_deps//:defs.bzl", frozen_deps_pmi = "pinned_maven_install")
-
-frozen_deps_pmi()
-
 # These are used for our own tests.
 maven_install(
     name = "contrib_rules_jvm_tests",

contrib_rules_jvm_deps_install.json

@@ -2581,5 +2581,259 @@
       "xml-apis:xml-apis"
     ]
   },
+  "services": {
+    "com.fasterxml.jackson.core:jackson-core": {
+      "com.fasterxml.jackson.core.JsonFactory": [
+        "com.fasterxml.jackson.core.JsonFactory"
+      ]
+    },
+    "com.google.auto.value:auto-value": {
+      "com.google.auto.value.extension.AutoValueExtension": [
+        "com.google.auto.value.extension.memoized.processor.MemoizeExtension",
+        "com.google.auto.value.extension.serializable.processor.SerializableAutoValueExtension",
+        "com.google.auto.value.extension.toprettystring.processor.ToPrettyStringExtension"
+      ],
+      "com.google.auto.value.extension.serializable.serializer.interfaces.SerializerExtension": [
+        "com.google.auto.value.extension.serializable.serializer.impl.ImmutableListSerializerExtension",
+        "com.google.auto.value.extension.serializable.serializer.impl.ImmutableMapSerializerExtension",
+        "com.google.auto.value.extension.serializable.serializer.impl.OptionalSerializerExtension"
+      ],
+      "javax.annotation.processing.Processor": [
+        "com.google.auto.value.extension.memoized.processor.MemoizedValidator",
+        "com.google.auto.value.extension.toprettystring.processor.ToPrettyStringValidator",
+        "com.google.auto.value.processor.AutoAnnotationProcessor",
+        "com.google.auto.value.processor.AutoBuilderProcessor",
+        "com.google.auto.value.processor.AutoOneOfProcessor",
+        "com.google.auto.value.processor.AutoValueBuilderProcessor",
+        "com.google.auto.value.processor.AutoValueProcessor"
+      ]
+    },
+    "com.google.googlejavaformat:google-java-format": {
+      "java.util.spi.ToolProvider": [
+        "com.google.googlejavaformat.java.GoogleJavaFormatToolProvider"
+      ]
+    },
+    "io.grpc:grpc-core": {
+      "io.grpc.LoadBalancerProvider": [
+        "io.grpc.internal.PickFirstLoadBalancerProvider",
+        "io.grpc.util.SecretRoundRobinLoadBalancerProvider$Provider"
+      ],
+      "io.grpc.NameResolverProvider": [
+        "io.grpc.internal.DnsNameResolverProvider"
+      ]
+    },
+    "io.grpc:grpc-netty": {
+      "io.grpc.ManagedChannelProvider": [
+        "io.grpc.netty.NettyChannelProvider"
+      ],
+      "io.grpc.ServerProvider": [
+        "io.grpc.netty.NettyServerProvider"
+      ]
+    },
+    "io.grpc:grpc-services": {
+      "io.grpc.LoadBalancerProvider": [
+        "io.grpc.protobuf.services.internal.HealthCheckingRoundRobinLoadBalancerProvider"
+      ]
+    },
+    "io.netty:netty-common": {
+      "reactor.blockhound.integration.BlockHoundIntegration": [
+        "io.netty.util.internal.Hidden$NettyBlockHoundIntegration"
+      ]
+    },
+    "net.sf.saxon:Saxon-HE": {
+      "javax.xml.transform.TransformerFactory": [
+        "net.sf.saxon.TransformerFactoryImpl"
+      ]
+    },
+    "net.sourceforge.pmd:pmd-core": {
+      "net.sourceforge.pmd.cpd.Language": [],
+      "net.sourceforge.pmd.lang.Language": []
+    },
+    "net.sourceforge.pmd:pmd-cpp": {
+      "net.sourceforge.pmd.cpd.Language": [
+        "net.sourceforge.pmd.cpd.CPPLanguage"
+      ],
+      "net.sourceforge.pmd.lang.Language": [
+        "net.sourceforge.pmd.lang.cpp.CppLanguageModule"
+      ]
+    },
+    "net.sourceforge.pmd:pmd-cs": {
+      "net.sourceforge.pmd.cpd.Language": [
+        "net.sourceforge.pmd.cpd.CsLanguage"
+      ],
+      "net.sourceforge.pmd.lang.Language": [
+        "net.sourceforge.pmd.lang.cs.CsLanguageModule"
+      ]
+    },
+    "net.sourceforge.pmd:pmd-dart": {
+      "net.sourceforge.pmd.cpd.Language": [
+        "net.sourceforge.pmd.cpd.DartLanguage"
+      ]
+    },
+    "net.sourceforge.pmd:pmd-fortran": {
+      "net.sourceforge.pmd.cpd.Language": [
+        "net.sourceforge.pmd.cpd.FortranLanguage"
+      ],
+      "net.sourceforge.pmd.lang.Language": [
+        "net.sourceforge.pmd.lang.fortran.FortranLanguageModule"
+      ]
+    },
+    "net.sourceforge.pmd:pmd-go": {
+      "net.sourceforge.pmd.cpd.Language": [
+        "net.sourceforge.pmd.cpd.GoLanguage"
+      ],
+      "net.sourceforge.pmd.lang.Language": [
+        "net.sourceforge.pmd.lang.go.GoLanguageModule"
+      ]
+    },
+    "net.sourceforge.pmd:pmd-groovy": {
+      "net.sourceforge.pmd.cpd.Language": [
+        "net.sourceforge.pmd.cpd.GroovyLanguage"
+      ],
+      "net.sourceforge.pmd.lang.Language": [
+        "net.sourceforge.pmd.lang.groovy.GroovyLanguageModule"
+      ]
+    },
+    "net.sourceforge.pmd:pmd-java": {
+      "net.sourceforge.pmd.cpd.Language": [
+        "net.sourceforge.pmd.cpd.JavaLanguage"
+      ],
+      "net.sourceforge.pmd.lang.Language": [
+        "net.sourceforge.pmd.lang.java.JavaLanguageModule"
+      ]
+    },
+    "net.sourceforge.pmd:pmd-jsp": {
+      "net.sourceforge.pmd.cpd.Language": [
+        "net.sourceforge.pmd.cpd.JSPLanguage"
+      ],
+      "net.sourceforge.pmd.lang.Language": [
+        "net.sourceforge.pmd.lang.jsp.JspLanguageModule"
+      ]
+    },
+    "net.sourceforge.pmd:pmd-kotlin": {
+      "net.sourceforge.pmd.cpd.Language": [
+        "net.sourceforge.pmd.cpd.KotlinLanguage"
+      ]
+    },
+    "net.sourceforge.pmd:pmd-lua": {
+      "net.sourceforge.pmd.cpd.Language": [
+        "net.sourceforge.pmd.cpd.LuaLanguage"
+      ]
+    },
+    "net.sourceforge.pmd:pmd-matlab": {
+      "net.sourceforge.pmd.cpd.Language": [
+        "net.sourceforge.pmd.cpd.MatlabLanguage"
+      ],
+      "net.sourceforge.pmd.lang.Language": [
+        "net.sourceforge.pmd.lang.matlab.MatlabLanguageModule"
+      ]
+    },
+    "net.sourceforge.pmd:pmd-modelica": {
+      "net.sourceforge.pmd.cpd.Language": [
+        "net.sourceforge.pmd.cpd.ModelicaLanguage"
+      ],
+      "net.sourceforge.pmd.lang.Language": [
+        "net.sourceforge.pmd.lang.modelica.ModelicaLanguageModule"
+      ]
+    },
+    "net.sourceforge.pmd:pmd-objectivec": {
+      "net.sourceforge.pmd.cpd.Language": [
+        "net.sourceforge.pmd.cpd.ObjectiveCLanguage"
+      ],
+      "net.sourceforge.pmd.lang.Language": [
+        "net.sourceforge.pmd.lang.objectivec.ObjectiveCLanguageModule"
+      ]
+    },
+    "net.sourceforge.pmd:pmd-perl": {
+      "net.sourceforge.pmd.cpd.Language": [
+        "net.sourceforge.pmd.cpd.PerlLanguage"
+      ]
+    },
+    "net.sourceforge.pmd:pmd-php": {
+      "net.sourceforge.pmd.cpd.Language": [
+        "net.sourceforge.pmd.cpd.PHPLanguage"
+      ],
+      "net.sourceforge.pmd.lang.Language": [
+        "net.sourceforge.pmd.lang.php.PhpLanguageModule"
+      ]
+    },
+    "net.sourceforge.pmd:pmd-plsql": {
+      "net.sourceforge.pmd.cpd.Language": [
+        "net.sourceforge.pmd.cpd.PLSQLLanguage"
+      ],
+      "net.sourceforge.pmd.lang.Language": [
+        "net.sourceforge.pmd.lang.plsql.PLSQLLanguageModule"
+      ]
+    },
+    "net.sourceforge.pmd:pmd-python": {
+      "net.sourceforge.pmd.cpd.Language": [
+        "net.sourceforge.pmd.cpd.PythonLanguage"
+      ],
+      "net.sourceforge.pmd.lang.Language": [
+        "net.sourceforge.pmd.lang.python.PythonLanguageModule"
+      ]
+    },
+    "net.sourceforge.pmd:pmd-ruby": {
+      "net.sourceforge.pmd.cpd.Language": [
+        "net.sourceforge.pmd.cpd.RubyLanguage"
+      ],
+      "net.sourceforge.pmd.lang.Language": [
+        "net.sourceforge.pmd.lang.ruby.RubyLanguageModule"
+      ]
+    },
+    "net.sourceforge.pmd:pmd-swift": {
+      "net.sourceforge.pmd.cpd.Language": [
+        "net.sourceforge.pmd.cpd.SwiftLanguage"
+      ],
+      "net.sourceforge.pmd.lang.Language": [
+        "net.sourceforge.pmd.lang.swift.SwiftLanguageModule"
+      ]
+    },
+    "net.sourceforge.pmd:pmd-vm": {
+      "net.sourceforge.pmd.lang.Language": [
+        "net.sourceforge.pmd.lang.vm.VmLanguageModule"
+      ]
+    },
+    "net.sourceforge.pmd:pmd-xml": {
+      "net.sourceforge.pmd.cpd.Language": [
+        "net.sourceforge.pmd.xml.cpd.XmlLanguage"
+      ],
+      "net.sourceforge.pmd.lang.Language": [
+        "net.sourceforge.pmd.lang.pom.PomLanguageModule",
+        "net.sourceforge.pmd.lang.wsdl.WsdlLanguageModule",
+        "net.sourceforge.pmd.lang.xml.XmlLanguageModule",
+        "net.sourceforge.pmd.lang.xsl.XslLanguageModule"
+      ]
+    },
+    "net.sourceforge.saxon:saxon": {
+      "javax.xml.transform.TransformerFactory": [
+        "net.sf.saxon.TransformerFactoryImpl"
+      ]
+    },
+    "org.codehaus.groovy:groovy": {
+      "org.codehaus.groovy.source.Extensions": [
+        "groovy"
+      ],
+      "org.codehaus.groovy.transform.ASTTransformation": [
+        "groovy.grape.GrabAnnotationTransformation",
+        "org.codehaus.groovy.ast.builder.AstBuilderTransformation"
+      ]
+    },
+    "org.junit.jupiter:junit-jupiter-engine": {
+      "org.junit.platform.engine.TestEngine": [
+        "org.junit.jupiter.engine.JupiterTestEngine"
+      ]
+    },
+    "org.junit.platform:junit-platform-launcher": {
+      "org.junit.platform.launcher.TestExecutionListener": [
+        "org.junit.platform.launcher.listeners.UniqueIdTrackingListener"
+      ]
+    },
+    "org.junit.vintage:junit-vintage-engine": {
+      "org.junit.platform.engine.TestEngine": [
+        "org.junit.vintage.engine.VintageTestEngine"
+      ]
+    }
+  },
   "version": "2"
 }

docs/postfix.md

@@ -7,7 +7,7 @@ dependencies are loaded using a call to `maven_install`, but we don't
 want to force users to remember to load our own dependencies for
 us. Instead, to add a new dependency to the project:
 
-1. Update `frozen_deps` in the `WORKSPACE` file
+1. Update `contrib_rules_jvm_deps` in the `MODULE.bazel` file
 2. Run `./tools/update-dependencies.sh`
 3. Commit the updated files.