Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
e080dcf8
Commit
e080dcf8
authored
Jul 16, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Configure path sensitivity of tasks' file inputs
Closes gh-22359
parent
b49cf70a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
3 deletions
+20
-3
AbstractPackageManagerDefinitionTask.java
.../boot/build/cli/AbstractPackageManagerDefinitionTask.java
+4
-0
DocumentConfigurationProperties.java
...d/context/properties/DocumentConfigurationProperties.java
+3
-0
MavenExec.java
...org/springframework/boot/build/mavenplugin/MavenExec.java
+2
-1
DocumentStarters.java
...springframework/boot/build/starters/DocumentStarters.java
+3
-0
DocumentTestSlices.java
...ork/boot/build/test/autoconfigure/DocumentTestSlices.java
+3
-0
TestSliceMetadata.java
...work/boot/build/test/autoconfigure/TestSliceMetadata.java
+5
-2
No files found.
buildSrc/src/main/java/org/springframework/boot/build/cli/AbstractPackageManagerDefinitionTask.java
View file @
e080dcf8
...
...
@@ -27,6 +27,8 @@ import org.gradle.api.file.RegularFile;
import
org.gradle.api.provider.Provider
;
import
org.gradle.api.tasks.InputFile
;
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.springframework.boot.build.artifactory.ArtifactoryRepository
;
...
...
@@ -50,6 +52,7 @@ public abstract class AbstractPackageManagerDefinitionTask extends DefaultTask {
}
@InputFile
@PathSensitive
(
PathSensitivity
.
RELATIVE
)
public
RegularFile
getArchive
()
{
return
this
.
archive
.
get
();
}
...
...
@@ -59,6 +62,7 @@ public abstract class AbstractPackageManagerDefinitionTask extends DefaultTask {
}
@InputFile
@PathSensitive
(
PathSensitivity
.
RELATIVE
)
public
File
getTemplate
()
{
return
this
.
template
;
}
...
...
buildSrc/src/main/java/org/springframework/boot/build/context/properties/DocumentConfigurationProperties.java
View file @
e080dcf8
...
...
@@ -24,6 +24,8 @@ import org.gradle.api.Task;
import
org.gradle.api.file.FileCollection
;
import
org.gradle.api.tasks.InputFiles
;
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.springframework.boot.build.context.properties.DocumentOptions.Builder
;
...
...
@@ -40,6 +42,7 @@ public class DocumentConfigurationProperties extends DefaultTask {
private
File
outputDir
;
@InputFiles
@PathSensitive
(
PathSensitivity
.
RELATIVE
)
public
FileCollection
getConfigurationPropertyMetadata
()
{
return
this
.
configurationPropertyMetadata
;
}
...
...
buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenExec.java
View file @
e080dcf8
...
...
@@ -26,6 +26,7 @@ import org.gradle.api.Task;
import
org.gradle.api.artifacts.Configuration
;
import
org.gradle.api.tasks.Internal
;
import
org.gradle.api.tasks.JavaExec
;
import
org.gradle.api.tasks.PathSensitivity
;
import
org.gradle.api.tasks.TaskExecutionException
;
import
org.gradle.process.internal.ExecException
;
import
org.slf4j.Logger
;
...
...
@@ -50,7 +51,7 @@ public class MavenExec extends JavaExec {
public
void
setProjectDir
(
File
projectDir
)
{
this
.
projectDir
=
projectDir
;
getInputs
().
file
(
new
File
(
projectDir
,
"pom.xml"
));
getInputs
().
file
(
new
File
(
projectDir
,
"pom.xml"
))
.
withPathSensitivity
(
PathSensitivity
.
RELATIVE
)
;
}
@Override
...
...
buildSrc/src/main/java/org/springframework/boot/build/starters/DocumentStarters.java
View file @
e080dcf8
...
...
@@ -36,6 +36,8 @@ import org.gradle.api.artifacts.Configuration;
import
org.gradle.api.file.FileCollection
;
import
org.gradle.api.tasks.InputFiles
;
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.springframework.util.StringUtils
;
...
...
@@ -75,6 +77,7 @@ public class DocumentStarters extends DefaultTask {
}
@InputFiles
@PathSensitive
(
PathSensitivity
.
RELATIVE
)
public
FileCollection
getStarters
()
{
return
this
.
starters
;
}
...
...
buildSrc/src/main/java/org/springframework/boot/build/test/autoconfigure/DocumentTestSlices.java
View file @
e080dcf8
...
...
@@ -34,6 +34,8 @@ import org.gradle.api.Task;
import
org.gradle.api.file.FileCollection
;
import
org.gradle.api.tasks.InputFiles
;
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.springframework.util.ClassUtils
;
...
...
@@ -51,6 +53,7 @@ public class DocumentTestSlices extends DefaultTask {
private
File
outputFile
;
@InputFiles
@PathSensitive
(
PathSensitivity
.
RELATIVE
)
public
FileCollection
getTestSlices
()
{
return
this
.
testSlices
;
}
...
...
buildSrc/src/main/java/org/springframework/boot/build/test/autoconfigure/TestSliceMetadata.java
View file @
e080dcf8
...
...
@@ -39,6 +39,7 @@ import org.gradle.api.Task;
import
org.gradle.api.artifacts.Configuration
;
import
org.gradle.api.file.FileCollection
;
import
org.gradle.api.tasks.OutputFile
;
import
org.gradle.api.tasks.PathSensitivity
;
import
org.gradle.api.tasks.SourceSet
;
import
org.gradle.api.tasks.TaskAction
;
...
...
@@ -62,8 +63,10 @@ public class TestSliceMetadata extends DefaultTask {
private
File
outputFile
;
public
TestSliceMetadata
()
{
getInputs
().
dir
((
Callable
<
File
>)
()
->
this
.
sourceSet
.
getOutput
().
getResourcesDir
());
getInputs
().
files
((
Callable
<
FileCollection
>)
()
->
this
.
sourceSet
.
getOutput
().
getClassesDirs
());
getInputs
().
dir
((
Callable
<
File
>)
()
->
this
.
sourceSet
.
getOutput
().
getResourcesDir
())
.
withPathSensitivity
(
PathSensitivity
.
RELATIVE
);
getInputs
().
files
((
Callable
<
FileCollection
>)
()
->
this
.
sourceSet
.
getOutput
().
getClassesDirs
())
.
withPathSensitivity
(
PathSensitivity
.
RELATIVE
);
}
public
void
setSourceSet
(
SourceSet
sourceSet
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment