Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.3.x'

Browse Source 
Closes gh-22066
This commit is contained in:
Andy Wilkinson
2020-06-23 10:44:46 +01:00
parent efe84356b7 12d3f14e15
commit 4c0d2686ad
2 changed files with 159 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
buildSrc/src/main/java/org/springframework/boot/build/bom/BomPlugin.java
View File

@@ -185,8 +185,10 @@ public class BomPlugin implements Plugin<Project> {
for (Node dependency : findChildren(dependencies, "dependency")) {
String groupId = findChild(dependency, "groupId").text();
String artifactId = findChild(dependency, "artifactId").text();
findChild(dependency, "version")
.setValue("${" + this.bom.getArtifactVersionProperty(groupId, artifactId) + "}");
String versionProperty = this.bom.getArtifactVersionProperty(groupId, artifactId);
if (versionProperty != null) {
findChild(dependency, "version").setValue("${" + versionProperty + "}");
}
}
}
}