diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9530d..9bbc975c742 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e18bc253b85..37f853b1c84 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/gradlew b/gradlew index f3b75f3b0d4..faf93008b77 100755 --- a/gradlew +++ b/gradlew @@ -205,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/ImportCandidates.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/ImportCandidates.java index 823cd3c1b54..ddc99031885 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/ImportCandidates.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/ImportCandidates.java @@ -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 java.util.List; 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 final class ImportCandidates implements Iterable { * 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 final class ImportCandidates implements Iterable { private static ClassLoader decideClassloader(ClassLoader classLoader) { if (classLoader == null) { - return ClassUtils.getDefaultClassLoader(); + return ImportCandidates.class.getClassLoader(); } return classLoader; } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/annotation/ImportCandidatesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/annotation/ImportCandidatesTests.java index 8af49ee43a1..b1056a86009 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/annotation/ImportCandidatesTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/annotation/ImportCandidatesTests.java @@ -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"); }