Polish SAML2 tests

Polish
Add Gradle Enterprise plugin
2022-09-29 10:13:36 -03:00 · 2022-09-19 15:40:15 -03:00 · 2022-09-16 08:54:54 -03:00 · 2022-09-16 08:54:53 -03:00 · 2022-09-16 08:54:53 -03:00 · 2022-07-28 18:05:28 -06:00
170 changed files with 8898 additions and 807 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -4,5 +4,5 @@
  <component name="FrameworkDetectionExcludesConfiguration">
    <file type="web" url="file://$PROJECT_DIR$" />
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="temurin-11" project-jdk-type="JavaSDK" />
 </project>
--- a/build.gradle
+++ b/build.gradle
@ -21,3 +21,25 @@ allprojects {
 		}
 	}
 }
+
+if (hasProperty('buildScan')) {
+	buildScan {
+		termsOfServiceUrl = 'https://gradle.com/terms-of-service'
+		termsOfServiceAgree = 'yes'
+	}
+}
+
+repositories {
+	mavenCentral()
+}
+
+tasks.register('runAllTests') {
+	var allTasks = rootProject.getAllTasks(true)
+	var allTestsTasks = allTasks.values().collect { t ->
+		t.findAll { it.name == 'test' || it.name == 'integrationTest' }
+	}.flatten()
+	it.dependsOn {
+		allTestsTasks
+	}
+}
+
--- a/gradle.properties
+++ b/gradle.properties
@ -1,5 +1,5 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
 org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.parallel=true
 org.gradle.caching=true
--- a/reactive/rsocket/hello-security/build.gradle
+++ b/reactive/rsocket/hello-security/build.gradle
@ -6,7 +6,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -21,4 +22,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/reactive/rsocket/hello-security/gradle.properties
+++ b/reactive/rsocket/hello-security/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/reactive/webflux-fn/hello-security/build.gradle
+++ b/reactive/webflux-fn/hello-security/build.gradle
@ -6,7 +6,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -21,4 +22,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/reactive/webflux-fn/hello-security/gradle.properties
+++ b/reactive/webflux-fn/hello-security/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/reactive/webflux-fn/hello-security/src/test/java/example/HelloTests.java
+++ b/reactive/webflux-fn/hello-security/src/test/java/example/HelloTests.java
@ -28,7 +28,7 @@ import org.springframework.test.web.reactive.server.WebTestClient;
 * @since 5.0
 */
@SpringBootTest
-@AutoConfigureWebTestClient
+@AutoConfigureWebTestClient(timeout = "36000")
 public class HelloTests {

 	@Autowired
--- a/reactive/webflux-fn/hello/build.gradle
+++ b/reactive/webflux-fn/hello/build.gradle
@ -6,7 +6,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -19,4 +20,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/reactive/webflux-fn/hello/gradle.properties
+++ b/reactive/webflux-fn/hello/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/reactive/webflux-fn/hello/src/test/java/example/HelloTests.java
+++ b/reactive/webflux-fn/hello/src/test/java/example/HelloTests.java
@ -27,7 +27,7 @@ import org.springframework.test.web.reactive.server.WebTestClient;
 * @since 5.0
 */
@SpringBootTest
-@AutoConfigureWebTestClient
+@AutoConfigureWebTestClient(timeout = "36000")
 public class HelloTests {

 	@Autowired
--- a/reactive/webflux/java/authentication/username-password/form/build.gradle
+++ b/reactive/webflux/java/authentication/username-password/form/build.gradle
@ -6,7 +6,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -25,4 +26,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/reactive/webflux/java/authentication/username-password/form/gradle.properties
+++ b/reactive/webflux/java/authentication/username-password/form/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/reactive/webflux/java/authentication/x509/build.gradle
+++ b/reactive/webflux/java/authentication/x509/build.gradle
@ -6,7 +6,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -21,4 +22,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/reactive/webflux/java/authentication/x509/gradle.properties
+++ b/reactive/webflux/java/authentication/x509/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/reactive/webflux/java/hello-security-explicit/build.gradle
+++ b/reactive/webflux/java/hello-security-explicit/build.gradle
@ -6,7 +6,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -23,4 +24,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/reactive/webflux/java/hello-security-explicit/gradle.properties
+++ b/reactive/webflux/java/hello-security-explicit/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/reactive/webflux/java/hello-security-explicit/src/test/java/example/HelloSecurityTests.java
+++ b/reactive/webflux/java/hello-security-explicit/src/test/java/example/HelloSecurityTests.java
@ -28,7 +28,7 @@ import org.springframework.test.web.reactive.server.WebTestClient;
 * @since 5.0
 */
@SpringBootTest
-@AutoConfigureWebTestClient
+@AutoConfigureWebTestClient(timeout = "36000")
 public class HelloSecurityTests {

 	@Autowired
--- a/reactive/webflux/java/hello-security/build.gradle
+++ b/reactive/webflux/java/hello-security/build.gradle
@ -6,7 +6,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -21,4 +22,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/reactive/webflux/java/hello-security/gradle.properties
+++ b/reactive/webflux/java/hello-security/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/reactive/webflux/java/hello-security/src/test/java/example/HelloSecurityTests.java
+++ b/reactive/webflux/java/hello-security/src/test/java/example/HelloSecurityTests.java
@ -28,7 +28,7 @@ import org.springframework.test.web.reactive.server.WebTestClient;
 * @since 5.0
 */
@SpringBootTest
-@AutoConfigureWebTestClient
+@AutoConfigureWebTestClient(timeout = "36000")
 public class HelloSecurityTests {

 	@Autowired
--- a/reactive/webflux/java/hello/build.gradle
+++ b/reactive/webflux/java/hello/build.gradle
@ -6,7 +6,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -19,4 +20,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/reactive/webflux/java/hello/gradle.properties
+++ b/reactive/webflux/java/hello/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/reactive/webflux/java/hello/src/test/java/example/HelloTests.java
+++ b/reactive/webflux/java/hello/src/test/java/example/HelloTests.java
@ -27,7 +27,7 @@ import org.springframework.test.web.reactive.server.WebTestClient;
 * @since 5.0
 */
@SpringBootTest
-@AutoConfigureWebTestClient
+@AutoConfigureWebTestClient(timeout = "36000")
 public class HelloTests {

 	@Autowired
--- a/reactive/webflux/java/method/build.gradle
+++ b/reactive/webflux/java/method/build.gradle
@ -6,7 +6,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -21,4 +22,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/reactive/webflux/java/method/gradle.properties
+++ b/reactive/webflux/java/method/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/reactive/webflux/java/method/src/test/java/example/HelloMethodApplicationTests.java
+++ b/reactive/webflux/java/method/src/test/java/example/HelloMethodApplicationTests.java
@ -28,7 +28,7 @@ import org.springframework.test.web.reactive.server.WebTestClient;
 * @since 5.0
 */
@SpringBootTest
-@AutoConfigureWebTestClient
+@AutoConfigureWebTestClient(timeout = "36000")
 public class HelloMethodApplicationTests {

 	@Autowired
--- a/reactive/webflux/java/oauth2/login/build.gradle
+++ b/reactive/webflux/java/oauth2/login/build.gradle
@ -6,7 +6,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -24,4 +25,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/reactive/webflux/java/oauth2/login/gradle.properties
+++ b/reactive/webflux/java/oauth2/login/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/reactive/webflux/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java
+++ b/reactive/webflux/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java
@ -36,7 +36,7 @@ import static org.springframework.security.test.web.reactive.server.SecurityMock
 * @author Rob Winch
 */
@SpringBootTest
-@AutoConfigureWebTestClient
+@AutoConfigureWebTestClient(timeout = "36000")
 public class OAuth2LoginApplicationTests {

 	@Autowired
--- a/reactive/webflux/java/oauth2/resource-server/build.gradle
+++ b/reactive/webflux/java/oauth2/resource-server/build.gradle
@ -6,7 +6,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -21,4 +22,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/reactive/webflux/java/oauth2/resource-server/gradle.properties
+++ b/reactive/webflux/java/oauth2/resource-server/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/reactive/webflux/java/oauth2/resource-server/src/integTest/java/example/ServerOAuth2ResourceServerApplicationITests.java
+++ b/reactive/webflux/java/oauth2/resource-server/src/integTest/java/example/ServerOAuth2ResourceServerApplicationITests.java
@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.containsString;
 * @since 5.1
 */
@SpringBootTest
-@AutoConfigureWebTestClient
+@AutoConfigureWebTestClient(timeout = "36000")
@ActiveProfiles("test")
 public class ServerOAuth2ResourceServerApplicationITests {

--- a/reactive/webflux/java/oauth2/webclient/build.gradle
+++ b/reactive/webflux/java/oauth2/webclient/build.gradle
@ -6,7 +6,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -24,4 +25,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/reactive/webflux/java/oauth2/webclient/gradle.properties
+++ b/reactive/webflux/java/oauth2/webclient/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/reactive/webflux/java/oauth2/webclient/src/test/java/example/OAuth2WebClientControllerTests.java
+++ b/reactive/webflux/java/oauth2/webclient/src/test/java/example/OAuth2WebClientControllerTests.java
@ -39,7 +39,7 @@ import static org.springframework.security.test.web.reactive.server.SecurityMock

@WebFluxTest
@Import({ SecurityConfiguration.class, OAuth2WebClientController.class })
-@AutoConfigureWebTestClient
+@AutoConfigureWebTestClient(timeout = "36000")
 public class OAuth2WebClientControllerTests {

 	private static MockWebServer web = new MockWebServer();
--- a/reactive/webflux/java/oauth2/webclient/src/test/java/example/OAuth2WebClientWebFluxApplicationTests.java
+++ b/reactive/webflux/java/oauth2/webclient/src/test/java/example/OAuth2WebClientWebFluxApplicationTests.java
@ -27,7 +27,7 @@ import org.springframework.test.web.reactive.server.WebTestClient;
 * @author Rob Winch
 */
@SpringBootTest
-@AutoConfigureWebTestClient
+@AutoConfigureWebTestClient(timeout = "36000")
 public class OAuth2WebClientWebFluxApplicationTests {

 	@Autowired
--- a/reactive/webflux/java/oauth2/webclient/src/test/java/example/RegisteredOAuth2AuthorizedClientControllerTests.java
+++ b/reactive/webflux/java/oauth2/webclient/src/test/java/example/RegisteredOAuth2AuthorizedClientControllerTests.java
@ -39,7 +39,7 @@ import static org.springframework.security.test.web.reactive.server.SecurityMock

@WebFluxTest
@Import({ SecurityConfiguration.class, RegisteredOAuth2AuthorizedClientController.class })
-@AutoConfigureWebTestClient
+@AutoConfigureWebTestClient(timeout = "36000")
 public class RegisteredOAuth2AuthorizedClientControllerTests {

 	private static MockWebServer web = new MockWebServer();
--- a/reactive/webflux/kotlin/hello-security/gradle.properties
+++ b/reactive/webflux/kotlin/hello-security/gradle.properties
@ -1 +1 @@
-spring-security.version=5.6.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/servlet/java-configuration/aspectj/build.gradle
+++ b/servlet/java-configuration/aspectj/build.gradle
@ -4,17 +4,18 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

 dependencies {
-	aspect platform("org.springframework:spring-framework-bom:5.3.0")
-	aspect platform("org.springframework.security:spring-security-bom:5.4.0-SNAPSHOT")
+	aspect platform("org.springframework:spring-framework-bom:5.3.13")
+	aspect platform("org.springframework.security:spring-security-bom:5.8.0-SNAPSHOT")
 	aspect "org.springframework.security:spring-security-aspects"

-	implementation platform("org.springframework:spring-framework-bom:5.3.0")
-	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
+	implementation platform("org.springframework:spring-framework-bom:5.3.13")
+	implementation platform("org.springframework.security:spring-security-bom:5.8.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")

 	implementation "org.springframework.security:spring-security-config"
@ -31,6 +32,7 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }


--- a/servlet/java-configuration/authentication/preauth/build.gradle
+++ b/servlet/java-configuration/authentication/preauth/build.gradle
@ -8,13 +8,14 @@ plugins {
 apply from: "gradle/gretty.gradle"

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

 dependencies {
-	implementation platform("org.springframework:spring-framework-bom:5.3.0")
-	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
+	implementation platform("org.springframework:spring-framework-bom:5.3.13")
+	implementation platform("org.springframework.security:spring-security-bom:5.8.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")

 	implementation "org.springframework.security:spring-security-config"
@ -34,4 +35,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/java-configuration/authentication/preauth/src/main/java/example/SecurityConfiguration.java
+++ b/servlet/java-configuration/authentication/preauth/src/main/java/example/SecurityConfiguration.java
@ -18,26 +18,27 @@ package example;
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.SecurityFilterChain;

@EnableWebSecurity
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class SecurityConfiguration {

+	@Bean
+	public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
 		// @formatter:off
-	@Override
-	protected void configure(HttpSecurity http) throws Exception {
 		http
 				.authorizeHttpRequests((authorize) -> authorize
 						.antMatchers("/login", "/resources/**").permitAll()
 						.anyRequest().authenticated()
 				)
 				.jee((jee) -> jee.mappableRoles("USER", "ADMIN"));
-	}
 		// @formatter:on
+		return http.build();
+	}

 	// @formatter:off
 	@Bean
--- a/servlet/java-configuration/authentication/remember-me/build.gradle
+++ b/servlet/java-configuration/authentication/remember-me/build.gradle
@ -8,13 +8,14 @@ plugins {
 apply from: "gradle/gretty.gradle"

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

 dependencies {
-	implementation platform("org.springframework:spring-framework-bom:5.3.0")
-	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
+	implementation platform("org.springframework:spring-framework-bom:5.3.13")
+	implementation platform("org.springframework.security:spring-security-bom:5.8.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")

 	implementation "org.springframework.security:spring-security-config"
@ -34,4 +35,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/java-configuration/authentication/remember-me/src/main/java/example/SecurityConfiguration.java
+++ b/servlet/java-configuration/authentication/remember-me/src/main/java/example/SecurityConfiguration.java
@ -18,20 +18,18 @@ package example;
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
-
-import static org.springframework.security.config.Customizer.withDefaults;
+import org.springframework.security.web.SecurityFilterChain;

@EnableWebSecurity
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class SecurityConfiguration {

-	@Override
+	@Bean
+	public SecurityFilterChain securityFilterChain(HttpSecurity http, UserDetailsService users) throws Exception {
 		// @formatter:off
-	protected void configure(HttpSecurity http) throws Exception {
 		http
 				.authorizeRequests((authorize) -> authorize
 						.anyRequest().authenticated()
@ -40,9 +38,10 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 						.loginPage("/login")
 						.permitAll()
 				)
-			.rememberMe(withDefaults());
-	}
+				.rememberMe((rememberMe) -> rememberMe.userDetailsService(users));
 		// @formatter:on
+		return http.build();
+	}

 	// @formatter:off
 	@Bean
--- a/servlet/java-configuration/authentication/username-password/form/build.gradle
+++ b/servlet/java-configuration/authentication/username-password/form/build.gradle
@ -8,13 +8,14 @@ plugins {
 apply from: "gradle/gretty.gradle"

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

 dependencies {
-	implementation platform("org.springframework:spring-framework-bom:5.3.0")
-	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
+	implementation platform("org.springframework:spring-framework-bom:5.3.13")
+	implementation platform("org.springframework.security:spring-security-bom:5.8.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")

 	implementation "org.springframework.security:spring-security-config"
@ -34,4 +35,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/java-configuration/authentication/username-password/form/src/main/java/example/SecurityConfiguration.java
+++ b/servlet/java-configuration/authentication/username-password/form/src/main/java/example/SecurityConfiguration.java
@ -18,18 +18,18 @@ package example;
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.SecurityFilterChain;

@EnableWebSecurity
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class SecurityConfiguration {

-	@Override
+	@Bean
+	public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
 		// @formatter:off
-	protected void configure(HttpSecurity http) throws Exception {
 		http
 				.authorizeRequests((authorize) -> authorize
 						.anyRequest().authenticated()
@ -38,8 +38,9 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 						.loginPage("/login")
 						.permitAll()
 				);
-	}
 		// @formatter:on
+		return http.build();
+	}

 	// @formatter:off
 	@Bean
--- a/servlet/java-configuration/authentication/username-password/in-memory/build.gradle
+++ b/servlet/java-configuration/authentication/username-password/in-memory/build.gradle
@ -8,13 +8,14 @@ plugins {
 apply from: "gradle/gretty.gradle"

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

 dependencies {
-	implementation platform("org.springframework:spring-framework-bom:5.3.0")
-	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
+	implementation platform("org.springframework:spring-framework-bom:5.3.13")
+	implementation platform("org.springframework.security:spring-security-bom:5.8.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")

 	implementation "org.springframework.security:spring-security-config"
@ -34,4 +35,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/java-configuration/authentication/username-password/in-memory/src/main/java/example/SecurityConfiguration.java
+++ b/servlet/java-configuration/authentication/username-password/in-memory/src/main/java/example/SecurityConfiguration.java
@ -17,14 +17,13 @@ package example;

 import org.springframework.context.annotation.Bean;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;

@EnableWebSecurity
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class SecurityConfiguration {

 	// @formatter:off
 	@Bean
--- a/servlet/java-configuration/authentication/username-password/jdbc/build.gradle
+++ b/servlet/java-configuration/authentication/username-password/jdbc/build.gradle
@ -8,13 +8,14 @@ plugins {
 apply from: "gradle/gretty.gradle"

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

 dependencies {
-	implementation platform("org.springframework:spring-framework-bom:5.3.0")
-	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
+	implementation platform("org.springframework:spring-framework-bom:5.3.13")
+	implementation platform("org.springframework.security:spring-security-bom:5.8.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")

 	implementation "org.hsqldb:hsqldb:2.5.1"
@ -36,4 +37,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/java-configuration/authentication/username-password/jdbc/src/main/java/example/DataSourceConfiguration.java
+++ b/servlet/java-configuration/authentication/username-password/jdbc/src/main/java/example/DataSourceConfiguration.java
@ -34,7 +34,8 @@ public class DataSourceConfiguration {
 	@Bean
 	public DataSource dataSource() {
 		EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
-		return builder.setType(EmbeddedDatabaseType.HSQL).build();
+		return builder.setType(EmbeddedDatabaseType.HSQL)
+				.addScript("classpath:org/springframework/security/core/userdetails/jdbc/users.ddl").build();
 	}

 }
--- a/servlet/java-configuration/authentication/username-password/jdbc/src/main/java/example/SecurityConfiguration.java
+++ b/servlet/java-configuration/authentication/username-password/jdbc/src/main/java/example/SecurityConfiguration.java
@ -17,28 +17,27 @@ package example;

 import javax.sql.DataSource;

-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.context.annotation.Bean;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.provisioning.JdbcUserDetailsManager;
+import org.springframework.security.provisioning.UserDetailsManager;

@EnableWebSecurity
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class SecurityConfiguration {

-	@Autowired
-	DataSource dataSource;
-
-	// @formatter:off
-	@Autowired
-	public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-		auth
-				.jdbcAuthentication()
-				.dataSource(this.dataSource)
-				.withDefaultSchema()
-				.withUser(User.withDefaultPasswordEncoder().username("user").password("password").roles("USER"))
-				.withUser(User.withDefaultPasswordEncoder().username("admin").password("password").roles("ADMIN", "USER"));
+	@Bean
+	UserDetailsManager users(DataSource dataSource) {
+		UserDetails user = User.builder().username("user")
+				.password("{bcrypt}$2a$10$AiyMWI4UBLozgXq6itzyVuxrtofjcPzn/WS3fOrcqgzdax9jB7Io.").roles("USER").build();
+		UserDetails admin = User.builder().username("admin")
+				.password("{bcrypt}$2a$10$AiyMWI4UBLozgXq6itzyVuxrtofjcPzn/WS3fOrcqgzdax9jB7Io.").roles("USER", "ADMIN")
+				.build();
+		JdbcUserDetailsManager users = new JdbcUserDetailsManager(dataSource);
+		users.createUser(user);
+		users.createUser(admin);
+		return users;
 	}
-	// @formatter:on

 }
--- a/servlet/java-configuration/authentication/username-password/ldap/build.gradle
+++ b/servlet/java-configuration/authentication/username-password/ldap/build.gradle
@ -8,13 +8,14 @@ plugins {
 apply from: "gradle/gretty.gradle"

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

 dependencies {
-	implementation platform("org.springframework:spring-framework-bom:5.3.0")
-	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
+	implementation platform("org.springframework:spring-framework-bom:5.3.13")
+	implementation platform("org.springframework.security:spring-security-bom:5.8.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")

 	implementation "org.springframework.security:spring-security-config"
@ -37,4 +38,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/java-configuration/authentication/username-password/ldap/src/main/java/example/SecurityConfiguration.java
+++ b/servlet/java-configuration/authentication/username-password/ldap/src/main/java/example/SecurityConfiguration.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2022 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.
@ -17,39 +17,29 @@ package example;

 import org.springframework.context.annotation.Bean;
 import org.springframework.ldap.core.support.BaseLdapPathContextSource;
+import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.ldap.DefaultSpringSecurityContextSource;
-import org.springframework.security.ldap.authentication.BindAuthenticator;
-import org.springframework.security.ldap.authentication.LdapAuthenticationProvider;
-import org.springframework.security.ldap.authentication.LdapAuthenticator;
-import org.springframework.security.ldap.server.UnboundIdContainer;
+import org.springframework.security.config.ldap.EmbeddedLdapServerContextSourceFactoryBean;
+import org.springframework.security.config.ldap.LdapBindAuthenticationManagerFactory;
+import org.springframework.security.ldap.userdetails.PersonContextMapper;

@EnableWebSecurity
 public class SecurityConfiguration {

 	@Bean
-	UnboundIdContainer ldapContainer() {
-		UnboundIdContainer result = new UnboundIdContainer("dc=springframework,dc=org", "classpath:users.ldif");
-		result.setPort(0);
-		return result;
+	public EmbeddedLdapServerContextSourceFactoryBean contextSourceFactoryBean() {
+		EmbeddedLdapServerContextSourceFactoryBean contextSourceFactoryBean = EmbeddedLdapServerContextSourceFactoryBean
+				.fromEmbeddedLdapServer();
+		contextSourceFactoryBean.setPort(0);
+		return contextSourceFactoryBean;
 	}

 	@Bean
-	DefaultSpringSecurityContextSource contextSource(UnboundIdContainer container) {
-		return new DefaultSpringSecurityContextSource(
-				"ldap://localhost:" + container.getPort() + "/dc=springframework,dc=org");
-	}
-
-	@Bean
-	BindAuthenticator authenticator(BaseLdapPathContextSource contextSource) {
-		BindAuthenticator authenticator = new BindAuthenticator(contextSource);
-		authenticator.setUserDnPatterns(new String[] { "uid={0},ou=people" });
-		return authenticator;
-	}
-
-	@Bean
-	LdapAuthenticationProvider authenticationProvider(LdapAuthenticator authenticator) {
-		return new LdapAuthenticationProvider(authenticator);
+	AuthenticationManager authenticationManager(BaseLdapPathContextSource contextSource) {
+		LdapBindAuthenticationManagerFactory factory = new LdapBindAuthenticationManagerFactory(contextSource);
+		factory.setUserDnPatterns("uid={0},ou=people");
+		factory.setUserDetailsContextMapper(new PersonContextMapper());
+		return factory.createAuthenticationManager();
 	}

 }
--- a/servlet/java-configuration/authentication/x509/build.gradle
+++ b/servlet/java-configuration/authentication/x509/build.gradle
@ -8,13 +8,14 @@ plugins {
 //apply from: "gradle/gretty.gradle"

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

 dependencies {
-	implementation platform("org.springframework:spring-framework-bom:5.3.0")
-	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
+	implementation platform("org.springframework:spring-framework-bom:5.3.13")
+	implementation platform("org.springframework.security:spring-security-bom:5.8.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")

 	implementation "org.springframework.security:spring-security-config"
@ -32,4 +33,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/java-configuration/authentication/x509/src/main/java/example/SecurityConfiguration.java
+++ b/servlet/java-configuration/authentication/x509/src/main/java/example/SecurityConfiguration.java
@ -18,27 +18,28 @@ package example;
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.SecurityFilterChain;

 import static org.springframework.security.config.Customizer.withDefaults;

@EnableWebSecurity
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class SecurityConfiguration {

-	@Override
+	@Bean
+	public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
 		// @formatter:off
-	protected void configure(HttpSecurity http) throws Exception {
 		http
 				.authorizeHttpRequests((authorize) -> authorize
 						.anyRequest().authenticated()
 				)
 				.x509(withDefaults());
-	}
 		// @formatter:on
+		return http.build();
+	}

 	// @formatter:off
 	@Bean
--- a/servlet/java-configuration/data/build.gradle
+++ b/servlet/java-configuration/data/build.gradle
@ -4,14 +4,15 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

 dependencies {
-	implementation platform("org.springframework:spring-framework-bom:5.3.0")
+	implementation platform("org.springframework:spring-framework-bom:5.3.13")
 	implementation platform("org.springframework.data:spring-data-releasetrain:Neumann-SR5")
-	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
+	implementation platform("org.springframework.security:spring-security-bom:5.8.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")

 	implementation "org.springframework.security:spring-security-config"
@ -34,4 +35,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/java-configuration/hello-mvc-security/build.gradle
+++ b/servlet/java-configuration/hello-mvc-security/build.gradle
@ -8,13 +8,14 @@ plugins {
 apply from: "gradle/gretty.gradle"

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

 dependencies {
-	implementation platform("org.springframework:spring-framework-bom:5.3.0")
-	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
+	implementation platform("org.springframework:spring-framework-bom:5.3.13")
+	implementation platform("org.springframework.security:spring-security-bom:5.8.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")

 	implementation "org.springframework.security:spring-security-config"
@ -34,4 +35,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/java-configuration/hello-mvc-security/src/main/java/example/SecurityConfiguration.java
+++ b/servlet/java-configuration/hello-mvc-security/src/main/java/example/SecurityConfiguration.java
@ -18,28 +18,29 @@ package example;
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.SecurityFilterChain;

 import static org.springframework.security.config.Customizer.withDefaults;

@EnableWebSecurity
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class SecurityConfiguration {

-	@Override
+	@Bean
+	public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
 		// @formatter:off
-	protected void configure(HttpSecurity http) throws Exception {
 		http
 				.authorizeHttpRequests((authorize) -> authorize
 						.anyRequest().authenticated()
 				)
 				.httpBasic(withDefaults())
 				.formLogin(withDefaults());
-	}
 		// @formatter:on
+		return http.build();
+	}

 	// @formatter:off
 	@Bean
--- a/servlet/java-configuration/hello-security-explicit/build.gradle
+++ b/servlet/java-configuration/hello-security-explicit/build.gradle
@ -8,13 +8,14 @@ plugins {
 apply from: "gradle/gretty.gradle"

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

 dependencies {
-	implementation platform("org.springframework:spring-framework-bom:5.3.0")
-	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
+	implementation platform("org.springframework:spring-framework-bom:5.3.13")
+	implementation platform("org.springframework.security:spring-security-bom:5.8.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")

 	implementation "org.springframework.security:spring-security-config"
@ -37,4 +38,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/java-configuration/hello-security-explicit/src/main/java/example/SecurityConfiguration.java
+++ b/servlet/java-configuration/hello-security-explicit/src/main/java/example/SecurityConfiguration.java
@ -18,28 +18,29 @@ package example;
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.SecurityFilterChain;

 import static org.springframework.security.config.Customizer.withDefaults;

@EnableWebSecurity
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class SecurityConfiguration {

-	@Override
+	@Bean
+	public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
 		// @formatter:off
-	protected void configure(HttpSecurity http) throws Exception {
 		http
 				.authorizeHttpRequests((authorize) -> authorize
 						.anyRequest().authenticated()
 				)
 				.httpBasic(withDefaults())
 				.formLogin(withDefaults());
-	}
 		// @formatter:on
+		return http.build();
+	}

 	// @formatter:off
 	@Bean
--- a/servlet/java-configuration/hello-security/build.gradle
+++ b/servlet/java-configuration/hello-security/build.gradle
@ -8,13 +8,14 @@ plugins {
 apply from: "gradle/gretty.gradle"

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

 dependencies {
-	implementation platform("org.springframework:spring-framework-bom:5.3.0")
-	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
+	implementation platform("org.springframework:spring-framework-bom:5.3.13")
+	implementation platform("org.springframework.security:spring-security-bom:5.8.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")

 	implementation "org.springframework.security:spring-security-config"
@ -37,4 +38,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/java-configuration/max-sessions/build.gradle
+++ b/servlet/java-configuration/max-sessions/build.gradle
@ -8,13 +8,14 @@ plugins {
 apply from: "gradle/gretty.gradle"

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

 dependencies {
-	implementation platform("org.springframework:spring-framework-bom:5.3.0")
-	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
+	implementation platform("org.springframework:spring-framework-bom:5.3.13")
+	implementation platform("org.springframework.security:spring-security-bom:5.8.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")

 	implementation "org.springframework.security:spring-security-config"
@ -34,4 +35,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/java-configuration/max-sessions/src/main/java/example/SecurityConfiguration.java
+++ b/servlet/java-configuration/max-sessions/src/main/java/example/SecurityConfiguration.java
@ -20,17 +20,35 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.SecurityFilterChain;

 import static org.springframework.security.config.Customizer.withDefaults;

@EnableWebSecurity
@EnableGlobalMethodSecurity(prePostEnabled = true)
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class SecurityConfiguration {
+
+	@Bean
+	public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+		// @formatter:off
+		http
+				.authorizeHttpRequests((authorize) -> authorize
+						.anyRequest().authenticated()
+				)
+				.formLogin(withDefaults())
+				.sessionManagement((sessions) -> sessions
+						.sessionConcurrency((concurrency) -> concurrency
+								.maximumSessions(1)
+								.expiredUrl("/login?expired")
+						)
+				);
+		// @formatter:on
+		return http.build();
+	}

 	// @formatter:off
 	@Bean
@ -44,21 +62,4 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 	}
 	// @formatter:on

-	// @formatter:off
-	@Override
-	protected void configure(HttpSecurity http) throws Exception {
-		http
-			.authorizeHttpRequests((authorize) -> authorize
-				.anyRequest().authenticated()
-			)
-			.formLogin(withDefaults())
-			.sessionManagement((sessions) -> sessions
-				.sessionConcurrency((concurrency) -> concurrency
-					.maximumSessions(1)
-					.expiredUrl("/login?expired")
-				)
-			);
-	}
-	// @formatter:on
-
 }
--- a/servlet/java-configuration/saml2/login/README.adoc
+++ b/servlet/java-configuration/saml2/login/README.adoc
@ -6,45 +6,46 @@ It uses https://simplesamlphp.org/[SimpleSAMLphp] as its asserting party.
 The sample application uses Spring Boot and the `spring-security-saml2-service-provider`
 module which is new in Spring Security 5.2.

-The https://docs.spring.io/spring-security/site/docs/5.6.0-SNAPSHOT/reference/html5/#servlet-saml2login-logout[SAML 2.0 Logout feature] is new in Spring Security 5.6.
+The https://docs.spring.io/spring-security/reference/servlet/saml2/logout.html[SAML 2.0 Logout feature] is new in Spring Security 5.6.

 == Goals

 === SAML 2.0 Login

-`saml2Login()` provides a very simple implementation of a Service Provider that can receive a SAML 2.0 Response via the HTTP-POST and HTTP-REDIRECT bindings against the SimpleSAMLphp SAML 2.0 reference implementation.
+`saml2Login()` provides a very simple implementation of a Service Provider that can receive a SAML 2.0 Response via the HTTP-POST and HTTP-REDIRECT bindings against the https://developer.okta.com/docs/guides/build-sso-integration/saml2/main/[Okta SAML 2.0 IDP] reference implementation.

 The following features are implemented in the MVP:

 1. Receive and validate a SAML 2.0 Response containing an assertion, and create a corresponding authentication in Spring Security
 2. Send a SAML 2.0 AuthNRequest to an Identity Provider
 3. Provide a framework for components used in SAML 2.0 authentication that can be swapped by configuration
-4. Work against the SimpleSAMLphp reference implementation
+4. Work against the Okta SAML 2.0 IDP reference implementation

 === SAML 2.0 Single Logout

-`saml2Logout()` supports RP- and AP-initiated SAML 2.0 Single Logout via the HTTP-POST and HTTP-REDIRECT bindings against the SimpleSAMLphp SAML 2.0 reference implementation.
+`saml2Logout()` supports RP- and AP-initiated SAML 2.0 Single Logout via the HTTP-POST and HTTP-REDIRECT bindings against the https://developer.okta.com/docs/guides/build-sso-integration/saml2/main/[Okta SAML 2.0 IDP] reference implementation.

 On this sample, the SAML 2.0 Logout is using the HTTP-POST binding.

-You can refer to the https://docs.spring.io/spring-security/site/docs/5.6.0-SNAPSHOT/reference/html5/#servlet-saml2login-logout[reference documentation] for more details about the RP- and AP-initiated SAML 2.0 Logout.
+You can refer to the https://docs.spring.io/spring-security/reference/servlet/saml2/logout.html[reference documentation] for more details about the RP- and AP-initiated SAML 2.0 Logout.

 == Run the Sample

-=== Start up the application
-
-You should run the application war in a servlet container like Tomcat
+=== Start up the Sample Boot Application
+```
+ ./gradlew :spring-security-samples-boot-saml2login:bootRun
+```

 === Open a Browser

 http://localhost:8080/

-You will be redirect to the SimpleSAMLphp IDP
+You will be redirect to the Okta SAML 2.0 IDP

 === Type in your credentials

 ```
-User: user
-Password: password
+User: testuser@spring.security.saml
+Password: 12345678
 ```

--- a/servlet/java-configuration/saml2/login/build.gradle
+++ b/servlet/java-configuration/saml2/login/build.gradle
@ -24,7 +24,8 @@ plugins {
 apply from: "gradle/gretty.gradle"

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 	maven { url "https://build.shibboleth.net/nexus/content/repositories/releases/" }
 }
@ -36,7 +37,7 @@ dependencies {
 		implementation "org.opensaml:opensaml-saml-impl:4.1.1"
 	}
 	implementation platform("org.springframework:spring-framework-bom:5.3.11")
-	implementation platform("org.springframework.security:spring-security-bom:5.6.0-SNAPSHOT")
+	implementation platform("org.springframework.security:spring-security-bom:5.8.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")

 	implementation "org.springframework.security:spring-security-config"
@ -63,4 +64,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/java-configuration/saml2/login/src/integTest/java/example/Saml2JavaConfigurationITests.java
+++ b/servlet/java-configuration/saml2/login/src/integTest/java/example/Saml2JavaConfigurationITests.java
@ -16,15 +16,17 @@

 package example;

-import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;

+import com.gargoylesoftware.htmlunit.ElementNotFoundException;
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlInput;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput;
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@ -40,6 +42,8 @@ import org.springframework.test.web.servlet.htmlunit.MockMvcWebClientBuilder;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;

+import static org.assertj.core.api.Assertions.assertThat;
+
@ExtendWith(SpringExtension.class)
@ContextConfiguration(classes = ApplicationConfiguration.class)
@WebAppConfiguration
@ -66,35 +70,58 @@ public class Saml2JavaConfigurationITests {

 	@Test
 	void authenticationAttemptWhenValidThenShowsUserEmailAddress() throws Exception {
-		HtmlPage relyingParty = performLogin();
-		Assertions.assertThat(relyingParty.asText()).contains("You're email address is testuser@spring.security.saml");
+		performLogin();
+		HtmlPage home = (HtmlPage) this.webClient.getCurrentWindow().getEnclosedPage();
+		assertThat(home.asText()).contains("You're email address is testuser@spring.security.saml");
 	}

 	@Test
 	void logoutWhenRelyingPartyInitiatedLogoutThenLoginPageWithLogoutParam() throws Exception {
-		HtmlPage relyingParty = performLogin();
-		HtmlElement rpLogoutButton = relyingParty.getHtmlElementById("rp_logout_button");
+		performLogin();
+		HtmlPage home = (HtmlPage) this.webClient.getCurrentWindow().getEnclosedPage();
+		HtmlElement rpLogoutButton = home.getHtmlElementById("rp_logout_button");
 		HtmlPage loginPage = rpLogoutButton.click();
-		Assertions.assertThat(loginPage.getUrl().getFile()).isEqualTo("/login?logout");
+		this.webClient.waitForBackgroundJavaScript(10000);
+		List<String> urls = new ArrayList<>();
+		urls.add(loginPage.getUrl().getFile());
+		urls.add(((HtmlPage) this.webClient.getCurrentWindow().getEnclosedPage()).getUrl().getFile());
+		assertThat(urls).withFailMessage(() -> {
+			// @formatter:off
+			String builder = loginPage.asXml()
+					+ "\n\n\n"
+					+ "Enclosing Page"
+					+ "\n\n\n"
+					+ ((HtmlPage) this.webClient.getCurrentWindow().getEnclosedPage()).asXml();
+			// @formatter:on
+			return builder;
+		}).contains("/login?logout");
 	}

-	@Test
-	void logoutWhenAssertingPartyInitiatedLogoutThenLoginPageWithLogoutParam() throws Exception {
-		HtmlPage relyingParty = performLogin();
-		HtmlElement apLogoutButton = relyingParty.getHtmlElementById("ap_logout_button");
-		HtmlPage loginPage = apLogoutButton.click();
-		Assertions.assertThat(loginPage.getUrl().getFile()).isEqualTo("/login?logout");
-	}
-
-	private HtmlPage performLogin() throws IOException {
+	private void performLogin() throws Exception {
 		HtmlPage login = this.webClient.getPage("/");
-		HtmlForm form = login.getFormByName("f");
+		this.webClient.waitForBackgroundJavaScript(10000);
+		HtmlForm form = findForm(login);
 		HtmlInput username = form.getInputByName("username");
-		HtmlInput password = form.getInputByName("password");
-		HtmlSubmitInput submit = login.getHtmlElementById("submit_button");
-		username.setValueAttribute("user");
-		password.setValueAttribute("password");
-		return submit.click();
+		HtmlPasswordInput password = form.getInputByName("password");
+		HtmlSubmitInput submit = login.getHtmlElementById("okta-signin-submit");
+		username.type("testuser@spring.security.saml");
+		password.type("12345678");
+		submit.click();
+		this.webClient.waitForBackgroundJavaScript(10000);
+	}
+
+	private HtmlForm findForm(HtmlPage login) {
+		for (HtmlForm form : login.getForms()) {
+			try {
+				if (form.getId().equals("form19")) {
+					return form;
+				}
+			}
+			catch (ElementNotFoundException ex) {
+				// Continue
+			}
+		}
+		throw new IllegalStateException("Could not resolve login form");
 	}

 }
--- a/servlet/java-configuration/saml2/login/src/main/java/example/IndexController.java
+++ b/servlet/java-configuration/saml2/login/src/main/java/example/IndexController.java
@ -31,7 +31,7 @@ public class IndexController {

 	@GetMapping("/")
 	public String index(Model model, @AuthenticationPrincipal Saml2AuthenticatedPrincipal principal) {
-		String emailAddress = principal.getFirstAttribute("emailAddress");
+		String emailAddress = principal.getFirstAttribute("email");
 		model.addAttribute("emailAddress", emailAddress);
 		model.addAttribute("userAttributes", principal.getAttributes());
 		return "index";
--- a/servlet/java-configuration/saml2/login/src/main/java/example/SecurityConfiguration.java
+++ b/servlet/java-configuration/saml2/login/src/main/java/example/SecurityConfiguration.java
@ -32,6 +32,7 @@ import org.springframework.security.saml2.provider.service.registration.InMemory
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository;
 import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrations;
+import org.springframework.security.saml2.provider.service.registration.Saml2MessageBinding;
 import org.springframework.security.web.SecurityFilterChain;

@EnableWebSecurity
@ -57,13 +58,16 @@ public class SecurityConfiguration {
 	@Bean
 	RelyingPartyRegistrationRepository relyingPartyRegistrationRepository() {
 		RelyingPartyRegistration relyingPartyRegistration = RelyingPartyRegistrations
-				.fromMetadataLocation("https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/metadata.php")
+				.fromMetadataLocation("https://dev-05937739.okta.com/app/exk46xofd8NZvFCpS5d7/sso/saml/metadata")
 				.registrationId("one")
 				.decryptionX509Credentials(
 						(c) -> c.add(Saml2X509Credential.decryption(this.privateKey, relyingPartyCertificate())))
 				.signingX509Credentials(
 						(c) -> c.add(Saml2X509Credential.signing(this.privateKey, relyingPartyCertificate())))
-				.build();
+				.singleLogoutServiceLocation(
+						"https://dev-05937739.okta.com/app/dev-05937739_springgsecuritysaml2idp_1/exk46xofd8NZvFCpS5d7/slo/saml")
+				.singleLogoutServiceResponseLocation("http://localhost:8080/logout/saml2/slo")
+				.singleLogoutServiceBinding(Saml2MessageBinding.POST).build();

 		return new InMemoryRelyingPartyRegistrationRepository(relyingPartyRegistration);
 	}
--- a/servlet/java-configuration/saml2/login/src/main/resources/templates/index.html
+++ b/servlet/java-configuration/saml2/login/src/main/resources/templates/index.html
@ -36,11 +36,6 @@
                </button>
            </form>
        </li>
-        <li class="nav-item">
-            <a id="ap_logout_button" class="nav-link" href="https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SingleLogoutService.php?ReturnTo=http://localhost:8080/login?logout">
-                AP-initiated Logout
-            </a>
-        </li>
    </ul>
    </div>
    <main role="main" class="container">
--- a/servlet/spring-boot/java/authentication/username-password/mfa/build.gradle
+++ b/servlet/spring-boot/java/authentication/username-password/mfa/build.gradle
@ -6,7 +6,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -24,4 +25,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/spring-boot/java/authentication/username-password/mfa/gradle.properties
+++ b/servlet/spring-boot/java/authentication/username-password/mfa/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/build.gradle
+++ b/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/build.gradle
@ -6,7 +6,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -20,4 +21,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/gradle.properties
+++ b/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/servlet/spring-boot/java/hello-security-explicit/build.gradle
+++ b/servlet/spring-boot/java/hello-security-explicit/build.gradle
@ -6,7 +6,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -23,4 +24,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/spring-boot/java/hello-security-explicit/gradle.properties
+++ b/servlet/spring-boot/java/hello-security-explicit/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/servlet/spring-boot/java/hello-security-explicit/src/main/java/example/SecurityConfiguration.java
+++ b/servlet/spring-boot/java/hello-security-explicit/src/main/java/example/SecurityConfiguration.java
@ -20,10 +20,10 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.SecurityFilterChain;

 import static org.springframework.security.config.Customizer.withDefaults;

@ -34,19 +34,20 @@ import static org.springframework.security.config.Customizer.withDefaults;
 */
@Configuration
@EnableWebSecurity
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class SecurityConfiguration {

-	@Override
+	@Bean
+	public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
 		// @formatter:off
-	protected void configure(HttpSecurity http) throws Exception {
 		http
 				.authorizeHttpRequests((authorize) -> authorize
 						.anyRequest().authenticated()
 				)
 				.httpBasic(withDefaults())
 				.formLogin(withDefaults());
-	}
 		// @formatter:on
+		return http.build();
+	}

 	// @formatter:off
 	@Bean
--- a/servlet/spring-boot/java/hello-security/build.gradle
+++ b/servlet/spring-boot/java/hello-security/build.gradle
@ -6,7 +6,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -21,4 +22,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/spring-boot/java/hello-security/gradle.properties
+++ b/servlet/spring-boot/java/hello-security/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/servlet/spring-boot/java/hello/build.gradle
+++ b/servlet/spring-boot/java/hello/build.gradle
@ -6,7 +6,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -19,4 +20,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/spring-boot/java/hello/gradle.properties
+++ b/servlet/spring-boot/java/hello/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/servlet/spring-boot/java/jwt/login/build.gradle
+++ b/servlet/spring-boot/java/jwt/login/build.gradle
@ -5,7 +5,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -19,4 +20,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/spring-boot/java/jwt/login/gradle.properties
+++ b/servlet/spring-boot/java/jwt/login/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/servlet/spring-boot/java/jwt/login/src/main/java/example/RestConfig.java
+++ b/servlet/spring-boot/java/jwt/login/src/main/java/example/RestConfig.java
@ -31,7 +31,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.core.userdetails.User;
@ -43,6 +42,7 @@ import org.springframework.security.oauth2.jwt.NimbusJwtEncoder;
 import org.springframework.security.oauth2.server.resource.web.BearerTokenAuthenticationEntryPoint;
 import org.springframework.security.oauth2.server.resource.web.access.BearerTokenAccessDeniedHandler;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.SecurityFilterChain;

 /**
 * Security configuration for the main application.
@ -50,7 +50,7 @@ import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 * @author Josh Cummings
 */
@Configuration
-public class RestConfig extends WebSecurityConfigurerAdapter {
+public class RestConfig {

 	@Value("${jwt.public.key}")
 	RSAPublicKey key;
@ -58,8 +58,8 @@ public class RestConfig extends WebSecurityConfigurerAdapter {
 	@Value("${jwt.private.key}")
 	RSAPrivateKey priv;

-	@Override
-	protected void configure(HttpSecurity http) throws Exception {
+	@Bean
+	public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
 		// @formatter:off
 		http
 				.authorizeHttpRequests((authorize) -> authorize
@ -74,6 +74,7 @@ public class RestConfig extends WebSecurityConfigurerAdapter {
 						.accessDeniedHandler(new BearerTokenAccessDeniedHandler())
 				);
 		// @formatter:on
+		return http.build();
 	}

 	@Bean
--- a/servlet/spring-boot/java/jwt/login/src/test/java/example/web/HelloControllerTests.java
+++ b/servlet/spring-boot/java/jwt/login/src/test/java/example/web/HelloControllerTests.java
@ -16,10 +16,12 @@

 package example.web;

+import example.RestConfig;
 import org.junit.jupiter.api.Test;

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;

@ -35,6 +37,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 * @author Josh Cummings
 */
@WebMvcTest({ HelloController.class, TokenController.class })
+@Import(RestConfig.class)
 public class HelloControllerTests {

 	@Autowired
--- a/servlet/spring-boot/java/ldap/build.gradle
+++ b/servlet/spring-boot/java/ldap/build.gradle
@ -5,7 +5,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -21,4 +22,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/spring-boot/java/ldap/gradle.properties
+++ b/servlet/spring-boot/java/ldap/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/servlet/spring-boot/java/ldap/src/main/java/example/SecurityConfig.java
+++ b/servlet/spring-boot/java/ldap/src/main/java/example/SecurityConfig.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@ -18,13 +18,10 @@ package example;

 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.ldap.core.ContextSource;
 import org.springframework.ldap.core.support.BaseLdapPathContextSource;
-import org.springframework.security.ldap.DefaultSpringSecurityContextSource;
-import org.springframework.security.ldap.authentication.BindAuthenticator;
-import org.springframework.security.ldap.authentication.LdapAuthenticationProvider;
-import org.springframework.security.ldap.authentication.LdapAuthenticator;
-import org.springframework.security.ldap.server.UnboundIdContainer;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.ldap.EmbeddedLdapServerContextSourceFactoryBean;
+import org.springframework.security.config.ldap.LdapBindAuthenticationManagerFactory;
 import org.springframework.security.ldap.userdetails.PersonContextMapper;

 /**
@ -36,30 +33,19 @@ import org.springframework.security.ldap.userdetails.PersonContextMapper;
 public class SecurityConfig {

 	@Bean
-	UnboundIdContainer ldapContainer() {
-		UnboundIdContainer container = new UnboundIdContainer("dc=springframework,dc=org", "classpath:users.ldif");
-		container.setPort(0);
-		return container;
+	public EmbeddedLdapServerContextSourceFactoryBean contextSourceFactoryBean() {
+		EmbeddedLdapServerContextSourceFactoryBean contextSourceFactoryBean = EmbeddedLdapServerContextSourceFactoryBean
+				.fromEmbeddedLdapServer();
+		contextSourceFactoryBean.setPort(0);
+		return contextSourceFactoryBean;
 	}

 	@Bean
-	ContextSource contextSource(UnboundIdContainer container) {
-		int port = container.getPort();
-		return new DefaultSpringSecurityContextSource("ldap://localhost:" + port + "/dc=springframework,dc=org");
-	}
-
-	@Bean
-	BindAuthenticator authenticator(BaseLdapPathContextSource contextSource) {
-		BindAuthenticator authenticator = new BindAuthenticator(contextSource);
-		authenticator.setUserDnPatterns(new String[] { "uid={0},ou=people" });
-		return authenticator;
-	}
-
-	@Bean
-	LdapAuthenticationProvider authenticationProvider(LdapAuthenticator authenticator) {
-		LdapAuthenticationProvider provider = new LdapAuthenticationProvider(authenticator);
-		provider.setUserDetailsContextMapper(new PersonContextMapper());
-		return provider;
+	AuthenticationManager authenticationManager(BaseLdapPathContextSource contextSource) {
+		LdapBindAuthenticationManagerFactory factory = new LdapBindAuthenticationManagerFactory(contextSource);
+		factory.setUserDnPatterns("uid={0},ou=people");
+		factory.setUserDetailsContextMapper(new PersonContextMapper());
+		return factory.createAuthenticationManager();
 	}

 }
--- a/servlet/spring-boot/java/oauth2/authorization-server/build.gradle
+++ b/servlet/spring-boot/java/oauth2/authorization-server/build.gradle
@ -6,13 +6,14 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
-	implementation 'org.springframework.security:spring-security-oauth2-authorization-server:0.2.0'
+	implementation 'org.springframework.security:spring-security-oauth2-authorization-server:0.2.3'

 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
@ -22,4 +23,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/spring-boot/java/oauth2/authorization-server/gradle.properties
+++ b/servlet/spring-boot/java/oauth2/authorization-server/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/servlet/spring-boot/java/oauth2/login/build.gradle
+++ b/servlet/spring-boot/java/oauth2/login/build.gradle
@ -6,7 +6,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -24,4 +25,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/spring-boot/java/oauth2/login/gradle.properties
+++ b/servlet/spring-boot/java/oauth2/login/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/servlet/spring-boot/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java
+++ b/servlet/spring-boot/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java
@ -44,7 +44,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient;
 import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest;
@ -63,6 +62,7 @@ import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
 import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.security.oauth2.core.user.OAuth2UserAuthority;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
@ -328,11 +328,11 @@ public class OAuth2LoginApplicationTests {
 	}

 	@EnableWebSecurity
-	public static class SecurityTestConfig extends WebSecurityConfigurerAdapter {
+	public static class SecurityTestConfig {

+		@Bean
+		public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
 			// @formatter:off
-		@Override
-		protected void configure(HttpSecurity http) throws Exception {
 			http
 					.authorizeHttpRequests((authorize) -> authorize
 							.anyRequest().authenticated()
@ -341,8 +341,9 @@ public class OAuth2LoginApplicationTests {
 							.tokenEndpoint((token) -> token.accessTokenResponseClient(mockAccessTokenResponseClient()))
 							.userInfoEndpoint((userInfo) -> userInfo.userService(mockUserService()))
 					);
-		}
 			// @formatter:on
+			return http.build();
+		}

 		private OAuth2AccessTokenResponseClient<OAuth2AuthorizationCodeGrantRequest> mockAccessTokenResponseClient() {
 			OAuth2AccessTokenResponse accessTokenResponse = OAuth2AccessTokenResponse.withToken("access-token-1234")
--- a/servlet/spring-boot/java/oauth2/resource-server/hello-security/build.gradle
+++ b/servlet/spring-boot/java/oauth2/resource-server/hello-security/build.gradle
@ -6,7 +6,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -21,4 +22,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/spring-boot/java/oauth2/resource-server/hello-security/gradle.properties
+++ b/servlet/spring-boot/java/oauth2/resource-server/hello-security/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/servlet/spring-boot/java/oauth2/resource-server/hello-security/src/main/java/example/OAuth2ResourceServerSecurityConfiguration.java
+++ b/servlet/spring-boot/java/oauth2/resource-server/hello-security/src/main/java/example/OAuth2ResourceServerSecurityConfiguration.java
@ -20,10 +20,10 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.http.HttpMethod;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.security.oauth2.jwt.NimbusJwtDecoder;
+import org.springframework.security.web.SecurityFilterChain;

 /**
 * OAuth resource configuration.
@ -31,13 +31,13 @@ import org.springframework.security.oauth2.jwt.NimbusJwtDecoder;
 * @author Josh Cummings
 */
@EnableWebSecurity
-public class OAuth2ResourceServerSecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class OAuth2ResourceServerSecurityConfiguration {

 	@Value("${spring.security.oauth2.resourceserver.jwt.jwk-set-uri}")
 	String jwkSetUri;

-	@Override
-	protected void configure(HttpSecurity http) throws Exception {
+	@Bean
+	public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
 		// @formatter:off
 		http
 				.authorizeHttpRequests((authorize) -> authorize
@ -47,6 +47,7 @@ public class OAuth2ResourceServerSecurityConfiguration extends WebSecurityConfig
 				)
 				.oauth2ResourceServer(OAuth2ResourceServerConfigurer::jwt);
 		// @formatter:on
+		return http.build();
 	}

 	@Bean
--- a/servlet/spring-boot/java/oauth2/resource-server/hello-security/src/test/java/example/OAuth2ResourceServerControllerTests.java
+++ b/servlet/spring-boot/java/oauth2/resource-server/hello-security/src/test/java/example/OAuth2ResourceServerControllerTests.java
@ -19,6 +19,7 @@ import org.junit.jupiter.api.Test;

 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.test.web.servlet.MockMvc;

@ -36,6 +37,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 *
 */
@WebMvcTest(OAuth2ResourceServerController.class)
+@Import(OAuth2ResourceServerSecurityConfiguration.class)
 public class OAuth2ResourceServerControllerTests {

 	@Autowired
--- a/servlet/spring-boot/java/oauth2/resource-server/jwe/build.gradle
+++ b/servlet/spring-boot/java/oauth2/resource-server/jwe/build.gradle
@ -22,7 +22,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -37,4 +38,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/servlet/spring-boot/java/oauth2/resource-server/jwe/gradle.properties
+++ b/servlet/spring-boot/java/oauth2/resource-server/jwe/gradle.properties
@ -1,2 +1,2 @@
-version=5.6.0-SNAPSHOT
-spring-security.version=5.6.0-SNAPSHOT
+version=5.8.0-SNAPSHOT
+spring-security.version=5.8.0-SNAPSHOT
--- a/servlet/spring-boot/java/oauth2/resource-server/jwe/src/main/java/example/OAuth2ResourceServerSecurityConfiguration.java
+++ b/servlet/spring-boot/java/oauth2/resource-server/jwe/src/main/java/example/OAuth2ResourceServerSecurityConfiguration.java
@ -42,9 +42,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.security.oauth2.jwt.NimbusJwtDecoder;
+import org.springframework.security.web.SecurityFilterChain;

 import static org.springframework.security.config.Customizer.withDefaults;

@ -54,7 +54,7 @@ import static org.springframework.security.config.Customizer.withDefaults;
 * @author Josh Cummings
 */
@EnableWebSecurity
-public class OAuth2ResourceServerSecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class OAuth2ResourceServerSecurityConfiguration {

 	private final JWSAlgorithm jwsAlgorithm = JWSAlgorithm.RS256;

@ -68,8 +68,8 @@ public class OAuth2ResourceServerSecurityConfiguration extends WebSecurityConfig
 	@Value("${sample.jwe-key-value}")
 	RSAPrivateKey key;

-	@Override
-	protected void configure(HttpSecurity http) throws Exception {
+	@Bean
+	public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
 		// @formatter:off
 		http
 				.authorizeHttpRequests((authorize) -> authorize
@ -78,6 +78,7 @@ public class OAuth2ResourceServerSecurityConfiguration extends WebSecurityConfig
 				)
 				.oauth2ResourceServer((oauth2) -> oauth2.jwt(withDefaults()));
 		// @formatter:on
+		return http.build();
 	}

 	@Bean
--- a/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/build.gradle
+++ b/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/build.gradle
@ -22,7 +22,8 @@ plugins {
 }

 repositories {
-	jcenter()
+	mavenCentral()
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
 }

@ -38,4 +39,5 @@ dependencies {

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
+	outputs.upToDateWhen { false }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Marcus Da Coregio	9f6b38bf33	Polish SAML2 tests	2022-09-29 10:13:36 -03:00
Marcus Da Coregio	65d4b2ec4b	Polish	2022-09-19 15:40:15 -03:00
Marcus Da Coregio	2eb0b65eab	Add Gradle Enterprise plugin Issue gh-94	2022-09-16 08:54:54 -03:00
Marcus Da Coregio	5a7114519c	Accept gradle Terms of Service Issue gh-94	2022-09-16 08:54:53 -03:00
Marcus Da Coregio	991e26eff6	Add new task that runs all subproject's tests	2022-09-16 08:54:53 -03:00
Josh Cummings	a75deea833	Use url instead of response-url	2022-07-28 18:05:28 -06:00
Marcus Da Coregio	91ccd91eaa	Fix command to run Spring Boot SAML2 samples	2022-07-28 16:17:29 -03:00
Josh Cummings	eb69904f4d	Simplify Saml2 Login Sample	2022-07-27 17:09:33 -06:00
Josh Cummings	57a3de019e	Update Dependencies for Saml2 Login Sample	2022-07-27 17:09:33 -06:00
Rob Winch	eb3ea3ded6	Update aspectj Spring Security 5.8.0-SNAPSHOT	2022-07-06 09:56:39 -05:00
Marcus Da Coregio	1e354a3587	Switch remaining jcenter() to mavenCentral()	2022-05-13 15:24:02 -06:00
Marcus Da Coregio	8de55d289d	Switch from jcenter() to mavenCentral()	2022-05-13 15:23:49 -06:00
Marcus Da Coregio	5834a59ce6	Use Spring Security 5.8.0-SNAPSHOT Issue gh-77	2022-05-12 10:05:52 -03:00
Marcus Da Coregio	b67e18fb82	Add init script to be used in Spring Security CI Issue https://github.com/spring-projects/spring-security/issues/10344	2022-05-11 16:05:03 -03:00
Steve Riesenberg	dbf3fbb635	Update to Spring Authorization Server 0.2.3	2022-03-28 11:22:43 -05:00
Marcus Da Coregio	a4c998ed77	Update README for SAML 2.0 samples	2022-03-28 11:00:25 -03:00
Marcus Da Coregio	da6fa7a565	Re-enable SAML 2.0 samples with Okta IdP Closes gh-55	2022-03-17 09:19:45 -03:00
Marcus Da Coregio	802311ac70	SAML 2.0 Login & Logout XML Sample Issue gh-57	2022-03-10 12:17:21 -03:00
Eleftheria Stein	2ddf0a2fa9	Update LDAP samples to use LdapBindAuthenticationManagerFactory Closes gh-61	2022-01-31 12:37:36 +01:00
Steve Riesenberg	a19471b510	Update Spring Authorization Server to 0.2.1	2022-01-20 11:41:45 -06:00
Steve Riesenberg	73fbaa9950	Add milestone repository Closes gh-58	2022-01-14 13:40:19 -06:00
Marcus Da Coregio	0e4e7c7373	Remove remaining usage of WebSecurityConfigurerAdapter	2021-12-15 09:22:40 -03:00
Eleftheria Stein	48e4401507	Temporarily disable tests on SAML2 samples Issue gh-55	2021-12-13 17:36:14 +01:00
Eleftheria Stein	0e91e6300e	Prevent gradle cache on tests Closes gh-54	2021-12-13 17:04:46 +01:00
Marcus Da Coregio	0818005c46	Increase timeout for WebTestClient Sometimes the tests fail with the message Timeout on blocking read for 5000000000 NANOSECONDS	2021-12-10 14:28:52 -03:00
Marcus Da Coregio	08166219c7	Use Spring Security 5.7.0-SNAPSHOT	2021-12-10 14:25:44 -03:00
Marcus Da Coregio	6b3e6546aa	Fix broken links Issue gh-53	2021-12-10 14:14:15 -03:00
Marcus Da Coregio	1181eb2b3d	Fix broken links in README Closes gh-53	2021-12-10 13:50:35 -03:00
Marcus Da Coregio	526bc16f7e	Remove usage of WebSecurityConfigurerAdapter Switch to expose a SecurityFilterChain Bean Closes gh-52	2021-12-10 09:53:33 -03:00