root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge pull request #23435 from celcius112 

* gh-23435:
  Configure the bootBuildInfo task lazily

Closes gh-23435
This commit is contained in:
Andy Wilkinson 2020-09-28 11:21:05 +01:00
parent ad6de10f14 e95bcfac34
commit abfed6e0a7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java
View File

@ -96,16 +96,16 @@ public class SpringBootExtension {
TaskProvider<BuildInfo> bootBuildInfo = tasks.register("bootBuildInfo", BuildInfo.class, TaskProvider<BuildInfo> bootBuildInfo = tasks.register("bootBuildInfo", BuildInfo.class,
this::configureBuildInfoTask); this::configureBuildInfoTask);
this.project.getPlugins().withType(JavaPlugin.class, (plugin) -> { this.project.getPlugins().withType(JavaPlugin.class, (plugin) -> {
tasks.getByName(JavaPlugin.CLASSES_TASK_NAME).dependsOn(bootBuildInfo.get()); tasks.named(JavaPlugin.CLASSES_TASK_NAME).configure((task) -> task.dependsOn(bootBuildInfo));
this.project.afterEvaluate((evaluated) -> { this.project.afterEvaluate((evaluated) -> bootBuildInfo.configure((buildInfo) -> {
BuildInfoProperties properties = bootBuildInfo.get().getProperties(); BuildInfoProperties properties = buildInfo.getProperties();
if (properties.getArtifact() == null) { if (properties.getArtifact() == null) {
properties.setArtifact(determineArtifactBaseName()); properties.setArtifact(determineArtifactBaseName());
} }
}); }));
}); });
if (configurer != null) { if (configurer != null) {
configurer.execute(bootBuildInfo.get()); bootBuildInfo.configure(configurer);
} }
} }