WIP - Port each dependency to specific exclude transitive cmr

breskeby · breskeby · commit f20839b738ef · 2025-09-08T07:52:49.000+02:00
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
@@ -16,7 +16,6 @@
 import org.elasticsearch.gradle.internal.test.MutedTestPlugin;
 import org.elasticsearch.gradle.internal.test.TestUtil;
 import org.elasticsearch.gradle.test.SystemPropertyCommandLineArgumentProvider;
-import org.elasticsearch.gradle.util.GradleUtils;
 import org.gradle.api.JavaVersion;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
@@ -26,8 +25,6 @@
 import org.gradle.api.plugins.JavaBasePlugin;
 import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.provider.Provider;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.api.tasks.SourceSetContainer;
 import org.gradle.api.tasks.compile.AbstractCompile;
 import org.gradle.api.tasks.compile.CompileOptions;
 import org.gradle.api.tasks.compile.GroovyCompile;
@@ -67,7 +64,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);
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaModulePathPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaModulePathPlugin.java
@@ -76,18 +76,13 @@ void configureCompileModulePath(Project project) {
             it.extendsFrom(compileClasspath);
             it.setCanBeResolved(true);
             it.setCanBeConsumed(false); // we don't want this configuration used by dependent projects
-            it.attributes(
-                attrs -> {
-                    attrs.attribute(
-                        LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE,
-                        project.getObjects().named(LibraryElements.class, LibraryElements.CLASSES)
-                    );
-                    attrs.attribute(
-                        Usage.USAGE_ATTRIBUTE,
-                        project.getObjects().named(Usage.class, Usage.JAVA_API)
-                    );
-                }
-            );
+            it.attributes(attrs -> {
+                attrs.attribute(
+                    LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE,
+                    project.getObjects().named(LibraryElements.class, LibraryElements.CLASSES)
+                );
+                attrs.attribute(Usage.USAGE_ATTRIBUTE, project.getObjects().named(Usage.class, Usage.JAVA_API));
+            });
         }).getIncoming().artifactView(it -> {
             it.componentFilter(cf -> {
                 var visited = new HashSet<ComponentIdentifier>();
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/dependencies/rules/DependencyRemovalByNameRule.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/dependencies/rules/DependencyRemovalByNameRule.java
@@ -25,9 +25,7 @@ public DependencyRemovalByNameRule(String... modulesToRemove) {
     @Override
     public void execute(ComponentMetadataContext context) {
         context.getDetails().allVariants(variants -> {
-            variants.withDependencies(dependencies -> {
-                dependencies.removeIf(metadata -> modulesToRemove.contains(metadata.getName()));
-            });
+            variants.withDependencies(dependencies -> { dependencies.removeIf(metadata -> modulesToRemove.contains(metadata.getName())); });
         });
     }
 }
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/dependencies/rules/ExcludeTransitivesRule.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/dependencies/rules/ExcludeTransitivesRule.java
@@ -9,47 +9,22 @@
 
 package org.elasticsearch.gradle.internal.dependencies.rules;
 
-import org.elasticsearch.gradle.internal.DependencyContext;
 import org.gradle.api.artifacts.ComponentMetadataContext;
 import org.gradle.api.artifacts.ComponentMetadataRule;
-import org.gradle.api.artifacts.VariantMetadata;
-import org.gradle.api.attributes.Attribute;
-import org.gradle.api.internal.artifacts.repositories.resolver.VariantMetadataAdapter;
 
 //@CacheableRule
 public abstract class ExcludeTransitivesRule implements ComponentMetadataRule {
 
-
     @Override
     public void execute(ComponentMetadataContext context) {
         context.getDetails().allVariants(variant -> {
             variant.withDependencies(dependencies -> {
                 // Exclude all transitive dependencies
-                if(dependencies.isEmpty()) {
+                if (dependencies.isEmpty() == false) {
                     System.out.println(context.getDetails().getId().getGroup() + ":" + context.getDetails().getId().getName());
                 }
                 dependencies.clear();
-//                dependencies.removeIf(p -> {
-//                    System.out.println("p.getName() = " + p.getName());
-//                    return true;
-//                });
             });
         });
     }
-//
-//    private boolean isCodeQuality(VariantMetadata variant) {
-//        // System.out.println("CodeQualityRule#context#variantName = " + ((VariantMetadataAdapter)variant).variantName);
-//        System.out.println("ExcludeTransitivesRule#context#isCodeQuality = " + ((VariantMetadataAdapter) variant).toString());
-//        try {
-//            java.lang.reflect.Field field = VariantMetadataAdapter.class.getDeclaredField("variantName");
-//            field.setAccessible(true);
-//            Object variantName = field.get(variant);
-//            System.out.println("ExcludeTransitivesRule#context#variantName = " + variantName);
-//        } catch (Exception e) {
-//            System.out.println("Failed to access variantName: " + e.getMessage());
-//        }
-//        DependencyContext attribute = variant.getAttributes().getAttribute(DependencyContext.CONTEXT_ATTRIBUTE);
-//        return attribute != null && DependencyContext.CODE_QUALITY.equals(attribute.getName());
-//    }
-
 }
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/dependencies/rules/Log4jRule.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/dependencies/rules/Log4jRule.java
@@ -18,13 +18,11 @@ public abstract class Log4jRule implements ComponentMetadataRule {
     @Override
     public void execute(ComponentMetadataContext context) {
         context.getDetails().withVariant("apiElements", variantMetadata -> {
-            variantMetadata.withDependencies(
-                deps -> {
-                    deps.add("org.jspecify:jspecify:1.0.0");
-                    deps.add("com.github.spotbugs:spotbugs-annotations:4.9.3");
-                    deps.add("com.google.errorprone:error_prone_annotations:2.38.0");
-                }
-            );
+            variantMetadata.withDependencies(deps -> {
+                deps.add("org.jspecify:jspecify:1.0.0");
+                deps.add("com.github.spotbugs:spotbugs-annotations:4.9.3");
+                deps.add("com.google.errorprone:error_prone_annotations:2.38.0");
+            });
         });
     }
 }
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/dependencies/rules/SpotlessRule2.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/dependencies/rules/SpotlessRule2.java
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
@@ -94,10 +94,11 @@ public void execute(Task task) {
         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)
-        );
+        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/build-tools/src/main/java/org/elasticsearch/gradle/util/GradleUtils.java b/build-tools/src/main/java/org/elasticsearch/gradle/util/GradleUtils.java
@@ -14,8 +14,6 @@
 import org.gradle.api.Task;
 import org.gradle.api.UnknownTaskException;
 import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.artifacts.ModuleDependency;
-import org.gradle.api.artifacts.ProjectDependency;
 import org.gradle.api.plugins.JavaBasePlugin;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.plugins.JavaPluginExtension;
diff --git a/settings.gradle b/settings.gradle
diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,7 @@ public DependencyRemovalByNameRule(String... modulesToRemove) {`
`25`	`25`	`@Override`
`26`	`26`	`public void execute(ComponentMetadataContext context) {`
`27`	`27`	`context.getDetails().allVariants(variants -> {`
`28`		`- variants.withDependencies(dependencies -> {`
`29`		`- dependencies.removeIf(metadata -> modulesToRemove.contains(metadata.getName()));`
`30`		`- });`
	`28`	`+ variants.withDependencies(dependencies -> { dependencies.removeIf(metadata -> modulesToRemove.contains(metadata.getName())); });`
`31`	`29`	`});`
`32`	`30`	`}`
`33`	`31`	`}`