Use JDK 11

Closes gh-21
Update to Spring Security 5.5.0
2021-05-27 10:41:22 -06:00 · 2021-05-27 10:29:08 -06:00 · 2021-05-27 10:29:08 -06:00 · 2021-05-27 10:29:03 -06:00 · 2021-05-27 09:40:38 -06:00 · 2021-05-27 09:34:59 -06:00
381 changed files with 619 additions and 19402 deletions
@@ -73,7 +73,6 @@ local.properties
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

 # User-specific stuff
-.idea/**/libraries-with-intellij-classes.xml
 .idea/**/workspace.xml
 .idea/**/tasks.xml
 .idea/**/usage.statistics.xml
@@ -1,71 +1,3 @@
 image::https://github.com/spring-projects/spring-security-samples/workflows/CI/badge.svg[link=https://github.com/spring-projects/spring-security-samples/actions?query=workflow%3ACI]

 Samples for https://github.com/spring-projects/spring-security
-
-== Samples catalog
-
-=== Getting Started
-
-* Hello Security - https://github.com/spring-projects/spring-security-samples/tree/main/servlet/spring-boot/java/hello-security[Spring Boot] | https://github.com/spring-projects/spring-security-samples/tree/main/reactive/webflux/java/hello-security[WebFlux] | https://github.com/spring-projects/spring-security-samples/tree/main/reactive/webflux-fn/hello-security[WebFlux.fn] | https://github.com/spring-projects/spring-security-samples/tree/main/servlet/java-configuration/hello-security[Java Configuration] | https://github.com/spring-projects/spring-security-samples/tree/main/servlet/xml/java/helloworld[XML] | https://github.com/spring-projects/spring-security-samples/tree/main/servlet/spring-boot/kotlin/hello-security[Kotlin] | https://github.com/spring-projects/spring-security-samples/tree/main/reactive/webflux/kotlin/hello-security[WebFlux Kotlin] | https://github.com/spring-projects/spring-security-samples/tree/main/reactive/rsocket/hello-security[RSocket]
-
-* Hello Security (without Spring MVC) - https://github.com/spring-projects/spring-security-samples/tree/main/servlet/java-configuration/hello-security-explicit[Java Configuration]
-
-* Hello Security with Explicit Configuration - https://github.com/spring-projects/spring-security-samples/tree/main/servlet/spring-boot/java/hello-security-explicit[Spring Boot] | https://github.com/spring-projects/spring-security-samples/tree/main/reactive/webflux/java/hello-security-explicit[WebFlux] | https://github.com/spring-projects/spring-security-samples/tree/main/servlet/java-configuration/hello-mvc-security[Java Configuration]
-
-* Method Security - https://github.com/spring-projects/spring-security-samples/tree/main/reactive/webflux/java/method[WebFlux]
-
-* Spring Data Integration - https://github.com/spring-projects/spring-security-samples/tree/main/servlet/java-configuration/data[Java Configuration]
-
-* Max Sessions - https://github.com/spring-projects/spring-security-samples/tree/main/servlet/java-configuration/max-sessions[Java Configuration]
-
-* AspectJ Security Configuration - https://github.com/spring-projects/spring-security-samples/tree/main/servlet/java-configuration/aspectj[Java Configuration]
-
-=== OAuth 2.0
-
-* https://github.com/spring-projects/spring-security-samples/tree/main/servlet/spring-boot/java/oauth2/authorization-server[Authorization Server]
-
-* Login - https://github.com/spring-projects/spring-security-samples/tree/main/servlet/spring-boot/java/oauth2/login[Spring Boot] | https://github.com/spring-projects/spring-security-samples/tree/main/reactive/webflux/java/oauth2/login[WebFlux]
-
-* Resource Server
-
-** Hello Security - https://github.com/spring-projects/spring-security-samples/tree/main/servlet/spring-boot/java/oauth2/resource-server/hello-security[Spring Boot] | https://github.com/spring-projects/spring-security-samples/tree/main/reactive/webflux/java/oauth2/resource-server[WebFlux]
-
-** https://github.com/spring-projects/spring-security-samples/tree/main/servlet/spring-boot/java/oauth2/resource-server/jwe[JSON Web Encryption (JWE)]
-
-** https://github.com/spring-projects/spring-security-samples/tree/main/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy[Multi-tenancy]
-
-** https://github.com/spring-projects/spring-security-samples/tree/main/servlet/spring-boot/java/oauth2/resource-server/opaque[Opaque Token]
-
-** https://github.com/spring-projects/spring-security-samples/tree/main/servlet/spring-boot/java/oauth2/resource-server/static[Static]
-
-* WebClient - https://github.com/spring-projects/spring-security-samples/tree/main/servlet/spring-boot/java/oauth2/webclient[Spring Boot] | https://github.com/spring-projects/spring-security-samples/tree/main/reactive/webflux/java/oauth2/webclient[WebFlux]
-
-=== SAML 2.0
-
-* Login & Logout - https://github.com/spring-projects/spring-security-samples/tree/main/servlet/spring-boot/java/saml2/login[Spring Boot] | https://github.com/spring-projects/spring-security-samples/tree/main/servlet/java-configuration/saml2/login[Java Configuration]
-
-=== Authentication
-
-* https://github.com/spring-projects/spring-security-samples/tree/main/servlet/java-configuration/authentication/preauth[Pre-authentication]
-
-* https://github.com/spring-projects/spring-security-samples/tree/main/servlet/java-configuration/authentication/remember-me[Remember-me]
-
-* Username and password
-
-** Form Login - https://github.com/spring-projects/spring-security-samples/tree/main/servlet/java-configuration/authentication/username-password/form[Java Configuration] | https://github.com/spring-projects/spring-security-samples/tree/main/reactive/webflux/java/authentication/username-password/form[WebFlux]
-
-** https://github.com/spring-projects/spring-security-samples/tree/main/servlet/java-configuration/authentication/username-password/in-memory[In-memory `UserDetailsService`]
-
-** https://github.com/spring-projects/spring-security-samples/tree/main/servlet/java-configuration/authentication/username-password/jdbc[JDBC]
-
-** https://github.com/spring-projects/spring-security-samples/tree/main/servlet/java-configuration/authentication/username-password/ldap[LDAP]
-
-** https://github.com/spring-projects/spring-security-samples/tree/main/servlet/spring-boot/java/authentication/username-password/mfa[Multi-factor authentication]
-
-** https://github.com/spring-projects/spring-security-samples/tree/main/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user[Custom `UserDetails`]
-
-* X.509 - https://github.com/spring-projects/spring-security-samples/tree/main/servlet/java-configuration/authentication/x509[Java Configuration] | https://github.com/spring-projects/spring-security-samples/tree/main/reactive/webflux/java/authentication/x509[WebFlux]
-
-=== JWT
-
-* Login - https://github.com/spring-projects/spring-security-samples/tree/main/servlet/spring-boot/java/jwt/login[Spring Boot]
@@ -20,26 +20,4 @@ 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
-	}
-}
-
+}
@@ -1,5 +1,5 @@
-version=5.6.0
-spring-security.version=5.6.0
+version=5.5.0
+spring-security.version=5.5.0
 org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.parallel=true
 org.gradle.caching=true
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,7 +1,7 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
+	id 'org.springframework.boot' version '2.5.0'
 	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
-	id "nebula.integtest" version "8.2.0"
+	id "nebula.integtest" version "7.0.9"
 	id 'java'
 }

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,2 +1,2 @@
-version=5.6.0
-spring-security.version=5.6.0
+version=5.5.0
+spring-security.version=5.5.0
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,7 +1,7 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
+	id 'org.springframework.boot' version '2.5.0'
 	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
-	id "nebula.integtest" version "8.2.0"
+	id "nebula.integtest" version "7.0.9"
 	id 'java'
 }

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,2 +1,2 @@
-version=5.6.0
-spring-security.version=5.6.0
+version=5.5.0
+spring-security.version=5.5.0
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -28,7 +28,7 @@ import org.springframework.test.web.reactive.server.WebTestClient;
 * @since 5.0
 */
@SpringBootTest
-@AutoConfigureWebTestClient(timeout = "36000")
+@AutoConfigureWebTestClient
 public class HelloTests {

 	@Autowired
@@ -1,7 +1,7 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
+	id 'org.springframework.boot' version '2.5.0'
 	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
-	id "nebula.integtest" version "8.2.0"
+	id "nebula.integtest" version "7.0.9"
 	id 'java'
 }

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,2 +1,2 @@
-version=5.6.0
-spring-security.version=5.6.0
+version=5.5.0
+spring-security.version=5.5.0
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -27,7 +27,7 @@ import org.springframework.test.web.reactive.server.WebTestClient;
 * @since 5.0
 */
@SpringBootTest
-@AutoConfigureWebTestClient(timeout = "36000")
+@AutoConfigureWebTestClient
 public class HelloTests {

 	@Autowired
@@ -1,7 +1,7 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
+	id 'org.springframework.boot' version '2.5.0'
 	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
-	id "nebula.integtest" version "8.2.0"
+	id "nebula.integtest" version "7.0.9"
 	id 'java'
 }

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,2 +1,2 @@
-version=5.6.0
-spring-security.version=5.6.0
+version=5.5.0
+spring-security.version=5.5.0
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -53,7 +53,7 @@ public class WebfluxFormSecurityConfiguration {
 	SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) {
 		// @formatter:off
 		http
-			.authorizeExchange((authorize) -> authorize
+			.authorizeExchange((exchanges) -> exchanges
 				.pathMatchers("/login").permitAll()
 				.anyExchange().authenticated()
 			)
@@ -1,7 +1,7 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
+	id 'org.springframework.boot' version '2.5.0'
 	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
-	id "nebula.integtest" version "8.2.0"
+	id "nebula.integtest" version "7.0.9"
 	id 'java'
 }

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,2 +1,2 @@
-version=5.6.0
-spring-security.version=5.6.0
+version=5.5.0
+spring-security.version=5.5.0
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -53,7 +53,7 @@ public class WebfluxX509Application {
 		// @formatter:off
 		http
 			.x509(withDefaults())
-			.authorizeExchange((authorize) -> authorize
+			.authorizeExchange((exchanges) -> exchanges
 				.anyExchange().authenticated()
 			);
 		// @formatter:on
@@ -1,7 +1,7 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
+	id 'org.springframework.boot' version '2.5.0'
 	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
-	id "nebula.integtest" version "8.2.0"
+	id "nebula.integtest" version "7.0.9"
 	id 'java'
 }

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,2 +1,2 @@
-version=5.6.0
-spring-security.version=5.6.0
+version=5.5.0
+spring-security.version=5.5.0
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -39,7 +39,7 @@ public class SecurityConfiguration {
 	SecurityWebFilterChain springWebFilterChain(ServerHttpSecurity http) {
 		// @formatter:off
 		http
-			.authorizeExchange((authorize) -> authorize
+			.authorizeExchange((exchanges) -> exchanges
 				.anyExchange().authenticated()
 			)
 			.formLogin(withDefaults());
@@ -28,7 +28,7 @@ import org.springframework.test.web.reactive.server.WebTestClient;
 * @since 5.0
 */
@SpringBootTest
-@AutoConfigureWebTestClient(timeout = "36000")
+@AutoConfigureWebTestClient
 public class HelloSecurityTests {

 	@Autowired
@@ -1,7 +1,7 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
+	id 'org.springframework.boot' version '2.5.0'
 	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
-	id "nebula.integtest" version "8.2.0"
+	id "nebula.integtest" version "7.0.9"
 	id 'java'
 }

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,2 +1,2 @@
-version=5.6.0
-spring-security.version=5.6.0
+version=5.5.0
+spring-security.version=5.5.0
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -28,7 +28,7 @@ import org.springframework.test.web.reactive.server.WebTestClient;
 * @since 5.0
 */
@SpringBootTest
-@AutoConfigureWebTestClient(timeout = "36000")
+@AutoConfigureWebTestClient
 public class HelloSecurityTests {

 	@Autowired
@@ -1,7 +1,7 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
+	id 'org.springframework.boot' version '2.5.0'
 	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
-	id "nebula.integtest" version "8.2.0"
+	id "nebula.integtest" version "7.0.9"
 	id 'java'
 }

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,2 +1,2 @@
-version=5.6.0
-spring-security.version=5.6.0
+version=5.5.0
+spring-security.version=5.5.0
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -27,7 +27,7 @@ import org.springframework.test.web.reactive.server.WebTestClient;
 * @since 5.0
 */
@SpringBootTest
-@AutoConfigureWebTestClient(timeout = "36000")
+@AutoConfigureWebTestClient
 public class HelloTests {

 	@Autowired
@@ -1,7 +1,7 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
+	id 'org.springframework.boot' version '2.5.0'
 	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
-	id "nebula.integtest" version "8.2.0"
+	id "nebula.integtest" version "7.0.9"
 	id 'java'
 }

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,2 +1,2 @@
-version=5.6.0
-spring-security.version=5.6.0
+version=5.5.0
+spring-security.version=5.5.0
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -45,7 +45,7 @@ public class SecurityConfiguration {
 		http
 			// Demonstrate that method security works
 			// Best practice to use both for defense in depth
-			.authorizeExchange((authorize) -> authorize
+			.authorizeExchange((exchanges) -> exchanges
 				.anyExchange().permitAll()
 			)
 			.httpBasic(withDefaults());
@@ -28,7 +28,7 @@ import org.springframework.test.web.reactive.server.WebTestClient;
 * @since 5.0
 */
@SpringBootTest
-@AutoConfigureWebTestClient(timeout = "36000")
+@AutoConfigureWebTestClient
 public class HelloMethodApplicationTests {

 	@Autowired
@@ -1,105 +1,18 @@
+NOTE: Spring Security Reactive OAuth only supports authentication using a user info endpoint.
+Support for JWT validation will be added in https://github.com/spring-projects/spring-security/issues/5330[gh-5330].
+
 = OAuth 2.0 Login Sample

 This guide provides instructions on setting up the sample application with OAuth 2.0 Login using an OAuth 2.0 Provider or OpenID Connect 1.0 Provider.
-The sample application uses Spring Boot 2.5 and the `spring-security-oauth2-client` module which is new in Spring Security 5.0.
+The sample application uses Spring Boot 2.0.0.M6 and the `spring-security-oauth2-client` module which is new in Spring Security 5.0.

 The following sections provide detailed steps for setting up OAuth 2.0 Login for these Providers:

-* <<spring-login, Spring Authorization Server>>
 * <<google-login, Google>>
 * <<github-login, GitHub>>
 * <<facebook-login, Facebook>>
 * <<okta-login, Okta>>

-[[spring-login]]
-== Login with Spring Authorization Server
-
-This section shows how to configure the sample application using Spring Authorization Server as the Authentication Provider and covers the following topics:
-
-* <<spring-initial-setup,Initial setup>>
-* <<spring-redirect-uri,Setting the redirect URI>>
-* <<spring-application-config,Configure application.yml>>
-* <<spring-boot-application,Boot up the application>>
-
-[[spring-initial-setup]]
-=== Initial setup
-
-The sample application is pre-configured to work out of the box with Spring Authorization Server, which runs locally on port `9000`. See the https://github.com/spring-projects/spring-security-samples/tree/main/servlet/spring-boot/java/oauth2/authorization-server[authorization-server sample] to run the authorization server used in this section.
-
-NOTE: https://github.com/spring-projects-external/spring-authorization-server[Spring Authorization Server] supports the https://openid.net/connect/[OpenID Connect 1.0] specification.
-
-[[spring-redirect-uri]]
-=== Setting the redirect URI
-
-The redirect URI is the path in the application that the end-user's user-agent is redirected back to after they have authenticated with Spring Authorization Server
-and have granted access to the OAuth Client on the Consent page.
-
-The default redirect URI is `http://127.0.0.1:8080/login/oauth2/code/login-client`. No special setup is required to use the sample locally.
-
-TIP: The default redirect URI template is `{baseUrl}/login/oauth2/code/{registrationId}`.
-The *_registrationId_* is a unique identifier for the `ClientRegistration`.
-
-IMPORTANT: If the application is running behind a proxy server, it is recommended to check https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#appendix-proxy-server[Proxy Server Configuration] to ensure the application is correctly configured.
-Also, see the supported https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#oauth2Client-auth-code-redirect-uri[`URI` template variables] for `redirect-uri`.
-
-[[spring-application-config]]
-=== Configure application.yml
-
-If you wish to customize the OAuth Client to work with a non-local deployment of Spring Authorization Server, you need to configure the application to use the OAuth Client for the _authentication flow_. To do so:
-
-. Go to `application.yml` and set the following configuration:
-+
-[source,yaml]
----
-spring:
-  security:
-    oauth2:
-      client:
-        registration:	<1>
-          login-client:		<2>
-            provider: spring	<3>
-            client-id: login-client
-            client-secret: openid-connect
-            client-authentication-method: client_secret_basic
-            authorization-grant-type: authorization_code
-            redirect-uri: http://127.0.0.1:8080/login/oauth2/code/login-client
-            scope: openid,profile	<4>
-            client-name: Spring
-        provider:<5>
-          spring:
-            authorization-uri: http://localhost:9000/oauth2/authorize
-            token-uri: http://localhost:9000/oauth2/token
-            jwk-set-uri: http://localhost:9000/oauth2/jwks
-            issuer-uri: http://localhost:9000
----
-+
-.OAuth Client properties
-====
-<1> `spring.security.oauth2.client.registration` is the base property prefix for OAuth Client properties.
-<2> Following the base property prefix is the ID for the `ClientRegistration`, such as login-client.
-<3> The `provider` property specifies which provider configuration is used by this `ClientRegistration`.
-<4> The `openid` scope is required by Spring Authorization Server to perform https://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth[authentication using OpenID Connect 1.0].
-<5> `spring.security.oauth2.client.provider` is the base property prefix for OAuth Provider properties.
-====
-
-. Replace the values in the `client-id` and `client-secret` property with the OAuth 2.0 credentials for your Spring Authorization Server. As well, replace `http://localhost:9000` in `authorization-uri`, `token-uri` and `jwk-set-uri` with the actual domain of your authorization server.
-
-[[spring-boot-application]]
-=== Boot up the application
-
-Launch the Spring Boot 2.0 sample and go to `http://127.0.0.1:8080`.
-You are then redirected to the default _auto-generated_ login page, which displays a link for Spring.
-
-Click on the Spring link, and you are then redirected to the Spring Authorization Server for authentication.
-
-After authenticating with your credentials (`user` and `password` by default), the next page presented to you is the Consent screen.
-The Consent screen asks you to either allow or deny access to the OAuth Client. Select "profile" and
-click *Submit Consent* to authorize the OAuth Client to access your basic profile information.
-
-At this point, the OAuth Client retrieves your basic profile information via the https://openid.net/specs/openid-connect-core-1_0.html#CodeIDToken[ID Token] and establishes an authenticated session.
-
-NOTE: Spring Authorization Server does not currently support the https://openid.net/specs/openid-connect-core-1_0.html#UserInfo[UserInfo Endpoint], which is optional in OpenID Connect 1.0. See https://github.com/spring-projects-experimental/spring-authorization-server/issues/176[#176] fo more information.
-
 [[google-login]]
 == Login with Google

@@ -128,7 +41,7 @@ After completing the "Obtain OAuth 2.0 credentials" instructions, you should hav
 The redirect URI is the path in the application that the end-user's user-agent is redirected back to after they have authenticated with Google
 and have granted access to the OAuth Client _(created in the previous step)_ on the Consent page.

-In the "Set a redirect URI" sub-section, ensure that the *Authorized redirect URIs* field is set to `http://127.0.0.1:8080/login/oauth2/code/google`.
+In the "Set a redirect URI" sub-section, ensure that the *Authorized redirect URIs* field is set to `http://localhost:8080/login/oauth2/code/google`.

 TIP: The default redirect URI template is `{baseUrl}/login/oauth2/code/{registrationId}`.
 The *_registrationId_* is a unique identifier for the `ClientRegistration`.
@@ -166,7 +79,7 @@ spring:
 [[google-boot-application]]
 === Boot up the application

-Launch the Spring Boot 2.0 sample and go to `http://127.0.0.1:8080`.
+Launch the Spring Boot 2.0 sample and go to `http://localhost:8080`.
 You are then redirected to the default _auto-generated_ login page, which displays a link for Google.

 Click on the Google link, and you are then redirected to Google for authentication.
@@ -192,7 +105,7 @@ This section shows how to configure the sample application using GitHub as the A

 To use GitHub's OAuth 2.0 authentication system for login, you must https://github.com/settings/applications/new[Register a new OAuth application].

-When registering the OAuth application, ensure the *Authorization callback URL* is set to `http://127.0.0.1:8080/login/oauth2/code/github`.
+When registering the OAuth application, ensure the *Authorization callback URL* is set to `http://localhost:8080/login/oauth2/code/github`.

 The Authorization callback URL (redirect URI) is the path in the application that the end-user's user-agent is redirected back to after they have authenticated with GitHub
 and have granted access to the OAuth application on the _Authorize application_ page.
@@ -233,7 +146,7 @@ spring:
 [[github-boot-application]]
 === Boot up the application

-Launch the Spring Boot 2.0 sample and go to `http://127.0.0.1:8080`.
+Launch the Spring Boot 2.0 sample and go to `http://localhost:8080`.
 You are then redirected to the default _auto-generated_ login page, which displays a link for GitHub.

 Click on the GitHub link, and you are then redirected to GitHub for authentication.
@@ -270,7 +183,7 @@ NOTE: The selection for the _Category_ field is not relevant but it's a required
 The next page presented is "Product Setup". Click the "Get Started" button for the *Facebook Login* product.
 In the left sidebar, under _Products -> Facebook Login_, select _Settings_.

-For the field *Valid OAuth redirect URIs*, enter `http://127.0.0.1:8080/login/oauth2/code/facebook` then click _Save Changes_.
+For the field *Valid OAuth redirect URIs*, enter `http://localhost:8080/login/oauth2/code/facebook` then click _Save Changes_.

 The OAuth redirect URI is the path in the application that the end-user's user-agent is redirected back to after they have authenticated with Facebook
 and have granted access to the application on the _Authorize application_ page.
@@ -311,7 +224,7 @@ spring:
 [[facebook-boot-application]]
 === Boot up the application

-Launch the Spring Boot 2.0 sample and go to `http://127.0.0.1:8080`.
+Launch the Spring Boot 2.0 sample and go to `http://localhost:8080`.
 You are then redirected to the default _auto-generated_ login page, which displays a link for Facebook.

 Click on the Facebook link, and you are then redirected to Facebook for authentication.
@@ -346,7 +259,7 @@ From the "Add Application" page, select the "Create New App" button and enter th

 Select the _Create_ button.
 On the "General Settings" page, enter the Application Name (for example, "Spring Security Okta Login") and then select the _Next_ button.
-On the "Configure OpenID Connect" page, enter `http://127.0.0.1:8080/login/oauth2/code/okta` for the field *Redirect URIs* and then select _Finish_.
+On the "Configure OpenID Connect" page, enter `http://localhost:8080/login/oauth2/code/okta` for the field *Redirect URIs* and then select _Finish_.

 The redirect URI is the path in the application that the end-user's user-agent is redirected back to after they have authenticated with Okta
 and have granted access to the application on the _Authorize application_ page.
@@ -402,7 +315,7 @@ As well, replace `https://your-subdomain.oktapreview.com` in `authorization-uri`
 [[okta-boot-application]]
 === Boot up the application

-Launch the Spring Boot 2.0 sample and go to `http://127.0.0.1:8080`.
+Launch the Spring Boot 2.0 sample and go to `http://localhost:8080`.
 You are then redirected to the default _auto-generated_ login page, which displays a link for Okta.

 Click on the Okta link, and you are then redirected to Okta for authentication.
@@ -1,7 +1,7 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
+	id 'org.springframework.boot' version '2.5.0'
 	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
-	id "nebula.integtest" version "8.2.0"
+	id "nebula.integtest" version "7.0.9"
 	id 'java'
 }

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,2 +1,2 @@
-version=5.6.0
-spring-security.version=5.6.0
+version=5.5.0
+spring-security.version=5.5.0
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -36,7 +36,7 @@ import static org.springframework.security.test.web.reactive.server.SecurityMock
 * @author Rob Winch
 */
@SpringBootTest
-@AutoConfigureWebTestClient(timeout = "36000")
+@AutoConfigureWebTestClient
 public class OAuth2LoginApplicationTests {

 	@Autowired
@@ -1,65 +0,0 @@
-/*
- * Copyright 2021 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package example;
-
-import reactor.core.publisher.Mono;
-
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
-import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Component;
-import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.server.WebFilter;
-import org.springframework.web.server.WebFilterChain;
-import org.springframework.web.util.UriComponents;
-import org.springframework.web.util.UriComponentsBuilder;
-
-/**
- * This filter ensures that the loopback IP <code>127.0.0.1</code> is used to access the
- * application so that the sample works correctly, due to the fact that redirect URIs with
- * "localhost" are rejected by the Spring Authorization Server, because the OAuth 2.1
- * draft specification states:
- *
- * <pre>
- *     While redirect URIs using localhost (i.e.,
- *     "http://localhost:{port}/{path}") function similarly to loopback IP
- *     redirects described in Section 10.3.3, the use of "localhost" is NOT
- *     RECOMMENDED.
- * </pre>
- *
- * @author Steve Riesenberg
- * @see <a href=
- * "https://tools.ietf.org/html/draft-ietf-oauth-v2-1-01#section-9.7.1">Loopback Redirect
- * Considerations in Native Apps</a>
- */
-@Component
-@Order(Ordered.HIGHEST_PRECEDENCE)
-public class LoopbackIpRedirectWebFilter implements WebFilter {
-
-	@Override
-	public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
-		String host = exchange.getRequest().getURI().getHost();
-		if (host != null && host.equals("localhost")) {
-			UriComponents uri = UriComponentsBuilder.fromHttpRequest(exchange.getRequest()).host("127.0.0.1").build();
-			exchange.getResponse().setStatusCode(HttpStatus.PERMANENT_REDIRECT);
-			exchange.getResponse().getHeaders().setLocation(uri.toUri());
-			return Mono.empty();
-		}
-		return chain.filter(exchange);
-	}
-
-}
@@ -15,15 +15,6 @@ spring:
    oauth2:
      client:
        registration:
-          login-client:
-            provider: spring
-            client-id: login-client
-            client-secret: openid-connect
-            client-authentication-method: client_secret_basic
-            authorization-grant-type: authorization_code
-            redirect-uri: http://127.0.0.1:8080/login/oauth2/code/login-client
-            scope: openid,profile
-            client-name: Spring
          google:
            client-id: your-app-client-id
            client-secret: your-app-client-secret
@@ -37,10 +28,6 @@ spring:
            client-id: your-app-client-id
            client-secret: your-app-client-secret
        provider:
-          spring:
-            authorization-uri: http://localhost:9000/oauth2/authorize
-            token-uri: http://localhost:9000/oauth2/token
-            jwk-set-uri: http://localhost:9000/oauth2/jwks
          okta:
            authorization-uri: https://your-subdomain.oktapreview.com/oauth2/v1/authorize
            token-uri: https://your-subdomain.oktapreview.com/oauth2/v1/token
@@ -1,7 +1,7 @@
 = OAuth 2.0 Resource Server Sample

-This sample demonstrates integrating Resource Server with the Spring Authorization Server, though it can be modified to integrate
-with a mock server or your favorite Authorization Server.
+This sample demonstrates integrating Resource Server with a mock Authorization Server, though it can be modified to integrate
+with your favorite Authorization Server.

 With it, you can run the integration tests or run the application as a stand-alone service to explore how you can
 secure your own service with OAuth 2.0 Bearer Tokens using Spring Security.
@@ -18,7 +18,7 @@ Or import the project into your IDE and run `ServerOAuth2ResourceServerApplicati

 === What is it doing?

-By default, the tests are pointing at a mock Authorization Server instance via the `test` profile.
+By default, the tests are pointing at a mock Authorization Server instance.

 The tests are configured with a set of hard-coded tokens originally obtained from the mock Authorization Server,
 and each makes a query to the Resource Server with their corresponding token.
@@ -31,17 +31,7 @@ Hello, subject!

 where "subject" is the value of the `sub` field in the JWT returned by the Authorization Server.

-== 2. Running the app with Spring Authorization Server
-
-Before running this application with the default configuration, you will need to start up an Authorization Server, such as the https://github.com/spring-projects/spring-security-samples/tree/main/servlet/spring-boot/java/oauth2/authorization-server[authorization-server sample] in this project which is pre-configured to work with this Resource Server sample out of the box.
-
-To run the Authorization Server as a stand-alone application, navigate to the `servlet/spring-boot/java/oauth2/authorization-server` and do:
-
-```bash
-./gradlew bootRun
-```
-
-Or import the project into your IDE and run `OAuth2AuthorizationServerApplication` from there. Next, you can run this Resource Server.
+== 2. Running the app

 To run as a stand-alone application, do:

@@ -51,89 +41,6 @@ To run as a stand-alone application, do:

 Or import the project into your IDE and run `ServerOAuth2ResourceServerApplication` from there.

-Once it is up and running, you can issue the following request:
-
-```bash
-curl -X POST messaging-client:secret@localhost:9000/oauth2/token -d "grant_type=client_credentials" -d "scope=message:read"
-```
-
-This returns something like the following:
-
-```json
-{
-    "access_token": "eyJraWQiOiI4YWY4Zjc2Zi0zMTdkLTQxZmYtYWY5Yi1hZjg5NDg4ODM5YzciLCJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJtZXNzYWdpbmctY2xpZW50IiwiYXVkIjoibWVzc2FnaW5nLWNsaWVudCIsIm5iZiI6MTYyNzMzNDQ1MCwic2NvcGUiOlsibWVzc2FnZTpyZWFkIl0sImlzcyI6Imh0dHA6XC9cL2xvY2FsaG9zdDo5MDAwIiwiZXhwIjoxNjI3MzM0NzUwLCJpYXQiOjE2MjczMzQ0NTAsImp0aSI6IjBiYjYwZjhkLWIzNjItNDk0MC05MGRmLWZhZDg4N2Q1Yzg1ZSJ9.O8dI67B_feRjOn6pJi5ctPJmUJCNpV77SC4OiWqmpa5UHvf4Ud6L6EFe9LKuPIRrEWi8rMdCdMBOPKQMXvxLoI3LMUPf7Yj973uvZN0E988MsKwhGwxyaa_Wam8wFlk8aQlN8SbW3cKdeH-nKloNMdwjfspovefX521mxouaMjmyXdIFrM5WZ15GZK69NIniACSatE-pc9TAjKYBDbC65jVt_zHEvDQbEkZulF2bjrGOZC8C3IbJWnlKgkcshrY44TtrGPyCp2gIS0TSUUsG00iSBBC8E8zPU-YdfaP8gB9_FwUwK9zfy_hU2Ykf2aU3eulpGDVLn2rCwFeK86Rw1w",
-    "expires_in": 299,
-    "scope": "message:read",
-    "token_type": "Bearer"
-}
-```
-
-Then, export the access token from the response:
-
-```bash
-export TOKEN=...
-```
-
-Then issue the following request:
-
-```bash
-curl -H "Authorization: Bearer $TOKEN" localhost:8080
-```
-
-Which will respond with the phrase:
-
-```
-Hello, messaging-client!
-```
-
-where `messaging-client` is the value of the `sub` field in the JWT returned by the Authorization Server.
-
-Or this to make a GET request to /message:
-
-```bash
-curl -H "Authorization: Bearer $TOKEN" localhost:8080/message
-```
-
-Will respond with:
-
-```bash
-secret message
-```
-
-In order to make a POST request to /message, you can use the following request:
-
-```bash
-curl -X POST messaging-client:secret@localhost:9000/oauth2/token -d "grant_type=client_credentials" -d "scope=message:write"
-```
-
-Then, export the access token from the response:
-
-```bash
-export TOKEN=...
-```
-
-Then issue the following request:
-
-```bash
-curl -H "Authorization: Bearer $TOKEN" -d "my message" localhost:8080/message
-```
-
-Which will respond with:
-
-```bash
-Message was created. Content: my message
-```
-
-== 3. Running the app with a mock Authorization Server
-
-To run as a stand-alone application with an embedded mock Authorization Server, do:
-
-```bash
-./gradlew bootRun --args='--spring.profiles.active=test'
-```
-
-Or import the project into your IDE and run `ServerOAuth2ResourceServerApplication` from there with the `test` profile active.
-
 Once it is up, you can use the following token:

 ```bash
@@ -168,7 +75,7 @@ Will respond with:
 secret message
 ```

-== 4. Testing against other Authorization Servers
+== 2. Testing against other Authorization Servers

 _In order to use this sample, your Authorization Server must support JWTs that either use the "scope" or "scp" attribute._

@@ -180,7 +87,7 @@ spring:
    oauth2:
      resourceserver:
        jwt:
-          jwk-set-uri: http://localhost:9000/oauth2/jwks
+          jwk-set-uri: ${mockwebserver.url}/.well-known/jwks.json
 ```

 And change the property to your Authorization Server's JWK set endpoint:
@@ -1,7 +1,7 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
+	id 'org.springframework.boot' version '2.5.0'
 	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
-	id "nebula.integtest" version "8.2.0"
+	id "nebula.integtest" version "7.0.9"
 	id 'java'
 }

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,2 +1,2 @@
-version=5.6.0
-spring-security.version=5.6.0
+version=5.5.0
+spring-security.version=5.5.0
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -24,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.HttpHeaders;
-import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.reactive.server.WebTestClient;

 import static org.hamcrest.Matchers.containsString;
@@ -36,8 +35,7 @@ import static org.hamcrest.Matchers.containsString;
 * @since 5.1
 */
@SpringBootTest
-@AutoConfigureWebTestClient(timeout = "36000")
-@ActiveProfiles("test")
+@AutoConfigureWebTestClient
 public class ServerOAuth2ResourceServerApplicationITests {

 	Consumer<HttpHeaders> noScopesToken = (http) -> http.setBearerAuth(
@@ -37,7 +37,7 @@ public class SecurityConfiguration {
 	SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) {
 		// @formatter:off
 		http
-			.authorizeExchange((authorize) -> authorize
+			.authorizeExchange((exchanges) -> exchanges
 				.pathMatchers(HttpMethod.GET, "/message/**").hasAuthority("SCOPE_message:read")
 				.pathMatchers(HttpMethod.POST, "/message/**").hasAuthority("SCOPE_message:write")
 				.anyExchange().authenticated()
@@ -1,6 +0,0 @@
-spring:
-  security:
-    oauth2:
-      resourceserver:
-        jwt:
-          jwk-set-uri: ${mockwebserver.url}/.well-known/jwks.json
@@ -3,4 +3,4 @@ spring:
    oauth2:
      resourceserver:
        jwt:
-          jwk-set-uri: http://localhost:9000/oauth2/jwks
+          jwk-set-uri: ${mockwebserver.url}/.well-known/jwks.json
@@ -1,7 +1,7 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
+	id 'org.springframework.boot' version '2.5.0'
 	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
-	id "nebula.integtest" version "8.2.0"
+	id "nebula.integtest" version "7.0.9"
 	id 'java'
 }

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,2 +1,2 @@
-version=5.6.0
-spring-security.version=5.6.0
+version=5.5.0
+spring-security.version=5.5.0
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -37,7 +37,7 @@ public class SecurityConfiguration {
 	SecurityWebFilterChain configure(ServerHttpSecurity http) {
 		// @formatter:off
 		http
-			.authorizeExchange((authorize) -> authorize
+			.authorizeExchange((exchanges) -> exchanges
 				.pathMatchers("/", "/public/**").permitAll()
 				.anyExchange().authenticated()
 			)
@@ -39,7 +39,7 @@ import static org.springframework.security.test.web.reactive.server.SecurityMock

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

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

 	@Autowired
@@ -39,7 +39,7 @@ import static org.springframework.security.test.web.reactive.server.SecurityMock

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

 	private static MockWebServer web = new MockWebServer();
@@ -1 +1 @@
-spring-security.version=5.6.0
+spring-security.version=5.5.0
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -14,12 +14,12 @@ dependencies {
 	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.6.0")
+	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")

 	implementation "org.springframework.security:spring-security-config"

-	runtimeOnly "org.springframework.security:spring-security-aspects"
+	runtime "org.springframework.security:spring-security-aspects"

 	testImplementation "org.assertj:assertj-core:3.18.0"
 	testImplementation "org.springframework:spring-test"
@@ -31,7 +31,6 @@ dependencies {

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


@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,7 +1,7 @@
 plugins {
 	id "java"
-	id "nebula.integtest" version "8.2.0"
-	id "org.gretty" version "3.0.6"
+	id "nebula.integtest" version "7.0.9"
+	id "org.gretty" version "3.0.3"
 	id "war"
 }

@@ -14,7 +14,7 @@ repositories {

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

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -18,27 +18,30 @@ 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 {
+public class SecurityConfiguration extends WebSecurityConfigurerAdapter {

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

 	// @formatter:off
 	@Bean
@@ -1,7 +1,7 @@
 plugins {
 	id "java"
-	id "nebula.integtest" version "8.2.0"
-	id "org.gretty" version "3.0.6"
+	id "nebula.integtest" version "7.0.9"
+	id "org.gretty" version "3.0.3"
 	id "war"
 }

@@ -14,7 +14,7 @@ repositories {

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

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -18,30 +18,31 @@ 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 {
+public class SecurityConfiguration extends WebSecurityConfigurerAdapter {

-	@Bean
-	public SecurityFilterChain securityFilterChain(HttpSecurity http, UserDetailsService users) throws Exception {
-		// @formatter:off
+	@Override
+	// @formatter:off
+	protected void configure(HttpSecurity http) throws Exception {
 		http
-				.authorizeRequests((authorize) -> authorize
-						.anyRequest().authenticated()
-				)
-				.formLogin((form) -> form
-						.loginPage("/login")
-						.permitAll()
-				)
-				.rememberMe((rememberMe) -> rememberMe.userDetailsService(users));
-		// @formatter:on
-		return http.build();
+			.authorizeRequests((requests) -> requests
+					.anyRequest().authenticated()
+			)
+			.formLogin((form) -> form
+				.loginPage("/login")
+				.permitAll()
+			)
+			.rememberMe(withDefaults());
 	}
+	// @formatter:on

 	// @formatter:off
 	@Bean
@@ -1,7 +1,7 @@
 plugins {
 	id "java"
-	id "nebula.integtest" version "8.2.0"
-	id "org.gretty" version "3.0.6"
+	id "nebula.integtest" version "7.0.9"
+	id "org.gretty" version "3.0.3"
 	id "war"
 }

@@ -14,7 +14,7 @@ repositories {

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

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -18,29 +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;

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

-	@Bean
-	public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
-		// @formatter:off
+	@Override
+	// @formatter:off
+	protected void configure(HttpSecurity http) throws Exception {
 		http
-				.authorizeRequests((authorize) -> authorize
-						.anyRequest().authenticated()
-				)
-				.formLogin((form) -> form
-						.loginPage("/login")
-						.permitAll()
-				);
-		// @formatter:on
-		return http.build();
+			.authorizeRequests((requests) -> requests
+				.anyRequest().authenticated()
+			)
+			.formLogin((form) -> form
+				.loginPage("/login")
+				.permitAll()
+			);
 	}
+	// @formatter:on

 	// @formatter:off
 	@Bean
@@ -1,7 +1,7 @@
 plugins {
 	id "java"
-	id "nebula.integtest" version "8.2.0"
-	id "org.gretty" version "3.0.6"
+	id "nebula.integtest" version "7.0.9"
+	id "org.gretty" version "3.0.3"
 	id "war"
 }

@@ -14,7 +14,7 @@ repositories {

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

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -17,13 +17,14 @@ 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 {
+public class SecurityConfiguration extends WebSecurityConfigurerAdapter {

 	// @formatter:off
 	@Bean
@@ -1,7 +1,7 @@
 plugins {
 	id "java"
-	id "nebula.integtest" version "8.2.0"
-	id "org.gretty" version "3.0.6"
+	id "nebula.integtest" version "7.0.9"
+	id "org.gretty" version "3.0.3"
 	id "war"
 }

@@ -14,7 +14,7 @@ repositories {

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

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -34,8 +34,7 @@ public class DataSourceConfiguration {
 	@Bean
 	public DataSource dataSource() {
 		EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
-		return builder.setType(EmbeddedDatabaseType.HSQL)
-				.addScript("classpath:org/springframework/security/core/userdetails/jdbc/users.ddl").build();
+		return builder.setType(EmbeddedDatabaseType.HSQL).build();
 	}

 }
@@ -17,27 +17,28 @@ package example;

 import javax.sql.DataSource;

-import org.springframework.context.annotation.Bean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 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 {
+public class SecurityConfiguration extends WebSecurityConfigurerAdapter {

-	@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;
+	@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"));
 	}
+	// @formatter:on

 }
@@ -1,7 +1,7 @@
 plugins {
 	id "java"
-	id "nebula.integtest" version "8.2.0"
-	id "org.gretty" version "3.0.6"
+	id "nebula.integtest" version "7.0.9"
+	id "org.gretty" version "3.0.3"
 	id "war"
 }

@@ -14,7 +14,7 @@ repositories {

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

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,11 +1,11 @@
 plugins {
 	id "java"
-	id "nebula.integtest" version "8.2.0"
-	id "org.gretty" version "3.0.6"
+	id "nebula.integtest" version "7.0.9"
+	id "org.gretty" version "3.0.3"
 	id "war"
 }

-//apply from: "gradle/gretty.gradle"
+apply from: "gradle/gretty.gradle"

 repositories {
 	jcenter()
@@ -14,7 +14,7 @@ repositories {

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

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -24,7 +24,7 @@ import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.ssl.SSLContexts;
-import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

 import org.springframework.core.io.ClassPathResource;
@@ -41,9 +41,15 @@ import static org.assertj.core.api.Assertions.assertThatCode;
 *
 * @author Michael Simons
 */
-@Disabled
 public class X509Tests {

+	private int port;
+
+	@BeforeEach
+	void setup() {
+		this.port = Integer.parseInt(System.getProperty("app.httpPort", "8443"));
+	}
+
 	@Test
 	void notCertificateThenSslHandshakeException() {
 		RestTemplate rest = new RestTemplate();
@@ -18,28 +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 {
+public class SecurityConfiguration extends WebSecurityConfigurerAdapter {

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

 	// @formatter:off
 	@Bean
@@ -1,6 +1,6 @@
 plugins {
 	id "java"
-	id "nebula.integtest" version "8.2.0"
+	id "nebula.integtest" version "7.0.9"
 }

 repositories {
@@ -9,9 +9,9 @@ repositories {
 }

 dependencies {
-	implementation platform("org.springframework:spring-framework-bom:5.3.11")
-	implementation platform("org.springframework.data:spring-data-releasetrain:Neumann-SR9")
-	implementation platform("org.springframework.security:spring-security-bom:5.6.0")
+	implementation platform("org.springframework:spring-framework-bom:5.3.0")
+	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.junit:junit-bom:5.7.0")

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,7 +1,7 @@
 plugins {
 	id "java"
-	id "nebula.integtest" version "8.2.0"
-	id "org.gretty" version "3.0.6"
+	id "nebula.integtest" version "7.0.9"
+	id "org.gretty" version "3.0.3"
 	id "war"
 }

@@ -14,7 +14,7 @@ repositories {

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

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -18,29 +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 {
+public class SecurityConfiguration extends WebSecurityConfigurerAdapter {

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

 	// @formatter:off
 	@Bean
@@ -1,7 +1,7 @@
 plugins {
 	id "java"
-	id "nebula.integtest" version "8.2.0"
-	id "org.gretty" version "3.0.6"
+	id "nebula.integtest" version "7.0.9"
+	id "org.gretty" version "3.0.3"
 	id "war"
 }

@@ -14,7 +14,7 @@ repositories {

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

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -18,29 +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 {
+public class SecurityConfiguration extends WebSecurityConfigurerAdapter {

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

 	// @formatter:off
 	@Bean
@@ -1,7 +1,7 @@
 plugins {
 	id "java"
-	id "nebula.integtest" version "8.2.0"
-	id "org.gretty" version "3.0.6"
+	id "nebula.integtest" version "7.0.9"
+	id "org.gretty" version "3.0.3"
 	id "war"
 }

@@ -14,7 +14,7 @@ repositories {

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

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

 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
-	outputs.upToDateWhen { false }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Josh Cummings	fa1f474f25	Use JDK 11 Closes gh-21	2021-05-27 10:41:22 -06:00
Josh Cummings	324cca474d	Update to Spring Security 5.5.0 Closes gh-15	2021-05-27 10:29:08 -06:00
Josh Cummings	1a0e1f626d	Use OpenSAML 4 in SAML 2.0 Login Sample Closes gh-20	2021-05-27 10:29:08 -06:00
Josh Cummings	43dbe19507	Update Kotlin Samples Closes gh-19	2021-05-27 10:29:03 -06:00
Josh Cummings	ddc4db8cf6	Update to Spring Security 5.5.0-SNAPSHOT	2021-05-27 09:40:38 -06:00
Josh Cummings	6d9a28c2f7	Mfa Sample Depends on spring-security-crypto Closes gh-18	2021-05-27 09:34:59 -06:00
Josh Cummings	1c0ec2e20a	Sync Gradle Version Issue gh-16	2021-05-27 09:15:35 -06:00