Update :servlet:spring-boot:java:oauth2:webclient to 7

servlet/spring-boot/java/oauth2/webclient/gradle.properties

@@ -1,4 +1,4 @@
 version=6.1.1
-spring-security.version=6.5.0-SNAPSHOT
+spring-security.version=7.0.0-SNAPSHOT
 org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.caching=true

servlet/spring-boot/java/oauth2/webclient/src/main/java/example/OAuth2WebClientApplication.java

@@ -18,15 +18,13 @@ package example;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.security.oauth2.client.reactive.ReactiveOAuth2ClientAutoConfiguration;
 
 /**
  * An OAuth web application that demonstrates integration with WebClient.
  *
  * @author Joe Grandja
  */
-// FIXME: Work around https://github.com/spring-projects/spring-boot/issues/14463
-@SpringBootApplication(exclude = ReactiveOAuth2ClientAutoConfiguration.class)
+@SpringBootApplication
 public class OAuth2WebClientApplication {
 
 	public static void main(String[] args) {

servlet/spring-boot/java/oauth2/webclient/src/main/java/example/WebClientConfiguration.java

@@ -62,7 +62,6 @@ public class WebClientConfiguration {
 						.authorizationCode()
 						.refreshToken()
 						.clientCredentials()
-						.password()
 						.build();
 		// @formatter:on
 		DefaultOAuth2AuthorizedClientManager authorizedClientManager = new DefaultOAuth2AuthorizedClientManager(

servlet/spring-boot/java/oauth2/webclient/src/test/java/example/OAuth2WebClientControllerTests.java

@@ -24,11 +24,9 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
 import org.springframework.security.oauth2.client.web.HttpSessionOAuth2AuthorizedClientRepository;
 import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository;
 import org.springframework.test.web.servlet.MockMvc;
@@ -49,9 +47,6 @@ public class OAuth2WebClientControllerTests {
 	@Autowired
 	private MockMvc mockMvc;
 
-	@MockBean
-	ClientRegistrationRepository clientRegistrationRepository;
-
 	@AfterAll
 	static void shutdown() throws Exception {
 		web.shutdown();

servlet/spring-boot/java/oauth2/webclient/src/test/java/example/RegisteredOAuth2AuthorizedClientControllerTests.java

@@ -24,11 +24,9 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
 import org.springframework.security.oauth2.client.web.HttpSessionOAuth2AuthorizedClientRepository;
 import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository;
 import org.springframework.test.web.servlet.MockMvc;
@@ -49,9 +47,6 @@ public class RegisteredOAuth2AuthorizedClientControllerTests {
 	@Autowired
 	private MockMvc mockMvc;
 
-	@MockBean
-	ClientRegistrationRepository clientRegistrationRepository;
-
 	@AfterAll
 	static void shutdown() throws Exception {
 		web.shutdown();