mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.4.x'
Closes gh-26278
This commit is contained in:
commit
03149eda9e
@ -29,6 +29,7 @@ import org.asciidoctor.gradle.jvm.AsciidoctorTask;
|
|||||||
import org.gradle.api.Project;
|
import org.gradle.api.Project;
|
||||||
import org.gradle.api.artifacts.Configuration;
|
import org.gradle.api.artifacts.Configuration;
|
||||||
import org.gradle.api.artifacts.ConfigurationContainer;
|
import org.gradle.api.artifacts.ConfigurationContainer;
|
||||||
|
import org.gradle.api.tasks.PathSensitivity;
|
||||||
import org.gradle.api.tasks.Sync;
|
import org.gradle.api.tasks.Sync;
|
||||||
|
|
||||||
import org.springframework.boot.build.artifactory.ArtifactoryRepository;
|
import org.springframework.boot.build.artifactory.ArtifactoryRepository;
|
||||||
@ -139,7 +140,8 @@ class AsciidoctorConventions {
|
|||||||
syncDocumentationSource.setDestinationDir(syncedSource);
|
syncDocumentationSource.setDestinationDir(syncedSource);
|
||||||
syncDocumentationSource.from("src/docs/");
|
syncDocumentationSource.from("src/docs/");
|
||||||
asciidoctorTask.dependsOn(syncDocumentationSource);
|
asciidoctorTask.dependsOn(syncDocumentationSource);
|
||||||
asciidoctorTask.getInputs().dir(syncedSource);
|
asciidoctorTask.getInputs().dir(syncedSource).withPathSensitivity(PathSensitivity.RELATIVE)
|
||||||
|
.withPropertyName("synced source");
|
||||||
asciidoctorTask.setSourceDir(project.relativePath(new File(syncedSource, "asciidoc/")));
|
asciidoctorTask.setSourceDir(project.relativePath(new File(syncedSource, "asciidoc/")));
|
||||||
return syncDocumentationSource;
|
return syncDocumentationSource;
|
||||||
}
|
}
|
||||||
|
@ -31,6 +31,7 @@ import java.util.concurrent.Callable;
|
|||||||
import org.gradle.api.DefaultTask;
|
import org.gradle.api.DefaultTask;
|
||||||
import org.gradle.api.Task;
|
import org.gradle.api.Task;
|
||||||
import org.gradle.api.tasks.OutputFile;
|
import org.gradle.api.tasks.OutputFile;
|
||||||
|
import org.gradle.api.tasks.PathSensitivity;
|
||||||
import org.gradle.api.tasks.SourceSet;
|
import org.gradle.api.tasks.SourceSet;
|
||||||
import org.gradle.api.tasks.TaskAction;
|
import org.gradle.api.tasks.TaskAction;
|
||||||
|
|
||||||
@ -52,8 +53,10 @@ public class AutoConfigurationMetadata extends DefaultTask {
|
|||||||
private File outputFile;
|
private File outputFile;
|
||||||
|
|
||||||
public AutoConfigurationMetadata() {
|
public AutoConfigurationMetadata() {
|
||||||
getInputs().file((Callable<File>) () -> new File(this.sourceSet.getOutput().getResourcesDir(),
|
getInputs()
|
||||||
"META-INF/spring.factories"));
|
.file((Callable<File>) () -> new File(this.sourceSet.getOutput().getResourcesDir(),
|
||||||
|
"META-INF/spring.factories"))
|
||||||
|
.withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("spring.factories");
|
||||||
dependsOn((Callable<String>) () -> this.sourceSet.getProcessResourcesTaskName());
|
dependsOn((Callable<String>) () -> this.sourceSet.getProcessResourcesTaskName());
|
||||||
getProject().getConfigurations()
|
getProject().getConfigurations()
|
||||||
.maybeCreate(AutoConfigurationPlugin.AUTO_CONFIGURATION_METADATA_CONFIGURATION_NAME);
|
.maybeCreate(AutoConfigurationPlugin.AUTO_CONFIGURATION_METADATA_CONFIGURATION_NAME);
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2020 the original author or authors.
|
* Copyright 2012-2021 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.
|
||||||
@ -27,6 +27,7 @@ import org.gradle.api.Task;
|
|||||||
import org.gradle.api.artifacts.Configuration;
|
import org.gradle.api.artifacts.Configuration;
|
||||||
import org.gradle.api.plugins.JavaPlugin;
|
import org.gradle.api.plugins.JavaPlugin;
|
||||||
import org.gradle.api.plugins.JavaPluginConvention;
|
import org.gradle.api.plugins.JavaPluginConvention;
|
||||||
|
import org.gradle.api.tasks.PathSensitivity;
|
||||||
import org.gradle.api.tasks.SourceSet;
|
import org.gradle.api.tasks.SourceSet;
|
||||||
import org.gradle.api.tasks.compile.JavaCompile;
|
import org.gradle.api.tasks.compile.JavaCompile;
|
||||||
|
|
||||||
@ -87,7 +88,8 @@ public class ConfigurationPropertiesPlugin implements Plugin<Project> {
|
|||||||
private void configureAdditionalMetadataLocationsCompilerArgument(Project project) {
|
private void configureAdditionalMetadataLocationsCompilerArgument(Project project) {
|
||||||
JavaCompile compileJava = project.getTasks().withType(JavaCompile.class)
|
JavaCompile compileJava = project.getTasks().withType(JavaCompile.class)
|
||||||
.getByName(JavaPlugin.COMPILE_JAVA_TASK_NAME);
|
.getByName(JavaPlugin.COMPILE_JAVA_TASK_NAME);
|
||||||
((Task) compileJava).getInputs().files(project.getTasks().getByName(JavaPlugin.PROCESS_RESOURCES_TASK_NAME));
|
((Task) compileJava).getInputs().files(project.getTasks().getByName(JavaPlugin.PROCESS_RESOURCES_TASK_NAME))
|
||||||
|
.withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("processed resources");
|
||||||
SourceSet mainSourceSet = project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets()
|
SourceSet mainSourceSet = project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets()
|
||||||
.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
|
.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
|
||||||
compileJava.getOptions().getCompilerArgs()
|
compileJava.getOptions().getCompilerArgs()
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2020 the original author or authors.
|
* Copyright 2012-2021 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.
|
||||||
@ -51,7 +51,8 @@ public class MavenExec extends JavaExec {
|
|||||||
|
|
||||||
public void setProjectDir(File projectDir) {
|
public void setProjectDir(File projectDir) {
|
||||||
this.projectDir = projectDir;
|
this.projectDir = projectDir;
|
||||||
getInputs().file(new File(projectDir, "pom.xml")).withPathSensitivity(PathSensitivity.RELATIVE);
|
getInputs().file(new File(projectDir, "pom.xml")).withPathSensitivity(PathSensitivity.RELATIVE)
|
||||||
|
.withPropertyName("pom");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2019-2020 the original author or authors.
|
* Copyright 2019-2021 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.
|
||||||
@ -50,6 +50,7 @@ import org.gradle.api.tasks.Classpath;
|
|||||||
import org.gradle.api.tasks.Copy;
|
import org.gradle.api.tasks.Copy;
|
||||||
import org.gradle.api.tasks.JavaExec;
|
import org.gradle.api.tasks.JavaExec;
|
||||||
import org.gradle.api.tasks.OutputDirectory;
|
import org.gradle.api.tasks.OutputDirectory;
|
||||||
|
import org.gradle.api.tasks.PathSensitivity;
|
||||||
import org.gradle.api.tasks.SourceSet;
|
import org.gradle.api.tasks.SourceSet;
|
||||||
import org.gradle.api.tasks.SourceSetContainer;
|
import org.gradle.api.tasks.SourceSetContainer;
|
||||||
import org.gradle.api.tasks.TaskAction;
|
import org.gradle.api.tasks.TaskAction;
|
||||||
@ -211,7 +212,8 @@ public class MavenPluginPlugin implements Plugin<Project> {
|
|||||||
MavenExec generatePluginDescriptor = project.getTasks().create("generatePluginDescriptor", MavenExec.class);
|
MavenExec generatePluginDescriptor = project.getTasks().create("generatePluginDescriptor", MavenExec.class);
|
||||||
generatePluginDescriptor.args("org.apache.maven.plugins:maven-plugin-plugin:3.6.0:descriptor");
|
generatePluginDescriptor.args("org.apache.maven.plugins:maven-plugin-plugin:3.6.0:descriptor");
|
||||||
generatePluginDescriptor.getOutputs().dir(new File(mavenDir, "target/classes/META-INF/maven"));
|
generatePluginDescriptor.getOutputs().dir(new File(mavenDir, "target/classes/META-INF/maven"));
|
||||||
generatePluginDescriptor.getInputs().dir(new File(mavenDir, "target/classes/org"));
|
generatePluginDescriptor.getInputs().dir(new File(mavenDir, "target/classes/org"))
|
||||||
|
.withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("plugin classes");
|
||||||
generatePluginDescriptor.setProjectDir(mavenDir);
|
generatePluginDescriptor.setProjectDir(mavenDir);
|
||||||
return generatePluginDescriptor;
|
return generatePluginDescriptor;
|
||||||
}
|
}
|
||||||
@ -243,7 +245,8 @@ public class MavenPluginPlugin implements Plugin<Project> {
|
|||||||
|
|
||||||
void setGenerator(Task generator) {
|
void setGenerator(Task generator) {
|
||||||
this.generator = generator;
|
this.generator = generator;
|
||||||
getInputs().files(this.generator);
|
getInputs().files(this.generator).withPathSensitivity(PathSensitivity.RELATIVE)
|
||||||
|
.withPropertyName("generated source");
|
||||||
}
|
}
|
||||||
|
|
||||||
@OutputDirectory
|
@OutputDirectory
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2020 the original author or authors.
|
* Copyright 2012-2021 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.
|
||||||
@ -64,9 +64,9 @@ public class TestSliceMetadata extends DefaultTask {
|
|||||||
|
|
||||||
public TestSliceMetadata() {
|
public TestSliceMetadata() {
|
||||||
getInputs().dir((Callable<File>) () -> this.sourceSet.getOutput().getResourcesDir())
|
getInputs().dir((Callable<File>) () -> this.sourceSet.getOutput().getResourcesDir())
|
||||||
.withPathSensitivity(PathSensitivity.RELATIVE);
|
.withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("resources");
|
||||||
getInputs().files((Callable<FileCollection>) () -> this.sourceSet.getOutput().getClassesDirs())
|
getInputs().files((Callable<FileCollection>) () -> this.sourceSet.getOutput().getClassesDirs())
|
||||||
.withPathSensitivity(PathSensitivity.RELATIVE);
|
.withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("classes");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setSourceSet(SourceSet sourceSet) {
|
public void setSourceSet(SourceSet sourceSet) {
|
||||||
|
Loading…
Reference in New Issue
Block a user