Update external deps (#912)

bazel-contrib · Jun 22, 2023 · e4aa2ab · e4aa2ab
1 parent 8678af1
commit e4aa2ab
Show file tree

Hide file tree

Showing 6 changed files with 713 additions and 212 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -4,30 +4,33 @@ module(
 )
 
 bazel_dep(name = "bazel_skylib", version = "1.4.1")
-bazel_dep(name = "stardoc", version = "0.5.3", repo_name = "io_bazel_stardoc")
+bazel_dep(name = "stardoc", repo_name = "io_bazel_stardoc", version = "0.5.3")
 
 non_module_deps = use_extension("//:non-module-deps.bzl", "non_module_deps")
+
 use_repo(
     non_module_deps,
     "io_bazel_rules_kotlin",
 )
 
 maven = use_extension(":extensions.bzl", "maven")
+
 maven.install(
     name = "rules_jvm_external_deps",
     artifacts = [
-        "com.google.auth:google-auth-library-credentials:0.22.0",
-        "com.google.auth:google-auth-library-oauth2-http:0.22.0",
-        "com.google.cloud:google-cloud-core:1.93.10",
-        "com.google.cloud:google-cloud-storage:1.113.4",
-        "com.google.code.gson:gson:2.9.0",
-        "com.google.googlejavaformat:google-java-format:1.15.0",
-        "com.google.guava:guava:31.1-jre",
-        "org.apache.maven:maven-artifact:3.8.6",
-        "software.amazon.awssdk:s3:2.17.183",
+        "com.google.auth:google-auth-library-credentials:1.17.0",
+        "com.google.auth:google-auth-library-oauth2-http:1.17.0",
+        "com.google.cloud:google-cloud-core:2.18.1",
+        "com.google.cloud:google-cloud-storage:2.22.3",
+        "com.google.code.gson:gson:2.10.1",
+        "com.google.googlejavaformat:google-java-format:1.17.0",
+        "com.google.guava:guava:32.0.0-jre",
+        "org.apache.maven:maven-artifact:3.9.2",
+        "software.amazon.awssdk:s3:2.20.78",
     ],
     lock_file = "@rules_jvm_external//:rules_jvm_external_deps_install.json",
 )
+
 use_repo(
     maven,
     "rules_jvm_external_deps",

diff --git a/defs.bzl b/defs.bzl
@@ -15,7 +15,7 @@
 load("//private:constants.bzl", _DEFAULT_REPOSITORY_NAME = "DEFAULT_REPOSITORY_NAME")
 load("//private/rules:artifact.bzl", _artifact = "artifact", _maven_artifact = "maven_artifact")
 load("//private/rules:has_maven_deps.bzl", _read_coordinates = "read_coordinates")
-load("//private/rules:java_export.bzl", _java_export = "java_export", _maven_export="maven_export")
+load("//private/rules:java_export.bzl", _java_export = "java_export", _maven_export = "maven_export")
 load("//private/rules:javadoc.bzl", _javadoc = "javadoc")
 load("//private/rules:maven_bom.bzl", _maven_bom = "maven_bom")
 load("//private/rules:maven_install.bzl", _maven_install = "maven_install")

diff --git a/private/rules/javadoc.bzl b/private/rules/javadoc.bzl
@@ -1,5 +1,4 @@
 load(":maven_project_jar.bzl", "DEFAULT_EXCLUDED_WORKSPACES")
-load(":maven_utils.bzl", "determine_additional_dependencies")
 
 def generate_javadoc(ctx, javadoc, source_jars, classpath, javadocopts, output):
     args = ctx.actions.args()

diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/coursier/NebulaFormat.java b/private/tools/java/com/github/bazelbuild/rules_jvm_external/coursier/NebulaFormat.java
@@ -71,7 +71,9 @@ public Map<String, Object> render(Set<DependencyInfo> infos, Map<String, Object>
               .map(Objects::toString)
               .forEach(
                   repo -> {
-                    repos.getOrDefault(stripAuthenticationInformation(repo), new TreeSet<>()).add(key);
+                    repos
+                        .getOrDefault(stripAuthenticationInformation(repo), new TreeSet<>())
+                        .add(key);
                   });
 
           deps.put(

diff --git a/repositories.bzl b/repositories.bzl
@@ -23,15 +23,15 @@ def rules_jvm_external_deps(repositories = _DEFAULT_REPOSITORIES):
     maven_install(
         name = "rules_jvm_external_deps",
         artifacts = [
-            "com.google.auth:google-auth-library-credentials:0.22.0",
-            "com.google.auth:google-auth-library-oauth2-http:0.22.0",
-            "com.google.cloud:google-cloud-core:1.93.10",
-            "com.google.cloud:google-cloud-storage:1.113.4",
-            "com.google.code.gson:gson:2.9.0",
-            "com.google.googlejavaformat:google-java-format:1.15.0",
-            "com.google.guava:guava:31.1-jre",
-            "org.apache.maven:maven-artifact:3.8.6",
-            "software.amazon.awssdk:s3:2.17.183",
+            "com.google.auth:google-auth-library-credentials:1.17.0",
+            "com.google.auth:google-auth-library-oauth2-http:1.17.0",
+            "com.google.cloud:google-cloud-core:2.18.1",
+            "com.google.cloud:google-cloud-storage:2.22.3",
+            "com.google.code.gson:gson:2.10.1",
+            "com.google.googlejavaformat:google-java-format:1.17.0",
+            "com.google.guava:guava:32.0.0-jre",
+            "org.apache.maven:maven-artifact:3.9.2",
+            "software.amazon.awssdk:s3:2.20.78",
         ],
         maven_install_json = "@rules_jvm_external//:rules_jvm_external_deps_install.json",
         fail_if_repin_required = True,