Update to JUnit 5.10.5

servlet/java-configuration/aspectj/build.gradle

@@ -28,7 +28,7 @@ dependencies {
 
 	implementation platform(libs.org.springframework.spring.framework.bom)
 	implementation platform(libs.org.springframework.security.spring.security.bom)
-	implementation platform("org.junit:junit-bom:5.10.3")
+	implementation platform("org.junit:junit-bom:5.10.5")
 
 	implementation "org.springframework.security:spring-security-config"
 

servlet/java-configuration/authentication/preauth/build.gradle

@@ -17,7 +17,7 @@ repositories {
 dependencies {
 	implementation platform(libs.org.springframework.spring.framework.bom)
 	implementation platform(libs.org.springframework.security.spring.security.bom)
-	implementation platform("org.junit:junit-bom:5.10.3")
+	implementation platform("org.junit:junit-bom:5.10.5")
 
 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"

servlet/java-configuration/authentication/remember-me/build.gradle

@@ -17,7 +17,7 @@ repositories {
 dependencies {
 	implementation platform(libs.org.springframework.spring.framework.bom)
 	implementation platform(libs.org.springframework.security.spring.security.bom)
-	implementation platform("org.junit:junit-bom:5.10.3")
+	implementation platform("org.junit:junit-bom:5.10.5")
 
 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"

servlet/java-configuration/authentication/username-password/form/build.gradle

@@ -16,7 +16,7 @@ repositories {
 dependencies {
 	implementation platform(libs.org.springframework.spring.framework.bom)
 	implementation platform(libs.org.springframework.security.spring.security.bom)
-	implementation platform("org.junit:junit-bom:5.10.3")
+	implementation platform("org.junit:junit-bom:5.10.5")
 
 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"

servlet/java-configuration/authentication/username-password/in-memory/build.gradle

@@ -16,7 +16,7 @@ repositories {
 dependencies {
 	implementation platform(libs.org.springframework.spring.framework.bom)
 	implementation platform(libs.org.springframework.security.spring.security.bom)
-	implementation platform("org.junit:junit-bom:5.10.3")
+	implementation platform("org.junit:junit-bom:5.10.5")
 
 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"

servlet/java-configuration/authentication/username-password/jdbc/build.gradle

@@ -16,7 +16,7 @@ repositories {
 dependencies {
 	implementation platform(libs.org.springframework.spring.framework.bom)
 	implementation platform(libs.org.springframework.security.spring.security.bom)
-	implementation platform("org.junit:junit-bom:5.10.3")
+	implementation platform("org.junit:junit-bom:5.10.5")
 
 	implementation "org.hsqldb:hsqldb:2.7.3"
 	implementation "org.springframework.security:spring-security-config"

servlet/java-configuration/authentication/username-password/ldap/build.gradle

@@ -16,7 +16,7 @@ repositories {
 dependencies {
 	implementation platform(libs.org.springframework.spring.framework.bom)
 	implementation platform(libs.org.springframework.security.spring.security.bom)
-	implementation platform("org.junit:junit-bom:5.10.3")
+	implementation platform("org.junit:junit-bom:5.10.5")
 
 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-ldap"

servlet/java-configuration/authentication/x509/build.gradle

@@ -16,7 +16,7 @@ repositories {
 dependencies {
 	implementation platform(libs.org.springframework.spring.framework.bom)
 	implementation platform(libs.org.springframework.security.spring.security.bom)
-	implementation platform("org.junit:junit-bom:5.10.3")
+	implementation platform("org.junit:junit-bom:5.10.5")
 
 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"

servlet/java-configuration/data/build.gradle

@@ -22,7 +22,7 @@ dependencies {
 	implementation platform(libs.org.springframework.security.spring.security.bom)
 	implementation platform(libs.org.springframework.data.spring.data.bom)
 	implementation "org.springframework.boot:spring-boot-starter-validation"
-	implementation platform("org.junit:junit-bom:5.10.3")
+	implementation platform("org.junit:junit-bom:5.10.5")
 
 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-data"

servlet/java-configuration/hello-mvc-security/build.gradle

@@ -16,7 +16,7 @@ repositories {
 dependencies {
 	implementation platform(libs.org.springframework.spring.framework.bom)
 	implementation platform(libs.org.springframework.security.spring.security.bom)
-	implementation platform("org.junit:junit-bom:5.10.3")
+	implementation platform("org.junit:junit-bom:5.10.5")
 
 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"

servlet/java-configuration/hello-security-explicit/build.gradle

@@ -16,7 +16,7 @@ repositories {
 dependencies {
 	implementation platform(libs.org.springframework.spring.framework.bom)
 	implementation platform(libs.org.springframework.security.spring.security.bom)
-	implementation platform("org.junit:junit-bom:5.10.3")
+	implementation platform("org.junit:junit-bom:5.10.5")
 
 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"

servlet/java-configuration/hello-security/build.gradle

@@ -16,7 +16,7 @@ repositories {
 dependencies {
 	implementation platform(libs.org.springframework.spring.framework.bom)
 	implementation platform(libs.org.springframework.security.spring.security.bom)
-	implementation platform("org.junit:junit-bom:5.10.3")
+	implementation platform("org.junit:junit-bom:5.10.5")
 
 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"

servlet/java-configuration/max-sessions/build.gradle

@@ -16,7 +16,7 @@ repositories {
 dependencies {
 	implementation platform(libs.org.springframework.spring.framework.bom)
 	implementation platform(libs.org.springframework.security.spring.security.bom)
-	implementation platform("org.junit:junit-bom:5.10.3")
+	implementation platform("org.junit:junit-bom:5.10.5")
 
 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"

servlet/java-configuration/saml2/login/build.gradle

@@ -37,7 +37,7 @@ dependencies {
 	}
 	implementation platform(libs.org.springframework.spring.framework.bom)
 	implementation platform(libs.org.springframework.security.spring.security.bom)
-	implementation platform("org.junit:junit-bom:5.10.3")
+	implementation platform("org.junit:junit-bom:5.10.5")
 
 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"

servlet/spring-boot/java/oauth2/restclient/build.gradle

@@ -6,6 +6,7 @@ plugins {
 }
 
 repositories {
+	mavenLocal()
 	mavenCentral()
 	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }

servlet/spring-boot/java/oauth2/restclient/src/main/java/example/RestClientConfiguration.java

@@ -41,7 +41,7 @@ public class RestClientConfiguration {
 		this.baseUrl = baseUrl;
 	}
 
-	@Bean
+//	@Bean
 	public RestClient restClient(OAuth2AuthorizedClientManager authorizedClientManager,
 			OAuth2AuthorizedClientRepository authorizedClientRepository,
 			OAuth2ClientHttpRequestInterceptor.ClientRegistrationIdResolver clientRegistrationIdResolver,

servlet/spring-boot/java/oauth2/restclient/src/main/java/example/SecurityConfiguration.java

@@ -19,10 +19,25 @@ package example;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.http.converter.FormHttpMessageConverter;
 import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient;
+import org.springframework.security.oauth2.client.endpoint.OAuth2ClientCredentialsGrantRequest;
+import org.springframework.security.oauth2.client.endpoint.RestClientClientCredentialsTokenResponseClient;
+import org.springframework.security.oauth2.client.http.OAuth2ErrorResponseErrorHandler;
+import org.springframework.security.oauth2.core.endpoint.OAuth2AccessTokenResponse;
+import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
+import org.springframework.security.oauth2.core.http.converter.OAuth2AccessTokenResponseHttpMessageConverter;
 import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.util.matcher.RequestMatcher;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestClient;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 /**
  * Security configuration for {@link OAuth2RestClientApplication}.
@@ -62,4 +77,55 @@ public class SecurityConfiguration {
 		return http.build();
 	}
 
+	@Bean
+	public OAuth2AccessTokenResponseClient<OAuth2ClientCredentialsGrantRequest> clientCredentialsAccessTokenResponseClient() {
+		RequestMatcher requestMatcher = (request) -> false;
+		Converter<OAuth2ClientCredentialsGrantRequest, MultiValueMap<String, String>> parametersConverter = (grantRequest) -> {
+			LinkedMultiValueMap<String, String> parameters = new LinkedMultiValueMap<>();
+			if (grantRequest.getClientRegistration().getRegistrationId().equals("okta")) {
+				parameters.set(OAuth2ParameterNames.CLIENT_ID, "my-client");
+			}
+			return parameters;
+		};
+
+		RestClientClientCredentialsTokenResponseClient accessTokenResponseClient =
+			new RestClientClientCredentialsTokenResponseClient();
+		accessTokenResponseClient.setParametersConverter(parametersConverter);
+
+		return accessTokenResponseClient;
+	}
+
+	private static Converter<OAuth2ClientCredentialsGrantRequest, MultiValueMap<String, String>> parametersConverter() {
+		RequestMatcher requestMatcher = (request) -> false;
+		return (grantRequest) -> {
+			ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+			LinkedMultiValueMap<String, String> parameters = new LinkedMultiValueMap<>();
+			if (requestMatcher.matches(requestAttributes.getRequest())) {
+				parameters.set(OAuth2ParameterNames.SCOPE, "scope-1 scope-2");
+			}
+			return parameters;
+		};
+	}
+
+	@Bean
+	public RestClient restClient() {
+		OAuth2AccessTokenResponseHttpMessageConverter messageConverter =
+			new OAuth2AccessTokenResponseHttpMessageConverter();
+		messageConverter.setAccessTokenResponseConverter((parameters) -> {
+			// ...
+			return OAuth2AccessTokenResponse.withToken("custom-token")
+				// ...
+				.build();
+		});
+
+		return RestClient.builder()
+			.messageConverters((messageConverters) -> {
+				messageConverters.clear();
+				messageConverters.add(new FormHttpMessageConverter());
+				messageConverters.add(messageConverter);
+			})
+			.defaultStatusHandler(new OAuth2ErrorResponseErrorHandler())
+			.build();
+	}
+
 }

servlet/xml/java/contacts/build.gradle

@@ -16,7 +16,7 @@ repositories {
 dependencies {
 	implementation platform(libs.org.springframework.security.spring.security.bom)
 	implementation platform(libs.org.springframework.spring.framework.bom)
-	implementation platform("org.junit:junit-bom:5.10.3")
+	implementation platform("org.junit:junit-bom:5.10.5")
 
 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"

servlet/xml/java/dms/build.gradle

@@ -12,7 +12,7 @@ repositories {
 dependencies {
 	implementation platform(libs.org.springframework.security.spring.security.bom)
 	implementation platform(libs.org.springframework.spring.framework.bom)
-	implementation platform("org.junit:junit-bom:5.10.3")
+	implementation platform("org.junit:junit-bom:5.10.5")
 
 	implementation 'org.springframework:spring-beans'
 	implementation 'org.springframework:spring-jdbc'

servlet/xml/java/helloworld/build.gradle

@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
 	implementation platform(libs.org.springframework.security.spring.security.bom)
-	implementation platform("org.junit:junit-bom:5.10.3")
+	implementation platform("org.junit:junit-bom:5.10.5")
 
 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"

servlet/xml/java/preauth/build.gradle

@@ -11,7 +11,7 @@ repositories {
 
 dependencies {
 	implementation platform(libs.org.springframework.security.spring.security.bom)
-	implementation platform("org.junit:junit-bom:5.10.3")
+	implementation platform("org.junit:junit-bom:5.10.5")
 
 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"

servlet/xml/java/saml2/login-logout/build.gradle

@@ -21,7 +21,7 @@ dependencies {
 	}
 	implementation platform(libs.org.springframework.spring.framework.bom)
 	implementation platform(libs.org.springframework.security.spring.security.bom)
-	implementation platform("org.junit:junit-bom:5.10.3")
+	implementation platform("org.junit:junit-bom:5.10.5")
 
 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"