Merge branch '2.4.x' into 2.5.x

See gh-27045

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

@@ -170,7 +170,7 @@ public class BomPlugin implements Plugin<Project> {
 						plugin.appendNode("artifactId", pluginName);
 						String versionProperty = library.getVersionProperty();
 						String value = (versionProperty != null) ? "${" + versionProperty + "}"
-								: library.getVersion().toString();
+								: library.getVersion().getVersion().toString();
 						plugin.appendNode("version", value);
 					}
 				}