Merge branch '3.3.x' into 3.4.x

Closes gh-44579

Author: wilkinsona

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorTests.java

@@ -166,6 +166,8 @@ void combinedExclusionsAreApplied() {
 	}
 
 	@Test
+	@WithTestAutoConfigurationImportsResource
+	@WithTestAutoConfigurationReplacementsResource
 	void removedExclusionsAreApplied() {
 		TestAutoConfigurationImportSelector importSelector = new TestAutoConfigurationImportSelector(
 				TestAutoConfiguration.class);
@@ -234,7 +236,9 @@ void getExclusionFilterReuseFilters() {
 	}
 
 	@Test
-	void soringConsidersReplacements() {
+	@WithTestAutoConfigurationImportsResource
+	@WithTestAutoConfigurationReplacementsResource
+	void sortingConsidersReplacements() {
 		TestAutoConfigurationImportSelector importSelector = new TestAutoConfigurationImportSelector(
 				TestAutoConfiguration.class);
 		setupImportSelector(importSelector);
@@ -397,4 +401,28 @@ static class SeventhAutoConfiguration {
 
 	}
 
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(
+			name = "META-INF/spring/org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$TestAutoConfiguration.imports",
+			content = """
+					org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$AfterDeprecatedAutoConfiguration
+					org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$ReplacementAutoConfiguration
+					""")
+	@interface WithTestAutoConfigurationImportsResource {
+
+	}
+
+	@Target(ElementType.METHOD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@WithResource(
+			name = "META-INF/spring/org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$TestAutoConfiguration.replacements",
+			content = """
+					org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$DeprecatedAutoConfiguration=\
+					org.springframework.boot.autoconfigure.AutoConfigurationImportSelectorTests$ReplacementAutoConfiguration
+					""")
+	@interface WithTestAutoConfigurationReplacementsResource {
+
+	}
+
 }

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationMetadataLoaderTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 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.
@@ -20,13 +20,21 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test for {@link AutoConfigurationMetadataLoader}.
  *
  * @author Phillip Webb
  */
+@WithResource(name = "metadata.properties", content = """
+		test=
+		test.string=abc
+		test.int=123
+		test.set=a,b,b,c
+		""")
 class AutoConfigurationMetadataLoaderTests {
 
 	@Test
@@ -90,8 +98,8 @@ void getWithDefaultWhenMissingShouldReturnDefault() {
 	}
 
 	private AutoConfigurationMetadata load() {
-		return AutoConfigurationMetadataLoader.loadMetadata(null,
-				"META-INF/AutoConfigurationMetadataLoaderTests.properties");
+		ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+		return AutoConfigurationMetadataLoader.loadMetadata(classLoader, "metadata.properties");
 	}
 
 }

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReplacementsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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.
@@ -24,19 +24,33 @@
 import java.util.List;
 import java.util.Set;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests for {@link AutoConfigurationReplacements}.
  *
  * @author Phillip Webb
  */
+@WithResource(
+		name = "META-INF/spring/org.springframework.boot.autoconfigure.AutoConfigurationReplacementsTests$TestAutoConfigurationReplacements.replacements",
+		content = """
+				com.example.A1=com.example.A2
+				com.example.B1=com.example.B2
+				""")
 class AutoConfigurationReplacementsTests {
 
-	private final AutoConfigurationReplacements replacements = AutoConfigurationReplacements
-		.load(TestAutoConfigurationReplacements.class, null);
+	private AutoConfigurationReplacements replacements;
+
+	@BeforeEach
+	void loadReplacements() {
+		this.replacements = AutoConfigurationReplacements.load(TestAutoConfigurationReplacements.class,
+				Thread.currentThread().getContextClassLoader());
+	}
 
 	@Test
 	void replaceWhenMatchReplacesClassName() {

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java

@@ -28,6 +28,7 @@
 
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.type.AnnotationMetadata;
@@ -74,6 +75,12 @@ void importsAreSelectedUsingClassesAttribute() throws Exception {
 	}
 
 	@Test
+	@WithResource(
+			name = "META-INF/spring/org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$FromImportsFile.imports",
+			content = """
+					org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$ImportedAutoConfiguration
+					org.springframework.boot.autoconfigure.missing.MissingAutoConfiguration
+					""")
 	void importsAreSelectedFromImportsFile() throws Exception {
 		AnnotationMetadata annotationMetadata = getAnnotationMetadata(FromImportsFile.class);
 		String[] imports = this.importSelector.selectImports(annotationMetadata);
@@ -83,9 +90,15 @@ void importsAreSelectedFromImportsFile() throws Exception {
 	}
 
 	@Test
+	@WithResource(
+			name = "META-INF/spring/org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$FromImportsFile.imports",
+			content = """
+					optional:org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$ImportedAutoConfiguration
+					optional:org.springframework.boot.autoconfigure.missing.MissingAutoConfiguration
+					org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$AnotherImportedAutoConfiguration
+					""")
 	void importsSelectedFromImportsFileIgnoreMissingOptionalClasses() throws Exception {
-		AnnotationMetadata annotationMetadata = getAnnotationMetadata(
-				FromImportsFileIgnoresMissingOptionalClasses.class);
+		AnnotationMetadata annotationMetadata = getAnnotationMetadata(FromImportsFile.class);
 		String[] imports = this.importSelector.selectImports(annotationMetadata);
 		assertThat(imports).containsExactly(
 				"org.springframework.boot.autoconfigure.ImportAutoConfigurationImportSelectorTests$ImportedAutoConfiguration",

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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.
@@ -910,9 +910,8 @@ void enableSslWithInvalidTrustStoreTypeShouldFail() {
 	void enableSslWithBundle() {
 		this.contextRunner.withUserConfiguration(TestConfiguration.class)
 			.withPropertyValues("spring.rabbitmq.ssl.bundle=test-bundle",
-					"spring.ssl.bundle.jks.test-bundle.keystore.location=classpath:test.jks",
-					"spring.ssl.bundle.jks.test-bundle.keystore.password=secret",
-					"spring.ssl.bundle.jks.test-bundle.key.password=password")
+					"spring.ssl.bundle.jks.test-bundle.keystore.location=classpath:org/springframework/boot/autoconfigure/amqp/test.jks",
+					"spring.ssl.bundle.jks.test-bundle.keystore.password=secret")
 			.run((context) -> {
 				com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = getTargetConnectionFactory(context);
 				assertThat(rabbitConnectionFactory.isSSL()).isTrue();

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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.
@@ -72,6 +72,8 @@
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.test.system.OutputCaptureExtension;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
+import org.springframework.boot.testsupport.classpath.resources.WithResource;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -288,13 +290,13 @@ void testUsingJpa() {
 	}
 
 	@Test
+	@WithPackageResources("custom-schema.sql")
 	void testRenamePrefix() {
 		this.contextRunner
 			.withUserConfiguration(TestConfiguration.class, EmbeddedDataSourceConfiguration.class,
 					HibernateJpaAutoConfiguration.class)
 			.withPropertyValues("spring.datasource.generate-unique-name=true",
-					"spring.batch.jdbc.schema:classpath:batch/custom-schema.sql",
-					"spring.batch.jdbc.tablePrefix:PREFIX_")
+					"spring.batch.jdbc.schema:classpath:custom-schema.sql", "spring.batch.jdbc.tablePrefix:PREFIX_")
 			.run((context) -> {
 				assertThat(context).hasSingleBean(JobLauncher.class);
 				assertThat(context.getBean(BatchProperties.class).getJdbc().getInitializeSchema())
@@ -412,6 +414,7 @@ void jobRepositoryBeansDependOnFlyway() {
 	}
 
 	@Test
+	@WithResource(name = "db/changelog/db.changelog-master.yaml", content = "databaseChangeLog:")
 	void jobRepositoryBeansDependOnLiquibase() {
 		this.contextRunner.withUserConfiguration(TestConfiguration.class, EmbeddedDataSourceConfiguration.class)
 			.withUserConfiguration(LiquibaseAutoConfiguration.class)

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationWithoutJpaTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 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.
@@ -34,6 +34,7 @@
 import org.springframework.boot.sql.init.DatabaseInitializationMode;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
+import org.springframework.boot.testsupport.classpath.resources.WithPackageResources;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.transaction.annotation.Isolation;
 
@@ -70,11 +71,11 @@ void jdbcWithDefaultSettings() {
 	}
 
 	@Test
+	@WithPackageResources("custom-schema.sql")
 	void jdbcWithCustomPrefix() {
 		this.contextRunner.withUserConfiguration(DefaultConfiguration.class, EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.datasource.generate-unique-name=true",
-					"spring.batch.jdbc.schema:classpath:batch/custom-schema.sql",
-					"spring.batch.jdbc.tablePrefix:PREFIX_")
+					"spring.batch.jdbc.schema:classpath:custom-schema.sql", "spring.batch.jdbc.tablePrefix:PREFIX_")
 			.run((context) -> {
 				assertThat(new JdbcTemplate(context.getBean(DataSource.class))
 					.queryForList("select * from PREFIX_JOB_EXECUTION")).isEmpty();