Cleanup

breskeby · breskeby · commit 58c5dc5077d2 · 2025-09-11T13:11:43.000+02:00
diff --git a/build-conventions/build.gradle b/build-conventions/build.gradle
@@ -72,6 +72,9 @@ repositories {
 }
 
 dependencies {
+  constraints {
+    api("org.slf4j:slf4j-api:2.0.6")
+  }
   api buildLibs.maven.model
   api buildLibs.shadow.plugin
   api buildLibs.apache.rat
diff --git a/build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/precommit/FormattingPrecommitPlugin.java b/build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/precommit/FormattingPrecommitPlugin.java
@@ -12,7 +12,6 @@
 import com.diffplug.gradle.spotless.SpotlessExtension;
 import com.diffplug.gradle.spotless.SpotlessPlugin;
 
-import org.elasticsearch.gradle.internal.DependencyContext;
 import org.elasticsearch.gradle.internal.conventions.util.Util;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
@@ -44,7 +43,6 @@
  */
 public class FormattingPrecommitPlugin implements Plugin<Project> {
 
-    @SuppressWarnings("checkstyle:RegexpMultiline")
     @Override
     public void apply(Project project) {
         project.getPluginManager().withPlugin("java-base", javaBasePlugin -> {
@@ -54,22 +52,6 @@ public void apply(Project project) {
             // Spotless resolves required dependencies from project repositories, so we need maven central
             project.getRepositories().mavenCentral();
 
-//            project.getDependencies()
-//                .components(
-//                    metadataHandler -> metadataHandler.withModule(
-//                        "com.google.googlejavaformat:google-java-format",
-//                        componentMetadataDetails -> componentMetadataDetails.allVariants(
-//                            variant -> variant.withDependencies(depMetadata -> depMetadata.add("com.google.guava:guava:32.1.3-jre"))
-//                        )
-//                    )
-//                );
-            project.getConfigurations().matching(spec -> spec.getName().startsWith("spotless")).all(conf -> {
-                conf.getAttributes()
-                    .attribute(
-                        DependencyContext.CONTEXT_ATTRIBUTE,
-                        project.getObjects().named(DependencyContext.class, DependencyContext.CODE_QUALITY)
-                    );
-            });
             project.getExtensions().getByType(SpotlessExtension.class).java(java -> {
                 File elasticsearchWorkspace = Util.locateElasticsearchWorkspace(project.getGradle());
                 String importOrderPath = "build-conventions/elastic.importorder";
@@ -92,7 +74,7 @@ public void apply(Project project) {
                 // When running build benchmarks we alter the source in some scenarios.
                 // The gradle-profiler unfortunately does not generate compliant formatted
                 // sources so we ignore that altered file when running build benchmarks
-                if (Boolean.getBoolean("BUILD_PERFORMANCE_TEST") && project.getPath().equals(":server")) {
+                if(Boolean.getBoolean("BUILD_PERFORMANCE_TEST") && project.getPath().equals(":server")) {
                     java.targetExclude("src/main/java/org/elasticsearch/bootstrap/BootstrapInfo.java");
                 }
             });
diff --git a/build-tools-internal/build.gradle b/build-tools-internal/build.gradle
@@ -281,6 +281,9 @@ dependencies {
     testImplementation buildLibs.asm
     integTestImplementation buildLibs.asm
     api(buildLibs.snakeyaml)
+    api("org.slf4j:slf4j-api:2.0.6") {
+      because("Align with what we use in production")
+    }
   }
   // Forcefully downgrade the jackson platform as used in production
   api enforcedPlatform(buildLibs.jackson.platform)
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaBasePlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaBasePlugin.java
@@ -20,7 +20,6 @@
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.artifacts.ResolutionStrategy;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.JavaBasePlugin;
 import org.gradle.api.plugins.JavaPluginExtension;
@@ -64,7 +63,6 @@ public void apply(Project project) {
         project.getPluginManager().apply(ElasticsearchTestBasePlugin.class);
         project.getPluginManager().apply(PrecommitTaskPlugin.class);
         project.getPluginManager().apply(MutedTestPlugin.class);
-        configureConfigurations(project);
         configureCompile(project);
         configureInputNormalization(project);
         configureNativeLibraryPath(project);
@@ -73,37 +71,6 @@ public void apply(Project project) {
         project.getExtensions().getExtraProperties().set("versions", VersionProperties.getVersions());
     }
 
-    /**
-     * Makes dependencies non-transitive.
-     * <p>
-     * Gradle allows setting all dependencies as non-transitive very easily.
-     * Sadly this mechanism does not translate into maven pom generation. In order
-     * to effectively make the pom act as if it has no transitive dependencies,
-     * we must exclude each transitive dependency of each direct dependency.
-     * <p>
-     * Determining the transitive deps of a dependency which has been resolved as
-     * non-transitive is difficult because the process of resolving removes the
-     * transitive deps. To sidestep this issue, we create a configuration per
-     * direct dependency version. This specially named and unique configuration
-     * will contain all of the transitive dependencies of this particular
-     * dependency. We can then use this configuration during pom generation
-     * to iterate the transitive dependencies and add excludes.
-     */
-    public static void configureConfigurations(Project project) {
-        // we are not shipping these jars, we act like dumb consumers of these things
-        if (project.getPath().startsWith(":test:fixtures") || project.getPath().equals(":build-tools")) {
-            return;
-        }
-        // fail on any conflicting dependency versions
-        project.getConfigurations().all(configuration -> {
-            if (configuration.getName().endsWith("Fixture")) {
-                // just a self contained test-fixture configuration, likely transitive and hellacious
-                return;
-            }
-            configuration.resolutionStrategy(ResolutionStrategy::failOnVersionConflict);
-        });
-    }
-
     /**
      * Adds compiler settings to the project
      */
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/CheckstylePrecommitPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/CheckstylePrecommitPlugin.java
@@ -9,12 +9,10 @@
 
 package org.elasticsearch.gradle.internal.precommit;
 
-import org.elasticsearch.gradle.internal.DependencyContext;
 import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin;
 import org.gradle.api.Action;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
-import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.VersionCatalogsExtension;
 import org.gradle.api.artifacts.dsl.DependencyHandler;
 import org.gradle.api.plugins.JavaBasePlugin;
@@ -93,12 +91,6 @@ public void execute(Task task) {
         project.getPluginManager().apply("checkstyle");
         CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class);
         checkstyle.getConfigDirectory().set(checkstyleDir);
-        Configuration configuration = project.getConfigurations().getByName("checkstyle");
-        configuration.getAttributes()
-            .attribute(
-                DependencyContext.CONTEXT_ATTRIBUTE,
-                project.getObjects().named(DependencyContext.class, DependencyContext.CODE_QUALITY)
-            );
         DependencyHandler dependencies = project.getDependencies();
         Provider<String> conventionsDependencyProvider = project.provider(
             () -> "org.elasticsearch:build-conventions:" + project.getVersion()
diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle
@@ -42,6 +42,13 @@ import java.util.regex.Pattern
  *    dpkg -c path/to/elasticsearch.deb
  */
 
+buildscript {
+  dependencies {
+    constraints {
+      classpath "org.slf4j:slf4j-api:2.0.6"
+    }
+  }
+}
 plugins {
   alias(buildLibs.plugins.ospackage)
 }
diff --git a/docs/build.gradle b/docs/build.gradle
@@ -37,17 +37,6 @@ ext.docsFileTree = fileTree(projectDir) {
   }
 }
 
-configurations {
-  testTransi
-}
-
-tasks.register('testTrans') {
-  doLast {
-    configurations.testTransi.each { File file ->
-      println file.name
-    }
-  }
-}
 tasks.named("yamlRestTest") {
   enabled = false
   if (buildParams.snapshotBuild == false) {
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -4905,36 +4905,11 @@
             <sha256 value="affd06771589ebfe454bb11315a4f466ecaa135b95f3e7939534cf1d2fd7064c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.slf4j" name="slf4j-api" version="1.7.10">
-         <artifact name="slf4j-api-1.7.10.jar">
-            <sha256 value="3863e27005740d4d1289bf87b113efea115e9a22408a7d623be8004991232bfe" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.slf4j" name="slf4j-api" version="1.7.25">
          <artifact name="slf4j-api-1.7.25.jar">
             <sha256 value="18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.slf4j" name="slf4j-api" version="1.7.30">
-         <artifact name="slf4j-api-1.7.30.jar">
-            <sha256 value="cdba07964d1bb40a0761485c6b1e8c2f8fd9eb1d19c53928ac0d7f9510105c57" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.slf4j" name="slf4j-api" version="1.7.32">
-         <artifact name="slf4j-api-1.7.32.jar">
-            <sha256 value="3624f8474c1af46d75f98bc097d7864a323c81b3808aa43689a6e1c601c027be" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.slf4j" name="slf4j-api" version="1.7.36">
-         <artifact name="slf4j-api-1.7.36.jar">
-            <sha256 value="d3ef575e3e4979678dc01bf1dcce51021493b4d11fb7f1be8ad982877c16a1c0" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.slf4j" name="slf4j-api" version="1.7.5">
-         <artifact name="slf4j-api-1.7.5.jar">
-            <sha256 value="fe30825245d2336c859dc38d60c0fc5f3668dbf29cd586828d2b5667ec355b91" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.slf4j" name="slf4j-api" version="2.0.17">
          <artifact name="slf4j-api-2.0.17.jar">
             <sha256 value="7b751d952061954d5abfed7181c1f645d336091b679891591d63329c622eb832" origin="Generated by Gradle"/>

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,9 @@ repositories {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`dependencies {`
	`75`	`+ constraints {`
	`76`	`+ api("org.slf4j:slf4j-api:2.0.6")`
	`77`	`+ }`
`75`	`78`	`api buildLibs.maven.model`
`76`	`79`	`api buildLibs.shadow.plugin`
`77`	`80`	`api buildLibs.apache.rat`