Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that Maven plugin's intTest runs when Maven binaries change

Browse Source 
Previously, the intTest task had a dependsOn relationship with
prepareMavenBinaries task. This ensured that the two tasks ran in the
correct order but did not ensure that the intTest task would run if
the prepared binaries had changed.

This commit updates the configuration of the intTest task to wire up
the output of the prepareMavenBinaries as an input of the intTest
task. This ensures that the intTest task will run when the prepared
binaries have changed and also creates an implicit dependsOn
relationship between the two tasks.

Closes gh-34474
This commit is contained in:
Andy Wilkinson 2023-03-03 19:32:02 +00:00
parent 10d71f5645
commit b4fccf480a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenPluginPlugin.java
View File

@ -80,6 +80,7 @@ import org.gradle.api.tasks.SourceSetContainer;
import org.gradle.api.tasks.Sync;
import org.gradle.api.tasks.TaskAction;
import org.gradle.api.tasks.TaskExecutionException;
import org.gradle.api.tasks.TaskProvider;
import org.gradle.api.tasks.bundling.Jar;
import org.gradle.api.tasks.javadoc.Javadoc;
import org.gradle.external.javadoc.StandardJavadocDocletOptions;
@ -272,9 +273,15 @@ public class MavenPluginPlugin implements Plugin<Project> {
}
private void addPrepareMavenBinariesTask(Project project) {
PrepareMavenBinaries task = project.getTasks().create("prepareMavenBinaries", PrepareMavenBinaries.class);
task.setOutputDir(new File(project.getBuildDir(), "maven-binaries"));
project.getTasks().getByName(IntegrationTestPlugin.INT_TEST_TASK_NAME).dependsOn(task);
TaskProvider<PrepareMavenBinaries> task = project.getTasks()
.register("prepareMavenBinaries", PrepareMavenBinaries.class, (prepareMavenBinaries) -> prepareMavenBinaries
.setOutputDir(new File(project.getBuildDir(), "maven-binaries")));
project.getTasks()
.getByName(IntegrationTestPlugin.INT_TEST_TASK_NAME)
.getInputs()
.dir(task.map(PrepareMavenBinaries::getOutputDir))
.withPathSensitivity(PathSensitivity.RELATIVE)
.withPropertyName("mavenBinaries");
}
private void replaceVersionPlaceholder(CopySpec copy, Project project) {