Boot migration continued

Author: olegz

pom.xml

@@ -228,7 +228,7 @@
 				<module>spring-cloud-function-adapters</module>
 				<module>spring-cloud-function-integration</module>
 				<!-- <module>spring-cloud-function-rsocket</module> -->
-				<module>spring-cloud-function-kotlin</module>
+				<!-- <module>spring-cloud-function-kotlin</module> -->
 				<module>docs</module>
 			</modules>
 		</profile>

spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml

@@ -64,13 +64,28 @@
 			<artifactId>spring-web</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-resttestclient</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-webmvc-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-webtestclient</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.google.cloud.functions.invoker</groupId>
 			<artifactId>java-function-invoker</artifactId>
 			<version>${google.cloud.functions.invoker.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<!-- replace com.github.stefanbirkner:system-rules:1.19.0. Used in FunctionInvokerBackgroundTests -->
+		<!-- replace com.github.stefanbirkner:system-rules:1.19.0. Used in
+		FunctionInvokerBackgroundTests -->
 		<dependency>
 			<groupId>com.github.blindpirate</groupId>
 			<artifactId>junit5-capture-system-output-extension</artifactId>

spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/FunctionInvokerIntegrationTests.java

@@ -23,7 +23,8 @@
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.web.server.test.client.TestRestTemplate;
+import org.springframework.boot.resttestclient.TestRestTemplate;
+import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate;
 import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -41,6 +42,7 @@
  * @author Daniel Zou
  * @author Mike Eltsufin
  */
+@AutoConfigureTestRestTemplate
 public class FunctionInvokerIntegrationTests {
 
 	@Test

spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/LocalServerTestSupport.java

@@ -35,7 +35,9 @@
 import com.google.cloud.functions.invoker.runner.Invoker;
 import com.google.gson.Gson;
 
-import org.springframework.boot.web.server.test.client.TestRestTemplate;
+
+import org.springframework.boot.resttestclient.TestRestTemplate;
+import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate;
 import org.springframework.cloud.function.adapter.gcp.FunctionInvoker;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -50,6 +52,7 @@
  * @author Mike Eltsufin
  * @author Chris Bono
  */
+@AutoConfigureTestRestTemplate
 final public class LocalServerTestSupport {
 
 	private static final Gson gson = new Gson();