From f370a3074befed4f6230575a6dfa0c91a6592404 Mon Sep 17 00:00:00 2001
From: Abhinav Tarigoppula <abhinaaavvv07187@gmail.com>
Date: Wed, 5 Aug 2026 18:46:05 +0530
Subject: [PATCH] Fork test-jar to generate-test-sources

TestSourceJarMojo packages test sources but forked only to
generate-sources. Test sources contributed by another plugin bound to
generate-test-sources therefore did not exist yet when the mojo ran, and
were missing from the test-sources jar. TestSourceGeneratedJarMojo, which
packages the same content, already forks to generate-test-sources.

Fork to generate-test-sources. That phase comes later in the default
lifecycle, so everything the previous fork covered is still covered.

The test-jar IT only generated sources in generate-sources, so it passed
either way. Add a generate-test-sources execution mirroring the one the
test-jar-generated IT already uses, and assert its output is in the jar.
---
 src/it/test-jar/pom.xml                             | 13 +++++++++++++
 src/it/test-jar/verify.bsh                          |  1 +
 .../maven/plugins/source/TestSourceJarMojo.java     |  2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/it/test-jar/pom.xml b/src/it/test-jar/pom.xml
index 88fab51..6774e37 100644
--- a/src/it/test-jar/pom.xml
+++ b/src/it/test-jar/pom.xml
@@ -55,6 +55,19 @@
               <testSourceRoot>target/generated-sources/ant</testSourceRoot>
             </configuration>
           </execution>
+          <execution>
+            <id>generate-test-sources</id>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <phase>generate-test-sources</phase>
+            <configuration>
+              <tasks>
+                <touch file="target/generated-sources/ant/generate-test-sources.properties" mkdirs="true" />
+              </tasks>
+              <testSourceRoot>target/generated-sources/ant</testSourceRoot>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>
diff --git a/src/it/test-jar/verify.bsh b/src/it/test-jar/verify.bsh
index 6c35028..bccb711 100644
--- a/src/it/test-jar/verify.bsh
+++ b/src/it/test-jar/verify.bsh
@@ -39,6 +39,7 @@ try
         "MyTest.java",
         "test.properties",
         "generated.properties",
+        "generate-test-sources.properties",
     };
     for ( String included : includedEntries )
     {
diff --git a/src/main/java/org/apache/maven/plugins/source/TestSourceJarMojo.java b/src/main/java/org/apache/maven/plugins/source/TestSourceJarMojo.java
index dd281dd..1976407 100644
--- a/src/main/java/org/apache/maven/plugins/source/TestSourceJarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/source/TestSourceJarMojo.java
@@ -27,7 +27,7 @@
  * @since 2.0.3
  */
 @Mojo(name = "test-jar", defaultPhase = "package")
-@Execute(phase = "generate-sources")
+@Execute(phase = "generate-test-sources")
 public class TestSourceJarMojo extends TestSourceJarNoForkMojo {
     // no op
 }