Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MRELEASE-1148] Release Manage pulls in transitive dependencies #219

Merged
merged 1 commit into from
Jun 13, 2024
Merged

[MRELEASE-1148] Release Manage pulls in transitive dependencies #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion ...manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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());
Expand Down
6 changes: 0 additions & 6 deletions ...generate-release-poms/internal-snapshot-dependencies/subproject4/expected-release-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 0 additions & 6 deletions ...se-poms/internal-snapshot-dependencies/subproject4/subsubproject/expected-release-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down