Merge branch '2.4.x' into 2.5.x

wilkinsona · wilkinsona · commit 5139c79c4f94 · 2021-06-23T19:51:40.000+01:00
See gh-27045
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/BomPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/BomPlugin.java
@@ -170,7 +170,7 @@ private void addPluginManagement(Node projectNode) {
 						plugin.appendNode("artifactId", pluginName);
 						String versionProperty = library.getVersionProperty();
 						String value = (versionProperty != null) ? "${" + versionProperty + "}"
-								: library.getVersion().toString();
+								: library.getVersion().getVersion().toString();
 						plugin.appendNode("version", value);
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ private void addPluginManagement(Node projectNode) {`
`170`	`170`	`plugin.appendNode("artifactId", pluginName);`
`171`	`171`	`String versionProperty = library.getVersionProperty();`
`172`	`172`	`String value = (versionProperty != null) ? "${" + versionProperty + "}"`
`173`		`- : library.getVersion().toString();`
	`173`	`+ : library.getVersion().getVersion().toString();`
`174`	`174`	`plugin.appendNode("version", value);`
`175`	`175`	`}`
`176`	`176`	`}`