Skip to content

Commit 00dfc80

Browse files
authored
Fixed regression with #2049 (maven CI-friendly versions) (#2159)
1 parent 3e7ac50 commit 00dfc80

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

rewrite-maven/src/main/java/org/openrewrite/maven/internal/MavenPomDownloader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public Pom download(GroupArtifactVersion gav,
202202
for (Pom projectPom : projectPoms.values()) {
203203
if (gav.getGroupId().equals(projectPom.getGroupId()) &&
204204
gav.getArtifactId().equals(projectPom.getArtifactId()) &&
205-
gav.getVersion().equals(projectPom.getVersion())) {
205+
Objects.equals(projectPom.getValue(projectPom.getVersion()), projectPom.getValue(gav.getVersion()))) {
206206
return projectPom;
207207
}
208208
}

rewrite-maven/src/main/java/org/openrewrite/maven/tree/Pom.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,12 @@ public ResolvedPom resolve(Iterable<String> activeProfiles, MavenPomDownloader d
9696
return new ResolvedPom(this, activeProfiles, emptyMap(), emptyList(), initialRepositories, emptyList(), emptyList()).resolve(ctx, downloader);
9797
}
9898

99+
@Nullable
100+
public String getValue(@Nullable String value) {
101+
if (value == null) {
102+
return null;
103+
}
104+
return ResolvedPom.placeholderHelper.replacePlaceholders(value, this.properties::get);
105+
}
106+
99107
}

rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedPom.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
@Getter
4646
public class ResolvedPom {
4747

48-
private static final PropertyPlaceholderHelper placeholderHelper = new PropertyPlaceholderHelper("${", "}", null);
48+
public static final PropertyPlaceholderHelper placeholderHelper = new PropertyPlaceholderHelper("${", "}", null);
4949

5050
// https://maven.apache.org/ref/3.6.3/maven-model-builder/super-pom.html
5151
private static final ResolvedPom SUPER_POM = new ResolvedPom(

0 commit comments

Comments
 (0)