From 0107d72fc2e33b52e51da2ae40194f6be14b6b44 Mon Sep 17 00:00:00 2001 From: Simon Mavi Stewart Date: Wed, 19 Nov 2025 15:24:20 +1100 Subject: [PATCH] Add slf4j logging implementation for gradle resolver This prevents a warning being displayed on the console when we start the resolver. --- MODULE.bazel | 1 + .../resolver/gradle/BUILD.bazel | 6 ++++ rules_jvm_external_deps_install.json | 31 +++++++++++++++++-- .../regression_testing_gradle_install.json | 3 +- 4 files changed, 37 insertions(+), 4 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 3bf952c53..01650cca7 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -63,6 +63,7 @@ maven.install( "org.fusesource.jansi:jansi:2.4.1", "org.slf4j:jul-to-slf4j:2.0.12", "org.slf4j:log4j-over-slf4j:2.0.12", + "org.slf4j:slf4j-jdk14:2.0.12", "org.slf4j:slf4j-simple:2.0.12", "software.amazon.awssdk:s3:2.26.12", "software.amazon.awssdk:sdk-core:2.26.12", diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/BUILD.bazel b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/BUILD.bazel index 0974c0e02..d34198e97 100644 --- a/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/BUILD.bazel +++ b/private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver/gradle/BUILD.bazel @@ -52,6 +52,12 @@ java_binary( ], main_class = "com.github.bazelbuild.rules_jvm_external.resolver.gradle.GradleMain", visibility = ["//visibility:public"], + runtime_deps = [ + artifact( + "org.slf4j:slf4j-jdk14", + repository_name = "rules_jvm_external_deps", + ), + ], deps = [ ":gradle", "//private/tools/java/com/github/bazelbuild/rules_jvm_external/resolver", diff --git a/rules_jvm_external_deps_install.json b/rules_jvm_external_deps_install.json index eab0fc059..982564ccd 100644 --- a/rules_jvm_external_deps_install.json +++ b/rules_jvm_external_deps_install.json @@ -1,7 +1,7 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": 1275088240, - "__RESOLVED_ARTIFACTS_HASH": 968256901, + "__INPUT_ARTIFACTS_HASH": 1667607596, + "__RESOLVED_ARTIFACTS_HASH": 1937575180, "conflict_resolution": { "com.google.guava:guava:33.2.1-jre": "com.google.guava:guava:33.4.8-jre", "org.codehaus.plexus:plexus-utils:3.5.1": "org.codehaus.plexus:plexus-utils:3.6.0" @@ -825,6 +825,13 @@ }, "version": "2.0.12" }, + "org.slf4j:slf4j-jdk14": { + "shasums": { + "jar": "26468d004a9cb8575703024e20b29a3839194f0abf1f4f79ee0b21c5d4900efd", + "sources": "a4bea624bea280720dc11094deb6ff405ac4e7554d1b5299ea9eaf9609df04b0" + }, + "version": "2.0.12" + }, "org.slf4j:slf4j-simple": { "shasums": { "jar": "4cd8f3d6236044600e7054da7c124c6d2e9f45eb43c77d4e9b093fe1095edc85", @@ -1410,6 +1417,9 @@ "org.slf4j:log4j-over-slf4j": [ "org.slf4j:slf4j-api" ], + "org.slf4j:slf4j-jdk14": [ + "org.slf4j:slf4j-api" + ], "org.slf4j:slf4j-simple": [ "org.slf4j:slf4j-api" ], @@ -2950,6 +2960,9 @@ "org.slf4j.helpers", "org.slf4j.spi" ], + "org.slf4j:slf4j-jdk14": [ + "org.slf4j.jul" + ], "org.slf4j:slf4j-simple": [ "org.slf4j.simple" ], @@ -3475,6 +3488,8 @@ "org.slf4j:log4j-over-slf4j:jar:sources", "org.slf4j:slf4j-api", "org.slf4j:slf4j-api:jar:sources", + "org.slf4j:slf4j-jdk14", + "org.slf4j:slf4j-jdk14:jar:sources", "org.slf4j:slf4j-simple", "org.slf4j:slf4j-simple:jar:sources", "org.threeten:threetenbp", @@ -3772,6 +3787,8 @@ "org.slf4j:log4j-over-slf4j:jar:sources", "org.slf4j:slf4j-api", "org.slf4j:slf4j-api:jar:sources", + "org.slf4j:slf4j-jdk14", + "org.slf4j:slf4j-jdk14:jar:sources", "org.slf4j:slf4j-simple", "org.slf4j:slf4j-simple:jar:sources", "org.threeten:threetenbp", @@ -4027,6 +4044,16 @@ "org.apache.commons.logging.impl.SLF4JLogFactory" ] }, + "org.slf4j:slf4j-jdk14": { + "org.slf4j.spi.SLF4JServiceProvider": [ + "org.slf4j.jul.JULServiceProvider" + ] + }, + "org.slf4j:slf4j-jdk14:jar:sources": { + "org.slf4j.spi.SLF4JServiceProvider": [ + "org.slf4j.jul.JULServiceProvider" + ] + }, "org.slf4j:slf4j-simple": { "org.slf4j.spi.SLF4JServiceProvider": [ "org.slf4j.simple.SimpleServiceProvider" diff --git a/tests/custom_maven_install/regression_testing_gradle_install.json b/tests/custom_maven_install/regression_testing_gradle_install.json index 3b81be286..69fbe4512 100644 --- a/tests/custom_maven_install/regression_testing_gradle_install.json +++ b/tests/custom_maven_install/regression_testing_gradle_install.json @@ -510,8 +510,7 @@ "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21": "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10", "org.jetbrains.kotlin:kotlin-stdlib:1.8.0": "org.jetbrains.kotlin:kotlin-stdlib:1.8.21", "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1": "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4", - "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1": "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4", - "org.jetbrains.kotlinx:kotlinx-coroutines-core:pom:1.6.1": "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1": "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" }, "dependencies": { "androidx.activity:activity-ktx:aar": [