Merge branch '3.4.x'

Closes gh-44969

Author: wilkinsona

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

@@ -25,7 +25,6 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
-import io.lettuce.core.dynamic.support.ReflectionUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -48,6 +47,7 @@
 import org.springframework.mock.env.MockEnvironment;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.ReflectionUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;

spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/intTest/java/org/springframework/boot/context/embedded/EmbeddedServerContainerInvocationContextProvider.java

@@ -18,6 +18,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.Constructor;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -41,11 +42,12 @@
 import org.junit.jupiter.api.extension.ParameterResolver;
 import org.junit.jupiter.api.extension.TestTemplateInvocationContext;
 import org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider;
-import org.junit.platform.commons.util.ReflectionUtils;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.boot.testsupport.BuildOutput;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.util.FileSystemUtils;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.client.NoOpResponseErrorHandler;
 import org.springframework.web.client.RestTemplate;
@@ -119,10 +121,17 @@ private AbstractApplicationLauncher getAbstractApplicationLauncher(Application a
 		if (cachedLauncher != null) {
 			return cachedLauncher;
 		}
-		AbstractApplicationLauncher launcher = ReflectionUtils.newInstance(launcherClass, application,
-				new File(buildOutput.getRootLocation(), "app-launcher-" + UUID.randomUUID()));
-		this.launcherCache.put(cacheKey, launcher);
-		return launcher;
+		try {
+			Constructor<? extends AbstractApplicationLauncher> constructor = ReflectionUtils
+				.accessibleConstructor(launcherClass, Application.class, File.class);
+			AbstractApplicationLauncher launcher = BeanUtils.instantiateClass(constructor, application,
+					new File(buildOutput.getRootLocation(), "app-launcher-" + UUID.randomUUID()));
+			this.launcherCache.put(cacheKey, launcher);
+			return launcher;
+		}
+		catch (NoSuchMethodException ex) {
+			throw new IllegalStateException("Launcher class %s does not have an (Application, File) constructor");
+		}
 	}
 
 	private Application getApplication(EmbeddedServletContainerTest annotation, String container) {

src/checkstyle/checkstyle.xml

@@ -16,7 +16,7 @@
 			<property name="illegalPkgs"
 				value="^sun.*, ^org\.apache\.commons\.(?!compress|dbcp2|logging|pool2).*, ^com\.datastax\.oss\.driver\.shaded.*, ^com\.google\.common.*, ^io\.micrometer\.core\.lang.*, ^io\.micrometer\.shaded.*, ^org\.jetbrains\.annotations.*, ^org\.testcontainers\.shaded.*" />
 			<property name="illegalClasses"
-				value="^com\.hazelcast\.util\.Base64, ^org\.junit\.rules\.ExpectedException, ^org\.mockito\.InjectMocks, ^org\.slf4j\.LoggerFactory, ^org.springframework.context.annotation.ScannedGenericBeanDefinition, ^reactor\.core\.support\.Assert"/>
+				value="^com\.hazelcast\.util\.Base64, ^org\.junit\.rules\.ExpectedException, ^org\.mockito\.InjectMocks, ^org\.slf4j\.LoggerFactory, ^org.springframework.context.annotation.ScannedGenericBeanDefinition, ^reactor\.core\.support\.Assert, ^(?!org\.springframework\.util\.).*ReflectionUtils"/>
 		</module>
 		<module
 			name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">