Skip to content

Commit 7249d1f

Browse files
committed
[MRELEASE-1148] Release Manager pulls in transitive dependencies
This closes #219
1 parent 2142c9e commit 7249d1f

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ private Scm createReleaseScm(Scm scm, ScmTranslator scmTranslator, ReleaseDescri
459459

460460
private List<Dependency> createReleaseDependencies(ReleaseDescriptor releaseDescriptor, MavenProject project)
461461
throws ReleaseFailureException {
462-
Set<Artifact> artifacts = project.getArtifacts();
462+
Set<Artifact> artifacts = project.getDependencyArtifacts();
463463

464464
List<Dependency> releaseDependencies = null;
465465

@@ -471,6 +471,12 @@ private List<Dependency> createReleaseDependencies(ReleaseDescriptor releaseDesc
471471
releaseDependencies = new ArrayList<>();
472472

473473
for (Artifact artifact : orderedArtifacts) {
474+
if (artifact.getVersion() == null) {
475+
artifact.setVersion(project.getArtifactMap()
476+
.get(ArtifactUtils.versionlessKey(artifact))
477+
.getVersion());
478+
}
479+
474480
Dependency releaseDependency = new Dependency();
475481

476482
releaseDependency.setGroupId(artifact.getGroupId());

maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject4/expected-release-pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,6 @@ under the License.
6868
</pluginRepository>
6969
</pluginRepositories>
7070
<dependencies>
71-
<dependency>
72-
<groupId>groupId</groupId>
73-
<artifactId>subproject1</artifactId>
74-
<version>1.0</version>
75-
<scope>compile</scope>
76-
</dependency>
7771
<dependency>
7872
<groupId>groupId</groupId>
7973
<artifactId>subproject2</artifactId>

maven-release-manager/src/test/resources/projects/generate-release-poms/internal-snapshot-dependencies/subproject4/subsubproject/expected-release-pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,6 @@ under the License.
6464
</pluginRepository>
6565
</pluginRepositories>
6666
<dependencies>
67-
<dependency>
68-
<groupId>groupId</groupId>
69-
<artifactId>subproject1</artifactId>
70-
<version>1.0</version>
71-
<scope>compile</scope>
72-
</dependency>
7367
<dependency>
7468
<groupId>groupId</groupId>
7569
<artifactId>subproject2</artifactId>

0 commit comments

Comments
 (0)