Merge branch '3.4.x'

See gh-44449

Author: wilkinsona

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2025 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,6 @@
 
 import org.springframework.core.io.UrlResource;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
 
 /**
  * Contains {@code @Configuration} import candidates, usually auto-configurations.
@@ -74,8 +73,7 @@ public List<String> getCandidates() {
 	 * Every line contains the full qualified name of the candidate class. Comments are
 	 * supported using the # character.
 	 * @param annotation annotation to load
-	 * @param classLoader class loader to use for loading, or {@code null} to use the
-	 * {@link ClassUtils#getDefaultClassLoader() default class loader}
+	 * @param classLoader class loader to use for loading
 	 * @return list of names of annotated classes
 	 */
 	public static ImportCandidates load(Class<?> annotation, ClassLoader classLoader) {
@@ -93,7 +91,7 @@ public static ImportCandidates load(Class<?> annotation, ClassLoader classLoader
 
 	private static ClassLoader decideClassloader(ClassLoader classLoader) {
 		if (classLoader == null) {
-			return ClassUtils.getDefaultClassLoader();
+			return ImportCandidates.class.getClassLoader();
 		}
 		return classLoader;
 	}

gradlew

@@ -47,7 +47,8 @@ class ImportCandidatesTests {
 
 			""")
 	void loadReadsFromClasspathFile() {
-		ImportCandidates candidates = ImportCandidates.load(TestAnnotation.class, null);
+		ImportCandidates candidates = ImportCandidates.load(TestAnnotation.class,
+				Thread.currentThread().getContextClassLoader());
 		assertThat(candidates).containsExactly("class1", "class2", "class3");
 	}