Filter out duplicate resources

brian-mcnamara · brian-mcnamara · commit 28ec3a8d541b · 2025-04-18T21:23:05.000Z
diff --git a/java/private/create_jvm_test_suite.bzl b/java/private/create_jvm_test_suite.bzl
@@ -88,6 +88,9 @@ def create_jvm_test_suite(
         )
         if not _contains_label(deps or [], lib_dep_label):
             deps.append(lib_dep_label)
+        if "resources" in library_attributes:
+            # Prevent duplicate resources from appearing in classpath
+            kwargs.pop("resources")
 
     tests = []
 
diff --git a/java/test/com/github/bazel_contrib/contrib_rules_jvm/junit5/JavaTestSuiteTest.java b/java/test/com/github/bazel_contrib/contrib_rules_jvm/junit5/JavaTestSuiteTest.java
@@ -6,7 +6,6 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.zip.ZipFile;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,9 @@ def create_jvm_test_suite(`
`88`	`88`	`)`
`89`	`89`	`if not _contains_label(deps or [], lib_dep_label):`
`90`	`90`	`deps.append(lib_dep_label)`
	`91`	`+ if "resources" in library_attributes:`
	`92`	`+ # Prevent duplicate resources from appearing in classpath`
	`93`	`+ kwargs.pop("resources")`
`91`	`94`
`92`	`95`	`tests = []`
`93`	`96`