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

Merge branch '2.5.x' into 2.6.x 

Closes gh-29817
This commit is contained in:
Andy Wilkinson 2022-02-15 12:24:05 +00:00
parent 64e24a0e11 7f196d33fb
commit f134358c78
3 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java
View File

@ -31,6 +31,7 @@ import org.gradle.api.file.CopySpec;
import org.gradle.api.file.FileCollection; import org.gradle.api.file.FileCollection;
import org.gradle.api.plugins.ApplicationPlugin; import org.gradle.api.plugins.ApplicationPlugin;
import org.gradle.api.plugins.ApplicationPluginConvention; import org.gradle.api.plugins.ApplicationPluginConvention;
import org.gradle.api.tasks.TaskProvider;
import org.gradle.jvm.application.scripts.TemplateBasedScriptGenerator; import org.gradle.jvm.application.scripts.TemplateBasedScriptGenerator;
import org.gradle.jvm.application.tasks.CreateStartScripts; import org.gradle.jvm.application.tasks.CreateStartScripts;
@ -49,12 +50,21 @@ final class ApplicationPluginAction implements PluginApplicationAction {
Distribution distribution = distributions.create("boot"); Distribution distribution = distributions.create("boot");
distribution.getDistributionBaseName() distribution.getDistributionBaseName()
.convention((project.provider(() -> applicationConvention.getApplicationName() + "-boot"))); .convention((project.provider(() -> applicationConvention.getApplicationName() + "-boot")));
CreateStartScripts bootStartScripts = project.getTasks().create("bootStartScripts", CreateStartScripts.class); TaskProvider<CreateStartScripts> bootStartScripts = project.getTasks().register("bootStartScripts",
bootStartScripts CreateStartScripts.class,
(task) -> configureCreateStartScripts(project, applicationConvention, distribution, task));
CopySpec binCopySpec = project.copySpec().into("bin").from(bootStartScripts);
binCopySpec.setFileMode(0755);
distribution.getContents().with(binCopySpec);
}
private void configureCreateStartScripts(Project project, ApplicationPluginConvention applicationConvention,
Distribution distribution, CreateStartScripts createStartScripts) {
createStartScripts
.setDescription("Generates OS-specific start scripts to run the project as a Spring Boot application."); .setDescription("Generates OS-specific start scripts to run the project as a Spring Boot application.");
((TemplateBasedScriptGenerator) bootStartScripts.getUnixStartScriptGenerator()) ((TemplateBasedScriptGenerator) createStartScripts.getUnixStartScriptGenerator())
.setTemplate(project.getResources().getText().fromString(loadResource("/unixStartScript.txt"))); .setTemplate(project.getResources().getText().fromString(loadResource("/unixStartScript.txt")));
((TemplateBasedScriptGenerator) bootStartScripts.getWindowsStartScriptGenerator()) ((TemplateBasedScriptGenerator) createStartScripts.getWindowsStartScriptGenerator())
.setTemplate(project.getResources().getText().fromString(loadResource("/windowsStartScript.txt"))); .setTemplate(project.getResources().getText().fromString(loadResource("/windowsStartScript.txt")));
project.getConfigurations().all((configuration) -> { project.getConfigurations().all((configuration) -> {
if ("bootArchives".equals(configuration.getName())) { if ("bootArchives".equals(configuration.getName())) {
@ -62,16 +72,14 @@ final class ApplicationPluginAction implements PluginApplicationAction {
.from((Callable<FileCollection>) () -> configuration.getArtifacts().getFiles()); .from((Callable<FileCollection>) () -> configuration.getArtifacts().getFiles());
libCopySpec.setFileMode(0644); libCopySpec.setFileMode(0644);
distribution.getContents().with(libCopySpec); distribution.getContents().with(libCopySpec);
bootStartScripts.setClasspath(configuration.getArtifacts().getFiles()); createStartScripts.setClasspath(configuration.getArtifacts().getFiles());
} }
}); });
bootStartScripts.getConventionMapping().map("outputDir", () -> new File(project.getBuildDir(), "bootScripts")); createStartScripts.getConventionMapping().map("outputDir",
bootStartScripts.getConventionMapping().map("applicationName", applicationConvention::getApplicationName); () -> new File(project.getBuildDir(), "bootScripts"));
bootStartScripts.getConventionMapping().map("defaultJvmOpts", createStartScripts.getConventionMapping().map("applicationName", applicationConvention::getApplicationName);
createStartScripts.getConventionMapping().map("defaultJvmOpts",
applicationConvention::getApplicationDefaultJvmArgs); applicationConvention::getApplicationDefaultJvmArgs);
CopySpec binCopySpec = project.copySpec().into("bin").from(bootStartScripts);
binCopySpec.setFileMode(0755);
distribution.getContents().with(binCopySpec);
} }
@Override @Override

17
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/JavaPluginAction.java
View File

@ -167,15 +167,16 @@ final class JavaPluginAction implements PluginApplicationAction {
} }
private void configureUtf8Encoding(Project project) { private void configureUtf8Encoding(Project project) {
project.afterEvaluate((evaluated) -> evaluated.getTasks().withType(JavaCompile.class, (compile) -> { project.afterEvaluate(
if (compile.getOptions().getEncoding() == null) { (evaluated) -> evaluated.getTasks().withType(JavaCompile.class).configureEach((compile) -> {
compile.getOptions().setEncoding("UTF-8"); if (compile.getOptions().getEncoding() == null) {
} compile.getOptions().setEncoding("UTF-8");
})); }
}));
} }
private void configureParametersCompilerArg(Project project) { private void configureParametersCompilerArg(Project project) {
project.getTasks().withType(JavaCompile.class, (compile) -> { project.getTasks().withType(JavaCompile.class).configureEach((compile) -> {
List<String> compilerArgs = compile.getOptions().getCompilerArgs(); List<String> compilerArgs = compile.getOptions().getCompilerArgs();
if (!compilerArgs.contains(PARAMETERS_COMPILER_ARG)) { if (!compilerArgs.contains(PARAMETERS_COMPILER_ARG)) {
compilerArgs.add(PARAMETERS_COMPILER_ARG); compilerArgs.add(PARAMETERS_COMPILER_ARG);
@ -184,8 +185,8 @@ final class JavaPluginAction implements PluginApplicationAction {
} }
private void configureAdditionalMetadataLocations(Project project) { private void configureAdditionalMetadataLocations(Project project) {
project.afterEvaluate((evaluated) -> evaluated.getTasks().withType(JavaCompile.class, project.afterEvaluate((evaluated) -> evaluated.getTasks().withType(JavaCompile.class)
this::configureAdditionalMetadataLocations)); .configureEach(this::configureAdditionalMetadataLocations));
} }
private void configureAdditionalMetadataLocations(JavaCompile compile) { private void configureAdditionalMetadataLocations(JavaCompile compile) {

6
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/KotlinPluginAction.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2021 the original author or authors. * Copyright 2012-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -47,8 +47,8 @@ class KotlinPluginAction implements PluginApplicationAction {
} }
private void enableJavaParametersOption(Project project) { private void enableJavaParametersOption(Project project) {
project.getTasks().withType(KotlinCompile.class, project.getTasks().withType(KotlinCompile.class)
(compile) -> compile.getKotlinOptions().setJavaParameters(true)); .configureEach((compile) -> compile.getKotlinOptions().setJavaParameters(true));
} }
@Override @Override