Merge branch '3.0.x' into 3.1.x

Closes gh-36427

Author: snicoll

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathExtensionForkParameterizedTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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,7 +20,7 @@
 import java.util.List;
 
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -35,7 +35,7 @@ class ModifiedClassPathExtensionForkParameterizedTests {
 	private static final List<String> arguments = new ArrayList<>();
 
 	@ParameterizedTest
-	@CsvSource({ "one", "two", "three" })
+	@ValueSource(strings = { "one", "two", "three" })
 	void testIsInvokedOnceForEachArgument(String argument) {
 		if (argument.equals("one")) {
 			assertThat(arguments).isEmpty();

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentTests.java

@@ -31,7 +31,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import org.springframework.boot.ConfigurableBootstrapContext;
 import org.springframework.boot.DefaultBootstrapContext;
@@ -226,7 +226,7 @@ protected ConfigDataEnvironmentContributors createContributors(
 	}
 
 	@ParameterizedTest
-	@CsvSource({ "include", "include[0]" })
+	@ValueSource(strings = { "include", "include[0]" })
 	void processAndApplyWhenHasProfileIncludeInProfileSpecificDocumentThrowsException(String property, TestInfo info) {
 		this.environment.setProperty("spring.config.location", getConfigLocation(info));
 		ConfigDataEnvironment configDataEnvironment = new ConfigDataEnvironment(this.logFactory, this.bootstrapContext,
@@ -250,7 +250,7 @@ protected ConfigDataEnvironmentContributors createContributors(
 	}
 
 	@ParameterizedTest
-	@CsvSource({ "spring.profiles.include", "spring.profiles.include[0]" })
+	@ValueSource(strings = { "spring.profiles.include", "spring.profiles.include[0]" })
 	void processAndApplyIncludesProfilesFromSpringProfilesInclude(String property, TestInfo info) {
 		this.environment.setProperty("spring.config.location", getConfigLocation(info));
 		ConfigDataEnvironment configDataEnvironment = new ConfigDataEnvironment(this.logFactory, this.bootstrapContext,

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/AbstractClientHttpRequestFactoriesTests.java

@@ -29,7 +29,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import org.springframework.boot.ssl.SslBundle;
 import org.springframework.boot.ssl.SslBundleKey;
@@ -102,7 +102,7 @@ void getReturnsRequestFactoryWithConfiguredReadTimeout() {
 	}
 
 	@ParameterizedTest
-	@CsvSource({ "GET", "POST" })
+	@ValueSource(strings = { "GET", "POST" })
 	void connectWithSslBundle(String httpMethod) throws Exception {
 		TomcatServletWebServerFactory webServerFactory = new TomcatServletWebServerFactory(0);
 		Ssl ssl = new Ssl();