Skip to content

Fixed situation where a changing a managed dependency that does not have an explicit version tag would fail to add a version tag when providing the newVersion option. #6105

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+148 −0
Draft

Fixed situation where a changing a managed dependency that does not have an explicit version tag would fail to add a version tag when providing the newVersion option. #6105

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
4 changes: 4 additions & 0 deletions ...aven/src/main/java/org/openrewrite/maven/ChangeManagedDependencyGroupIdAndArtifactId.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.openrewrite.maven.tree.ResolvedPom;
import org.openrewrite.semver.Semver;
import org.openrewrite.semver.VersionComparator;
import org.openrewrite.xml.AddToTagVisitor;
import org.openrewrite.xml.RemoveContentVisitor;
import org.openrewrite.xml.tree.Xml;

Expand Down Expand Up @@ -160,6 +161,9 @@ public Xml.Tag visitTag(Xml.Tag tag, ExecutionContext ctx) {
}
String resolvedNewVersion = resolveSemverVersion(ctx, newGroupId, resolvedArtifactId, getResolutionResult().getPom().getValue(versionTag.get().getValue().orElse(null)));
t = changeChildTagValue(t, "version", resolvedNewVersion, ctx);
} else {
Xml.Tag newChild = Xml.Tag.build("<version>" + newVersion + "</version>");
t = (Xml.Tag) new AddToTagVisitor<ExecutionContext>(t, newChild, new MavenTagInsertionComparator(t.getChildren())).visitNonNull(t, ctx, getCursor().getParentOrThrow());
}
} catch (MavenDownloadingException e) {
return e.warn(t);
Expand Down
72 changes: 72 additions & 0 deletions ...e-maven/src/test/java/org/openrewrite/maven/ChangeDependencyGroupIdAndArtifactIdTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,78 @@ void changeManagedDependencyGroupIdAndArtifactIdAndVersion() {
);
}

@Test
void doesNotAddVersionNumberTagToDirectDependencyIfAbleToOnManagedDependency() {
rewriteRun(
spec -> spec.recipe(
new ChangeDependencyGroupIdAndArtifactId(
"com.fasterxml.jackson.core",
"jackson-core",
"org.apache.commons",
"commons-csv",
"1.14.1",
null
)
),
//language=xml
pomXml(
"""
<project>
<groupId>com.example</groupId>
<artifactId>project</artifactId>
<version>1</version>
<parent>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.20.0</version>
</parent>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
</dependencies>
</project>
""",
"""
<project>
<groupId>com.example</groupId>
<artifactId>project</artifactId>
<version>1</version>
<parent>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.20.0</version>
</parent>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.14.1</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
</dependency>
</dependencies>
</project>
"""
)
);
}

@Test
void changeProfileManagedDependencyGroupIdAndArtifactId() {
rewriteRun(
Expand Down
72 changes: 72 additions & 0 deletions .../src/test/java/org/openrewrite/maven/ChangeManagedDependencyGroupIdAndArtifactIdTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,78 @@ void changeManagedDependencyWithPropertyVersion() {
);
}

@Test
void changeManagedDependencyMissingExplicitVersion() {
rewriteRun(
spec -> spec.recipe(
new ChangeManagedDependencyGroupIdAndArtifactId(
"com.fasterxml.jackson.core",
"jackson-core",
"org.apache.commons",
"commons-csv",
"1.14.1",
null
)
),
//language=xml
pomXml(
"""
<project>
<groupId>com.example</groupId>
<artifactId>project</artifactId>
<version>1</version>
<parent>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.20.0</version>
</parent>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
</dependencies>
</project>
""",
"""
<project>
<groupId>com.example</groupId>
<artifactId>project</artifactId>
<version>1</version>
<parent>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.20.0</version>
</parent>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.14.1</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
</dependencies>
</project>
"""
)
);
}

@Test
void latestPatchMangedDependency() {
rewriteRun(
Expand Down
Loading