Merge branch '3.5.x' into 4.0.x

Author: wilkinsona

buildSrc/src/main/java/org/springframework/boot/build/bom/Library.java

@@ -19,6 +19,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -27,6 +28,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
@@ -429,6 +431,13 @@ public interface VersionAlignment {
 
 		Set<String> resolve();
 
+		default Configuration alignmentConfiguration(Project project, Collection<Dependency> dependencies) {
+			Configuration alignmentConfiguration = project.getConfigurations()
+				.detachedConfiguration(dependencies.toArray(new Dependency[0]));
+			alignmentConfiguration.getResolutionStrategy().cacheChangingModulesFor(0, TimeUnit.SECONDS);
+			return alignmentConfiguration;
+		}
+
 	}
 
 	public static class BomAlignment {
@@ -514,8 +523,7 @@ public Set<String> resolve() {
 
 		private Map<String, String> resolveAligningDependencies() {
 			List<Dependency> dependencies = getAligningDependencies();
-			Configuration alignmentConfiguration = this.project.getConfigurations()
-				.detachedConfiguration(dependencies.toArray(new Dependency[0]));
+			Configuration alignmentConfiguration = alignmentConfiguration(this.project, dependencies);
 			Map<String, String> versions = new HashMap<>();
 			ResolutionResult resolutionResult = alignmentConfiguration.getIncoming().getResolutionResult();
 			for (DependencyResult dependency : resolutionResult.getAllDependencies()) {
@@ -627,8 +635,7 @@ public Set<String> resolve() {
 			if (this.alignedVersions != null) {
 				return this.alignedVersions;
 			}
-			Configuration alignmentConfiguration = this.project.getConfigurations()
-				.detachedConfiguration(getAligningDependencies().toArray(new Dependency[0]));
+			Configuration alignmentConfiguration = alignmentConfiguration(this.project, getAligningDependencies());
 			Set<File> files = alignmentConfiguration.resolve();
 			if (files.size() != 1) {
 				throw new IllegalStateException(