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

Merge branch '3.3.x' 

Closes gh-42044
This commit is contained in:
Andy Wilkinson 2024-08-28 14:25:03 +01:00
parent ff431b45cb 77d9f1624d
commit 33207a8f6d
1 changed files with 8 additions and 5 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/PrepareMavenBinaries.java
View File

@ -21,6 +21,7 @@ import javax.inject.Inject;
import org.gradle.api.DefaultTask;
import org.gradle.api.Task;
import org.gradle.api.artifacts.Configuration;
import org.gradle.api.file.ArchiveOperations;
import org.gradle.api.file.DirectoryProperty;
import org.gradle.api.file.FileSystemOperations;
import org.gradle.api.provider.SetProperty;
@ -37,9 +38,12 @@ public abstract class PrepareMavenBinaries extends DefaultTask {
private final FileSystemOperations fileSystemOperations;
private final ArchiveOperations archiveOperations;
@Inject
public PrepareMavenBinaries(FileSystemOperations fileSystemOperations) {
public PrepareMavenBinaries(FileSystemOperations fileSystemOperations, ArchiveOperations archiveOperations) {
this.fileSystemOperations = fileSystemOperations;
this.archiveOperations = archiveOperations;
}
@OutputDirectory
@ -53,10 +57,9 @@ public abstract class PrepareMavenBinaries extends DefaultTask {
this.fileSystemOperations.sync((sync) -> {
sync.into(getOutputDir());
for (String version : getVersions().get()) {
Configuration configuration = getProject().getConfigurations()
.detachedConfiguration(getProject().getDependencies()
.create("org.apache.maven:apache-maven:" + version + ":bin@zip"));
sync.from(getProject().zipTree(configuration.getSingleFile()));
Configuration configuration = getProject().getConfigurations().detachedConfiguration(
getProject().getDependencies().create("org.apache.maven:apache-maven:" + version + ":bin@zip"));
sync.from(this.archiveOperations.zipTree(configuration.getSingleFile()));
}
});