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 branch '2.3.x' 

Closes gh-22363
This commit is contained in:
Andy Wilkinson 2020-07-16 16:10:08 +01:00
parent e03ac4bed6 e080dcf8a4
commit 1f27644e9d
6 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/java/org/springframework/boot/build/cli/AbstractPackageManagerDefinitionTask.java
View File

@ -27,6 +27,8 @@ import org.gradle.api.file.RegularFile;
import org.gradle.api.provider.Provider; import org.gradle.api.provider.Provider;
import org.gradle.api.tasks.InputFile; import org.gradle.api.tasks.InputFile;
import org.gradle.api.tasks.OutputDirectory; import org.gradle.api.tasks.OutputDirectory;
import org.gradle.api.tasks.PathSensitive;
import org.gradle.api.tasks.PathSensitivity;
import org.gradle.api.tasks.TaskExecutionException; import org.gradle.api.tasks.TaskExecutionException;
import org.springframework.boot.build.artifactory.ArtifactoryRepository; import org.springframework.boot.build.artifactory.ArtifactoryRepository;
@ -50,6 +52,7 @@ public abstract class AbstractPackageManagerDefinitionTask extends DefaultTask {
} }
@InputFile @InputFile
@PathSensitive(PathSensitivity.RELATIVE)
public RegularFile getArchive() { public RegularFile getArchive() {
return this.archive.get(); return this.archive.get();
} }
@ -59,6 +62,7 @@ public abstract class AbstractPackageManagerDefinitionTask extends DefaultTask {
} }
@InputFile @InputFile
@PathSensitive(PathSensitivity.RELATIVE)
public File getTemplate() { public File getTemplate() {
return this.template; return this.template;
} }

3
buildSrc/src/main/java/org/springframework/boot/build/context/properties/DocumentConfigurationProperties.java
View File

@ -24,6 +24,8 @@ import org.gradle.api.Task;
import org.gradle.api.file.FileCollection; import org.gradle.api.file.FileCollection;
import org.gradle.api.tasks.InputFiles; import org.gradle.api.tasks.InputFiles;
import org.gradle.api.tasks.OutputDirectory; import org.gradle.api.tasks.OutputDirectory;
import org.gradle.api.tasks.PathSensitive;
import org.gradle.api.tasks.PathSensitivity;
import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.TaskAction;
import org.springframework.boot.build.context.properties.DocumentOptions.Builder; import org.springframework.boot.build.context.properties.DocumentOptions.Builder;
@ -40,6 +42,7 @@ public class DocumentConfigurationProperties extends DefaultTask {
private File outputDir; private File outputDir;
@InputFiles @InputFiles
@PathSensitive(PathSensitivity.RELATIVE)
public FileCollection getConfigurationPropertyMetadata() { public FileCollection getConfigurationPropertyMetadata() {
return this.configurationPropertyMetadata; return this.configurationPropertyMetadata;
} }

3
buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenExec.java
View File

@ -26,6 +26,7 @@ import org.gradle.api.Task;
import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.Configuration;
import org.gradle.api.tasks.Internal; import org.gradle.api.tasks.Internal;
import org.gradle.api.tasks.JavaExec; import org.gradle.api.tasks.JavaExec;
import org.gradle.api.tasks.PathSensitivity;
import org.gradle.api.tasks.TaskExecutionException; import org.gradle.api.tasks.TaskExecutionException;
import org.gradle.process.internal.ExecException; import org.gradle.process.internal.ExecException;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -50,7 +51,7 @@ 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")); getInputs().file(new File(projectDir, "pom.xml")).withPathSensitivity(PathSensitivity.RELATIVE);
} }
@Override @Override

3
buildSrc/src/main/java/org/springframework/boot/build/starters/DocumentStarters.java
View File

@ -36,6 +36,8 @@ import org.gradle.api.artifacts.Configuration;
import org.gradle.api.file.FileCollection; import org.gradle.api.file.FileCollection;
import org.gradle.api.tasks.InputFiles; import org.gradle.api.tasks.InputFiles;
import org.gradle.api.tasks.OutputDirectory; import org.gradle.api.tasks.OutputDirectory;
import org.gradle.api.tasks.PathSensitive;
import org.gradle.api.tasks.PathSensitivity;
import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.TaskAction;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@ -75,6 +77,7 @@ public class DocumentStarters extends DefaultTask {
} }
@InputFiles @InputFiles
@PathSensitive(PathSensitivity.RELATIVE)
public FileCollection getStarters() { public FileCollection getStarters() {
return this.starters; return this.starters;
} }

3
buildSrc/src/main/java/org/springframework/boot/build/test/autoconfigure/DocumentTestSlices.java
View File

@ -34,6 +34,8 @@ import org.gradle.api.Task;
import org.gradle.api.file.FileCollection; import org.gradle.api.file.FileCollection;
import org.gradle.api.tasks.InputFiles; import org.gradle.api.tasks.InputFiles;
import org.gradle.api.tasks.OutputFile; import org.gradle.api.tasks.OutputFile;
import org.gradle.api.tasks.PathSensitive;
import org.gradle.api.tasks.PathSensitivity;
import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.TaskAction;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
@ -51,6 +53,7 @@ public class DocumentTestSlices extends DefaultTask {
private File outputFile; private File outputFile;
@InputFiles @InputFiles
@PathSensitive(PathSensitivity.RELATIVE)
public FileCollection getTestSlices() { public FileCollection getTestSlices() {
return this.testSlices; return this.testSlices;
} }

7
buildSrc/src/main/java/org/springframework/boot/build/test/autoconfigure/TestSliceMetadata.java
View File

@ -39,6 +39,7 @@ import org.gradle.api.Task;
import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.Configuration;
import org.gradle.api.file.FileCollection; import org.gradle.api.file.FileCollection;
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;
@ -62,8 +63,10 @@ public class TestSliceMetadata extends DefaultTask {
private File outputFile; private File outputFile;
public TestSliceMetadata() { public TestSliceMetadata() {
getInputs().dir((Callable<File>) () -> this.sourceSet.getOutput().getResourcesDir()); getInputs().dir((Callable<File>) () -> this.sourceSet.getOutput().getResourcesDir())
getInputs().files((Callable<FileCollection>) () -> this.sourceSet.getOutput().getClassesDirs()); .withPathSensitivity(PathSensitivity.RELATIVE);
getInputs().files((Callable<FileCollection>) () -> this.sourceSet.getOutput().getClassesDirs())
.withPathSensitivity(PathSensitivity.RELATIVE);
} }
public void setSourceSet(SourceSet sourceSet) { public void setSourceSet(SourceSet sourceSet) {