Merge branch '2.3.x' into 2.4.x

Closes gh-26300
This commit is contained in:
Andy Wilkinson 2021-04-29 11:36:15 +01:00
commit 94519c33b1

View File

@ -124,7 +124,8 @@ final class JavaPluginAction implements PluginApplicationAction {
buildImage.setDescription("Builds an OCI image of the application using the output of the bootJar task");
buildImage.setGroup(BasePlugin.BUILD_GROUP);
buildImage.getJar().set(bootJar.get().getArchiveFile());
buildImage.getTargetJavaVersion().set(javaPluginConvention(project).getTargetCompatibility());
buildImage.getTargetJavaVersion()
.set(project.provider(() -> javaPluginConvention(project).getTargetCompatibility()));
});
}