Remove merged Jars from classpath even if they are (automatic) modules

Fixes #50

Author: jjohannes

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Extra Java Module Info Gradle Plugin - Changelog
 
+## Version 1.4.1
+* [Fixed] [#50](https://github.com/gradlex-org/extra-java-module-info/issues/50) Remove merged Jars from classpath even if they are (automatic) modules
+
 ## Version 1.4
 * [New] Minimal Gradle version is now 6.8 for integration with recently added features like the Dependency Version Catalog
 * [New] [#46](https://github.com/gradlex-org/extra-java-module-info/issues/46) - Validation coordinates and module names

src/main/java/org/gradlex/javamodule/moduleinfo/ExtraJavaModuleInfoTransform.java

@@ -104,6 +104,10 @@ public void transform(TransformOutputs outputs) {
 
         ModuleSpec moduleSpec = findModuleSpec(originalJar);
 
+        if (willBeMerged(originalJar, moduleSpecs.values())) {  // No output if this Jar will be merged
+            return;
+        }
+
         if (moduleSpec instanceof ModuleInfo) {
             addModuleDescriptor(originalJar, getModuleJar(outputs, originalJar), (ModuleInfo) moduleSpec);
         } else if (moduleSpec instanceof AutomaticModuleName) {
@@ -112,7 +116,7 @@ public void transform(TransformOutputs outputs) {
             outputs.file(originalJar);
         } else if (isAutoModule(originalJar)) {
             outputs.file(originalJar);
-        } else if (!willBeMerged(originalJar, moduleSpecs.values())) { // No output if this Jar will be merged
+        } else {
             if (getParameters().getFailOnMissingModuleInfo().get()) {
                 throw new RuntimeException("Not a module and no mapping defined: " + originalJar.getName());
             } else {

src/test/groovy/org/gradlex/javamodule/moduleinfo/test/EdgeCasesFunctionalTest.groovy

@@ -98,4 +98,45 @@ class EdgeCasesFunctionalTest extends Specification {
         !result.output.contains('qpid-broker-plugins-management-http-9.0.0.jar')
     }
 
+    def "can merge jars that are already modules"() {
+        given:
+        file("src/main/java/org/gradle/sample/app/Main.java") << """
+            package org.gradle.sample.app;
+            
+            public class Main {
+                public static void main(String[] args) throws Exception {
+                }
+            }
+        """
+        file("src/main/java/module-info.java") << """
+            module org.gradle.sample.app {
+                requires java.annotation;
+            }
+        """
+        buildFile << """                  
+            dependencies {
+                implementation("com.google.code.findbugs:jsr305:3.0.2")
+                implementation("javax.annotation:javax.annotation-api:1.3.2")
+            }
+            
+            extraJavaModuleInfo {
+                module("com.google.code.findbugs:jsr305", "java.annotation") {
+                    mergeJar("javax.annotation:javax.annotation-api")
+                    exports("javax.annotation")
+                    exports("javax.annotation.concurrent")
+                    exports("javax.annotation.meta")
+                }
+            }
+            
+            tasks.named("run") {
+                doLast { println(configurations.runtimeClasspath.get().files.map { it.name }) }
+            }
+        """
+
+        when:
+        def result = run()
+
+        then:
+        result.output.contains('[jsr305-3.0.2-module.jar]')
+    }
 }