Revert "Fix sources goal for multimodule projects"

This reverts commit 0bb4c59.
apache · Jun 7, 2024 · 9fd4ed5 · 9fd4ed5
1 parent fd17de4
commit 9fd4ed5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 105 deletions.
diff --git a/src/it/projects/sources/module-a/pom.xml b/src/it/projects/sources/module-a/pom.xml
diff --git a/src/it/projects/sources/module-b/pom.xml b/src/it/projects/sources/module-b/pom.xml
diff --git a/src/it/projects/sources/pom.xml b/src/it/projects/sources/pom.xml
@@ -24,22 +24,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.its.dependency</groupId>
-  <artifactId>tree-multimodule</artifactId>
+  <artifactId>test</artifactId>
   <version>1.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
 
-  <name>MultimoduleTest</name>
+  <name>Test</name>
   <description>
-    Test dependency:tree on multimodule project
+    Test dependency:sources
   </description>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
-  <modules>
-    <module>module-a</module>
-    <module>module-b</module>
-  </modules>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-project</artifactId>
+      <version>2.0.8</version>
+    </dependency>
+  </dependencies>
 
 </project>
diff --git a/...main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependencySourcesMojo.java b/...main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependencySourcesMojo.java
@@ -32,7 +32,7 @@
 @Mojo(
         name = "sources",
         defaultPhase = LifecyclePhase.GENERATE_SOURCES,
-        requiresDependencyCollection = ResolutionScope.TEST,
+        requiresDependencyResolution = ResolutionScope.TEST,
         threadSafe = true)
 public class ResolveDependencySourcesMojo extends ResolveDependenciesMojo {