Don't pull in transitive artifacts

With apache/maven-resolver@f31b36e MavenProject#getArtifacts() now contains all (incl. transitive) deps. Use direct deps only otherwise it will even pull in trans test ones.
apache · Jun 9, 2024 · d456cbe · d456cbe
1 parent 9a3d9a5
commit d456cbe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/...manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java b/...manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
@@ -459,7 +459,7 @@ private Scm createReleaseScm(Scm scm, ScmTranslator scmTranslator, ReleaseDescri
 
     private List<Dependency> createReleaseDependencies(ReleaseDescriptor releaseDescriptor, MavenProject project)
             throws ReleaseFailureException {
-        Set<Artifact> artifacts = project.getArtifacts();
+        Set<Artifact> artifacts = project.getDependencyArtifacts();
 
         List<Dependency> releaseDependencies = null;
 
@@ -471,6 +471,12 @@ private List<Dependency> createReleaseDependencies(ReleaseDescriptor releaseDesc
             releaseDependencies = new ArrayList<>();
 
             for (Artifact artifact : orderedArtifacts) {
+                if (artifact.getVersion() == null) {
+                    artifact.setVersion(project.getArtifactMap()
+                            .get(ArtifactUtils.versionlessKey(artifact))
+                            .getVersion());
+                }
+
                 Dependency releaseDependency = new Dependency();
 
                 releaseDependency.setGroupId(artifact.getGroupId());

diff --git a/...generate-release-poms/internal-snapshot-dependencies/subproject4/expected-release-pom.xml b/...generate-release-poms/internal-snapshot-dependencies/subproject4/expected-release-pom.xml
@@ -68,12 +68,6 @@ under the License.
     </pluginRepository>
   </pluginRepositories>
   <dependencies>
-    <dependency>
-      <groupId>groupId</groupId>
-      <artifactId>subproject1</artifactId>
-      <version>1.0</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>groupId</groupId>
       <artifactId>subproject2</artifactId>

diff --git a/...se-poms/internal-snapshot-dependencies/subproject4/subsubproject/expected-release-pom.xml b/...se-poms/internal-snapshot-dependencies/subproject4/subsubproject/expected-release-pom.xml
@@ -64,12 +64,6 @@ under the License.
     </pluginRepository>
   </pluginRepositories>
   <dependencies>
-    <dependency>
-      <groupId>groupId</groupId>
-      <artifactId>subproject1</artifactId>
-      <version>1.0</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>groupId</groupId>
       <artifactId>subproject2</artifactId>