Merge branch '3.2.x' into 3.3.x

Closes gh-42043

Author: wilkinsona

buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/PrepareMavenBinaries.java

@@ -21,6 +21,7 @@
 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 void prepareBinaries() {
 		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()));
 			}
 		});