WIP

Author: breskeby

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/dependencies/rules/ExcludeTransitivesRule.java

@@ -20,31 +20,11 @@ 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());
-    // }
-
 }

settings.gradle

@@ -186,11 +186,11 @@ dependencyResolutionManagement {
     withModule("org.orbisgis:h2gis-utilities", ExcludeTransitivesRule)
     withModule("org.apache.tika:tika-parser-apple-module", ExcludeTransitivesRule)
     withModule("io.projectreactor.netty:reactor-netty-core", ExcludeTransitivesRule)
-    withModule("net.java.dev.jets3t:jets3t", ExcludeTransitivesRule)
+    //withModule("net.java.dev.jets3t:jets3t", ExcludeTransitivesRule)
     withModule("org.apache.hadoop:hadoop-auth", ExcludeTransitivesRule)
     withModule("org.apache.hadoop:hadoop-common", ExcludeTransitivesRule)
     withModule("org.apache.hadoop:hadoop-yarn-common", ExcludeTransitivesRule)
-    withModule("org.apache.hadoop:hadoop-minicluster", ExcludeTransitivesRule)
+//    withModule("org.apache.hadoop:hadoop-minicluster", ExcludeTransitivesRule)
     withModule("org.apache.hadoop:hadoop-yarn-common", ExcludeTransitivesRule)
     withModule("org.apache.hadoop:hadoop-client-api", ExcludeTransitivesRule)
     withModule("net.sf.ehcache:ehcache", ExcludeTransitivesRule)

test/fixtures/hdfs-fixture/build.gradle

@@ -19,6 +19,7 @@ def hdfsVersionAttr = Attribute.of('hdfs.major.version', Integer)
 
 configurations {
   hdfs2 {
+    transitive = false
     attributes {
       attribute(hdfs2patched, true)
     }
@@ -74,8 +75,27 @@ dependencies {
       matchingArtifacts = ["hadoop3-common"]
     }
   }
+  constraints {
+    implementation("commons-codec:commons-codec:1.9")
+    implementation("commons-logging:commons-logging:1.2")
+    implementation("org.slf4j:slf4j-api:${versions.slf4j}")
+  }
+  implementation("org.slf4j:slf4j-api:${versions.slf4j}")
 
-  compileOnly("org.apache.hadoop:hadoop-minicluster:2.8.5")
+  compileOnly("commons-io:commons-io:2.16.1")
+  compileOnly("org.apache.hadoop:hadoop-common:2.8.5")
+  compileOnly("org.apache.hadoop:hadoop-annotations:2.8.5")
+  compileOnly("org.apache.hadoop:hadoop-hdfs:2.8.5")
+  compileOnly("org.apache.hadoop:hadoop-hdfs:2.8.5:tests")
+  compileOnly("org.apache.hadoop:hadoop-hdfs-client:2.8.5") {
+    exclude group: "org.apache.hadoop", module: "hadoop-common"
+  }
+  compileOnly("org.apache.hadoop:hadoop-hdfs:2.8.5:tests") {
+    transitive = false
+  }
+  compileOnly("org.apache.hadoop:hadoop-minicluster:2.8.5") {
+    transitive = false
+  }
   api("com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}") {
     transitive = false
   }
@@ -116,13 +136,25 @@ dependencies {
     [group: "org.slf4j", module: "slf4j-api"],
   ]
 
-  hdfs2("org.apache.hadoop:hadoop-minicluster:2.8.5") {
-    commonExcludes.each { exclude it }
-    exclude group: "org.apache.commons", module: "commons-math3"
-    exclude group: "xmlenc", module: "xmlenc"
-    exclude group: "net.java.dev.jets3t", module: "jets3t"
-    exclude group: "org.apache.directory.server", module: "apacheds-i18n"
-    exclude group: "xerces", module: "xercesImpl"
+//    hdfs2("org.apache.hadoop:hadoop-hdfs:2.8.5")
+    hdfs2("commons-io:commons-io:2.16.1")
+    hdfs2("commons-collections:commons-collections:3.2.1")
+    hdfs2("commons-configuration:commons-configuration:1.6")
+    hdfs2("commons-lang:commons-lang:2.6")
+    hdfs2("org.apache.hadoop:hadoop-auth:2.8.5")
+    hdfs2("org.apache.hadoop:hadoop-common:2.8.5")
+    hdfs2("org.apache.hadoop:hadoop-common:2.8.5:tests")
+    hdfs2("org.apache.hadoop:hadoop-hdfs:2.8.5")
+    hdfs2("org.apache.hadoop:hadoop-hdfs:2.8.5:tests")
+    hdfs2("org.apache.hadoop:hadoop-annotations:2.8.5")
+    hdfs2("org.apache.hadoop:hadoop-hdfs-client:2.8.5")
+    hdfs2("org.apache.hadoop:hadoop-minicluster:2.8.5") {
+      commonExcludes.each { exclude it }
+      exclude group: "org.apache.commons", module: "commons-math3"
+      exclude group: "xmlenc", module: "xmlenc"
+      exclude group: "net.java.dev.jets3t", module: "jets3t"
+      exclude group: "org.apache.directory.server", module: "apacheds-i18n"
+      exclude group: "xerces", module: "xercesImpl"
   }
 
   hdfs3("org.apache.hadoop:hadoop-minicluster:3.3.1") {