Skip to content

AddDependency: tests showing version update inconsistency with test sources #6963

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
Jenson3210 wants to merge 2 commits into
base: main
Choose a base branch
from
+97 −5
Draft

AddDependency: tests showing version update inconsistency with test sources #6963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b29d8e3
Add tests showing AddDependency version update inconsistency between …
Jenson3210 Mar 12, 2026
431fa07
Fix AddDependency not updating version when only test sources are pre…
Jenson3210 Mar 30, 2026
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
18 changes: 13 additions & 5 deletions rewrite-maven/src/main/java/org/openrewrite/maven/AddDependency.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,16 @@ public Xml visitDocument(Xml.Document document, ExecutionContext ctx) {
for (ResolvedDependency d : dependencies.get(Scope.Compile)) {
if (hasAcceptableTransitivity(d, acc) &&
groupId.equals(d.getGroupId()) &&
artifactId.equals(d.getArtifactId()) &&
(d.isTransitive() ||
(d.isDirect() && version.equals(d.getVersion())))
) {
artifactId.equals(d.getArtifactId())) {
if (d.isTransitive() || (d.isDirect() && version.equals(d.getVersion()))) {
return maven;
}
if (d.isDirect() && (scope == null || Scope.fromName(scope) == Scope.Compile)) {
// Direct compile-scope dependency at a different version — update keeping compile scope
return new AddDependencyVisitor(
groupId, artifactId, version, versionPattern, null, releasesOnly,
type, classifier, optional, familyPatternCompiled, metadataFailures).visitNonNull(document, ctx);
}
return maven;
}
}
Expand All @@ -243,7 +249,9 @@ public Xml visitDocument(Xml.Document document, ExecutionContext ctx) {
if ((resolvedScopeEnum == Scope.Provided || resolvedScopeEnum == Scope.Test) && dependencies.get(resolvedScopeEnum) != null) {
for (ResolvedDependency d : dependencies.get(resolvedScopeEnum)) {
if (hasAcceptableTransitivity(d, acc) &&
groupId.equals(d.getGroupId()) && artifactId.equals(d.getArtifactId())) {
groupId.equals(d.getGroupId()) && artifactId.equals(d.getArtifactId()) &&
(d.isTransitive() ||
(d.isDirect() && version.equals(d.getVersion())))) {
return maven;
}
}
Expand Down
84 changes: 84 additions & 0 deletions rewrite-maven/src/test/java/org/openrewrite/maven/AddDependencyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2261,6 +2261,90 @@ void addDependencyUpgradesScopeOnlyWhenExistingDependencyHasNarrowerScopeAndEqua
);
}

@Test
void existingDependencyUpdatedWithMainSources() {
rewriteRun(
spec -> spec.recipe(addDependency("com.google.guava:guava:30.0-jre", null)),
mavenProject("project",
srcMainJava(
java("public class A {}")
),
pomXml(
"""
<project>
<groupId>com.mycompany.app</groupId>
<artifactId>my-app</artifactId>
<version>1</version>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>29.0-jre</version>
</dependency>
</dependencies>
</project>
""",
"""
<project>
<groupId>com.mycompany.app</groupId>
<artifactId>my-app</artifactId>
<version>1</version>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>30.0-jre</version>
</dependency>
</dependencies>
</project>
"""
)
)
);
}

@Test
void existingDependencyUpdatedWithTestSourcesOnly() {
rewriteRun(
spec -> spec.recipe(addDependency("com.google.guava:guava:30.0-jre", null)),
mavenProject("project",
srcTestJava(
java("public class A {}")
),
pomXml(
"""
<project>
<groupId>com.mycompany.app</groupId>
<artifactId>my-app</artifactId>
<version>1</version>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>29.0-jre</version>
</dependency>
</dependencies>
</project>
""",
"""
<project>
<groupId>com.mycompany.app</groupId>
<artifactId>my-app</artifactId>
<version>1</version>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>30.0-jre</version>
</dependency>
</dependencies>
</project>
"""
)
)
);
}

private AddDependency addDependency(@SuppressWarnings("SameParameterValue") String gav) {
return addDependency(gav, null, null, null);
}
Expand Down