You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2024/06/13 18:38:22 UTC
(maven-release) 01/01: [MRELEASE-1148] Release Manager pulls in transitive dependencies
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MRELEASE-1148
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 7249d1f69251e8c7ae4cf379f88be802a14d2eed
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Jun 9 17:33:14 2024 +0200
[MRELEASE-1148] Release Manager pulls in transitive dependencies
This closes #219
---
.../maven/shared/release/phase/GenerateReleasePomsPhase.java | 8 +++++++-
.../subproject4/expected-release-pom.xml | 6 ------
.../subproject4/subsubproject/expected-release-pom.xml | 6 ------
3 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
index 1261b254..122a49bd 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
@@ -459,7 +459,7 @@ public class GenerateReleasePomsPhase extends AbstractReleasePomsPhase implement
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 @@ public class GenerateReleasePomsPhase extends AbstractReleasePomsPhase implement
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/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject4/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject4/expected-release-pom.xml
index bf4aba3f..d2309452 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject4/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/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/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject4/subsubproject/expected-release-pom.xml b/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject4/subsubproject/expected-release-pom.xml
index eaa57e88..39fc6b8d 100644
--- a/maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject4/subsubproject/expected-release-pom.xml
+++ b/maven-release-manager/src/test/resources/projects/generate-release-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>