Merge branch '4.0.x'

Closes gh-50616

Author: snicoll

platform/spring-boot-internal-dependencies/build.gradle

@@ -157,13 +157,14 @@ bom {
 			]
 		}
 	}
-	library("Maven Resolver", "1.9.23") {
+	library("Maven Resolver", "1.9.27") {
 		group("org.apache.maven.resolver") {
 			modules = [
 				"maven-resolver-api",
 				"maven-resolver-connector-basic",
 				"maven-resolver-impl",
 				"maven-resolver-spi",
+				"maven-resolver-supplier",
 				"maven-resolver-transport-file",
 				"maven-resolver-transport-http",
 				"maven-resolver-util"

test-support/spring-boot-test-support/build.gradle

@@ -47,12 +47,7 @@ dependencies {
 	compileOnly("org.springframework.data:spring-data-redis")
 
 	implementation("jakarta.inject:jakarta.inject-api")
-	implementation("org.apache.maven.resolver:maven-resolver-connector-basic")
-	implementation("org.apache.maven.resolver:maven-resolver-impl")
-	implementation("org.apache.maven:maven-resolver-provider") {
-		exclude(group: "javax.inject", module: "javax.inject")
-	}
-	implementation("org.apache.maven.resolver:maven-resolver-transport-http") {
+	implementation("org.apache.maven.resolver:maven-resolver-supplier") {
 		exclude group: "org.slf4j", module: "jcl-over-slf4j"
 	}
 

test-support/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java

@@ -32,6 +32,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.regex.Pattern;
@@ -42,16 +43,13 @@
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.collection.CollectRequest;
-import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory;
 import org.eclipse.aether.graph.Dependency;
 import org.eclipse.aether.repository.LocalRepository;
 import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.resolution.ArtifactResult;
 import org.eclipse.aether.resolution.DependencyRequest;
 import org.eclipse.aether.resolution.DependencyResult;
-import org.eclipse.aether.spi.connector.RepositoryConnectorFactory;
-import org.eclipse.aether.spi.connector.transport.TransporterFactory;
-import org.eclipse.aether.transport.http.HttpTransporterFactory;
+import org.eclipse.aether.supplier.RepositorySystemSupplier;
 
 import org.springframework.core.annotation.MergedAnnotation;
 import org.springframework.core.annotation.MergedAnnotations;
@@ -241,42 +239,49 @@ private static List<URL> getAdditionalUrls(List<MergedAnnotations> annotations)
 	}
 
 	private static List<URL> resolveCoordinates(String[] coordinates) {
-		Exception latestFailure = null;
-		RepositorySystem repositorySystem = createRepositorySystem();
-		DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession();
-		session.setSystemProperties(System.getProperties());
-		LocalRepository localRepository = new LocalRepository(System.getProperty("user.home") + "/.m2/repository");
-		RemoteRepository remoteRepository = new RemoteRepository.Builder("central", "default",
-				"https://repo.maven.apache.org/maven2")
-			.build();
-		session.setLocalRepositoryManager(repositorySystem.newLocalRepositoryManager(session, localRepository));
-		for (int i = 0; i < MAX_RESOLUTION_ATTEMPTS; i++) {
-			CollectRequest collectRequest = new CollectRequest(null, Arrays.asList(remoteRepository));
-			collectRequest.setDependencies(createDependencies(coordinates));
-			DependencyRequest dependencyRequest = new DependencyRequest(collectRequest, null);
-			try {
-				DependencyResult result = repositorySystem.resolveDependencies(session, dependencyRequest);
-				List<URL> resolvedArtifacts = new ArrayList<>();
-				for (ArtifactResult artifact : result.getArtifactResults()) {
-					resolvedArtifacts.add(artifact.getArtifact().getFile().toURI().toURL());
+		return doWithRepositorySystem((repositorySystem) -> {
+			Exception latestFailure = null;
+			DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession();
+			session.setSystemProperties(System.getProperties());
+			LocalRepository localRepository = new LocalRepository(System.getProperty("user.home") + "/.m2/repository");
+			RemoteRepository remoteRepository = new RemoteRepository.Builder("central", "default",
+					"https://repo.maven.apache.org/maven2")
+				.build();
+			session.setLocalRepositoryManager(repositorySystem.newLocalRepositoryManager(session, localRepository));
+			for (int i = 0; i < MAX_RESOLUTION_ATTEMPTS; i++) {
+				CollectRequest collectRequest = new CollectRequest(null, Arrays.asList(remoteRepository));
+				collectRequest.setDependencies(createDependencies(coordinates));
+				DependencyRequest dependencyRequest = new DependencyRequest(collectRequest, null);
+				try {
+					DependencyResult result = repositorySystem.resolveDependencies(session, dependencyRequest);
+					List<URL> resolvedArtifacts = new ArrayList<>();
+					for (ArtifactResult artifact : result.getArtifactResults()) {
+						resolvedArtifacts.add(artifact.getArtifact().getFile().toURI().toURL());
+					}
+					return resolvedArtifacts;
+				}
+				catch (Exception ex) {
+					latestFailure = ex;
 				}
-				return resolvedArtifacts;
+			}
+			throw new IllegalStateException("Resolution failed after " + MAX_RESOLUTION_ATTEMPTS + " attempts",
+					latestFailure);
+		});
+	}
+
+	private static <T> T doWithRepositorySystem(Function<RepositorySystem, T> repositorySystem) {
+		RepositorySystem rs = new RepositorySystemSupplier().get();
+		try {
+			return repositorySystem.apply(rs);
+		}
+		finally {
+			try {
+				rs.shutdown();
 			}
 			catch (Exception ex) {
-				latestFailure = ex;
+				// Ignore
 			}
 		}
-		throw new IllegalStateException("Resolution failed after " + MAX_RESOLUTION_ATTEMPTS + " attempts",
-				latestFailure);
-	}
-
-	@SuppressWarnings("deprecation")
-	private static RepositorySystem createRepositorySystem() {
-		org.eclipse.aether.impl.DefaultServiceLocator serviceLocator = MavenRepositorySystemUtils.newServiceLocator();
-		serviceLocator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class);
-		serviceLocator.addService(TransporterFactory.class, HttpTransporterFactory.class);
-		RepositorySystem repositorySystem = serviceLocator.getService(RepositorySystem.class);
-		return repositorySystem;
 	}
 
 	private static List<Dependency> createDependencies(String[] allCoordinates) {