Merge branch '2.4.x'

Closes gh-24580

Author: snicoll

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java

@@ -119,7 +119,8 @@ else if (config instanceof ReactiveWebMergedContextConfiguration) {
 			application.setWebApplicationType(WebApplicationType.NONE);
 		}
 		application.setInitializers(initializers);
-		return application.run(getArgs(config));
+		String[] args = SpringBootTestArgs.get(config.getContextCustomizers());
+		return application.run(args);
 	}
 
 	/**
@@ -140,19 +141,6 @@ protected ConfigurableEnvironment getEnvironment() {
 		return new StandardEnvironment();
 	}
 
-	/**
-	 * Return the application arguments to use. If no arguments are available, return an
-	 * empty array.
-	 * @param config the source context configuration
-	 * @return the application arguments to use
-	 * @deprecated since 2.2.7
-	 * @see SpringApplication#run(String...)
-	 */
-	@Deprecated
-	protected String[] getArgs(MergedContextConfiguration config) {
-		return SpringBootTestArgs.get(config.getContextCustomizers());
-	}
-
 	private void setActiveProfiles(ConfigurableEnvironment environment, String[] profiles) {
 		environment.setActiveProfiles(profiles);
 		// Also add as properties to override any application.properties