Simplify SAML configuration

Re-enable SAML 2.0 samples with Okta IdP
Closes gh-55
2022-03-31 12:51:40 -06:00 · 2022-03-23 10:18:48 -03:00 · 2022-03-23 10:14:39 -03:00 · 2022-03-10 13:25:00 -03:00 · 2022-03-10 12:20:14 -03:00 · 2022-01-17 12:44:01 -03:00
190 changed files with 704 additions and 648 deletions
@@ -16,7 +16,7 @@ jobs:
      - name: Set up JDK
        uses: actions/setup-java@v1
        with:
-          java-version: '11'
+          java-version: '17'
      - name: Cache Gradle packages
        uses: actions/cache@v2
        with:
@@ -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="temurin-11" project-jdk-type="JavaSDK" />
-</project>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="temurin-17" project-jdk-type="JavaSDK" />
+</project>
@@ -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.8.0-SNAPSHOT
-spring-security.version=5.8.0-SNAPSHOT
-org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError
+version=6.0.0-SNAPSHOT
+spring-security.version=6.0.0-SNAPSHOT
+org.gradle.jvmargs=-Xmx3g -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,6 +1,6 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
-	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
@@ -1,2 +1,2 @@
-version=5.8.0-SNAPSHOT
-spring-security.version=5.8.0-SNAPSHOT
+version=6.0.0-SNAPSHOT
+spring-security.version=6.0.0-SNAPSHOT
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,6 +1,6 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
-	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
@@ -1,2 +1,2 @@
-version=5.8.0-SNAPSHOT
-spring-security.version=5.8.0-SNAPSHOT
+version=6.0.0-SNAPSHOT
+spring-security.version=6.0.0-SNAPSHOT
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,6 +1,6 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
-	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
@@ -1,2 +1,2 @@
-version=5.8.0-SNAPSHOT
-spring-security.version=5.8.0-SNAPSHOT
+version=6.0.0-SNAPSHOT
+spring-security.version=6.0.0-SNAPSHOT
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,6 +1,6 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
-	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+	id 'org.springframework.boot' version '2.6.4'
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
@@ -1,2 +1,2 @@
-version=5.8.0-SNAPSHOT
-spring-security.version=5.8.0-SNAPSHOT
+version=5.7.0-SNAPSHOT
+spring-security.version=5.7.0-SNAPSHOT
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -70,8 +70,10 @@ public class LoginPage {

 		private WebDriver driver;

+		@FindBy(id = "username")
 		private WebElement username;

+		@FindBy(id = "password")
 		private WebElement password;

 		@FindBy(css = "button[type=submit]")
@@ -1,6 +1,6 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
-	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
@@ -1,2 +1,2 @@
-version=5.8.0-SNAPSHOT
-spring-security.version=5.8.0-SNAPSHOT
+version=6.0.0-SNAPSHOT
+spring-security.version=6.0.0-SNAPSHOT
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,6 +1,6 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
-	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
@@ -1,2 +1,2 @@
-version=5.8.0-SNAPSHOT
-spring-security.version=5.8.0-SNAPSHOT
+version=6.0.0-SNAPSHOT
+spring-security.version=6.0.0-SNAPSHOT
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -51,8 +51,10 @@ public class LoginPage {

 		private WebDriver webDriver;

+		@FindBy(id = "username")
 		private WebElement username;

+		@FindBy(id = "password")
 		private WebElement password;

 		@FindBy(css = "button[type=submit]")
@@ -1,6 +1,6 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
-	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
@@ -1,2 +1,2 @@
-version=5.8.0-SNAPSHOT
-spring-security.version=5.8.0-SNAPSHOT
+version=6.0.0-SNAPSHOT
+spring-security.version=6.0.0-SNAPSHOT
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,6 +1,6 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
-	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
@@ -1,2 +1,2 @@
-version=5.8.0-SNAPSHOT
-spring-security.version=5.8.0-SNAPSHOT
+version=6.0.0-SNAPSHOT
+spring-security.version=6.0.0-SNAPSHOT
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,6 +1,6 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
-	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
@@ -1,2 +1,2 @@
-version=5.8.0-SNAPSHOT
-spring-security.version=5.8.0-SNAPSHOT
+version=6.0.0-SNAPSHOT
+spring-security.version=6.0.0-SNAPSHOT
@@ -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-7.3-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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,6 +1,6 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
-	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
@@ -15,7 +15,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 	implementation 'org.springframework.boot:spring-boot-starter-webflux'
-	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5'
+	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'

 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
@@ -1,2 +1,2 @@
-version=5.8.0-SNAPSHOT
-spring-security.version=5.8.0-SNAPSHOT
+version=6.0.0-SNAPSHOT
+spring-security.version=6.0.0-SNAPSHOT
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,6 +1,6 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
-	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
@@ -1,2 +1,2 @@
-version=5.8.0-SNAPSHOT
-spring-security.version=5.8.0-SNAPSHOT
+version=6.0.0-SNAPSHOT
+spring-security.version=6.0.0-SNAPSHOT
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,6 +1,6 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.2'
-	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
@@ -15,7 +15,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 	implementation 'org.springframework:spring-webflux'
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
-	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5'
+	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
 	implementation 'io.projectreactor.netty:reactor-netty'

 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
@@ -1,2 +1,2 @@
-version=5.8.0-SNAPSHOT
-spring-security.version=5.8.0-SNAPSHOT
+version=6.0.0-SNAPSHOT
+spring-security.version=6.0.0-SNAPSHOT
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,10 +1,10 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

 plugins {
-    id("org.springframework.boot") version "2.5.0"
-    id("io.spring.dependency-management") version "1.0.9.RELEASE"
-    kotlin("jvm") version "1.5.0"
-    kotlin("plugin.spring") version "1.5.0"
+    id("org.springframework.boot") version "3.0.0-M1"
+    id("io.spring.dependency-management") version "1.0.11.RELEASE"
+    kotlin("jvm") version "1.6.0"
+    kotlin("plugin.spring") version "1.6.0"
 }

 repositories {
@@ -12,13 +12,16 @@ repositories {
    maven {
        url = uri("https://repo.spring.io/snapshot")
    }
+    maven {
+        url = uri("https://repo.spring.io/milestone")
+    }
 }

 dependencies {
    implementation("org.springframework.boot:spring-boot-starter-security")
    implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
    implementation("org.springframework.boot:spring-boot-starter-webflux")
-    implementation("org.thymeleaf.extras:thymeleaf-extras-springsecurity5")
+    implementation("org.thymeleaf.extras:thymeleaf-extras-springsecurity6")
    implementation("io.projectreactor.kotlin:reactor-kotlin-extensions")
    implementation("org.jetbrains.kotlin:kotlin-reflect")
    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
@@ -34,10 +37,10 @@ dependencies {
 tasks.withType<KotlinCompile> {
    kotlinOptions {
        freeCompilerArgs = listOf("-Xjsr305=strict")
-        jvmTarget = "1.8"
+        jvmTarget = "17"
    }
 }

 tasks.withType<Test> {
    useJUnitPlatform()
-}
+}
@@ -1 +1 @@
-spring-security.version=5.8.0-SNAPSHOT
+spring-security.version=6.0.0-SNAPSHOT
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -9,13 +9,23 @@ repositories {
 	maven { url "https://repo.spring.io/snapshot" }
 }

+compileJava {
+	sourceCompatibility "1.8"
+	targetCompatibility "1.8"
+}
+
+compileTestJava {
+	sourceCompatibility "1.8"
+	targetCompatibility "1.8"
+}
+
 dependencies {
-	aspect platform("org.springframework:spring-framework-bom:5.3.13")
-	aspect platform("org.springframework.security:spring-security-bom:5.8.0-SNAPSHOT")
+	aspect platform("org.springframework:spring-framework-bom:5.3.0")
+	aspect platform("org.springframework.security:spring-security-bom:5.4.0-SNAPSHOT")
 	aspect "org.springframework.security:spring-security-aspects"

-	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.springframework:spring-framework-bom:5.3.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"
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -14,8 +14,8 @@ repositories {
 }

 dependencies {
-	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.springframework:spring-framework-bom:5.3.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"
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -14,8 +14,8 @@ repositories {
 }

 dependencies {
-	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.springframework:spring-framework-bom:5.3.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"
@@ -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-7.3-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 "org.gretty" version "4.0.0"
 	id "war"
 }

@@ -14,14 +14,14 @@ repositories {
 }

 dependencies {
-	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.springframework:spring-framework-bom:6.0.0-SNAPSHOT")
+	implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")

 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"
 	implementation "org.springframework:spring-webmvc"
-	implementation "org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE"
+	implementation "org.thymeleaf:thymeleaf-spring6:3.1.0.M1"

 	testImplementation "org.assertj:assertj-core:3.18.0"
 	testImplementation "org.springframework:spring-test"
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat9"
+	servletContainer = "tomcat10"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
@@ -38,4 +38,4 @@ project.tasks.matching { it.name == "integrationTest" }.all {
 		integrationTest.systemProperty 'app.httpBaseURI', httpBaseUrl
 		integrationTest.systemProperty 'app.httpsBaseURI', httpsBaseUrl
 	}
-}
+}
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -16,7 +16,7 @@

 package example;

-import javax.servlet.Filter;
+import jakarta.servlet.Filter;

 import org.springframework.web.filter.HiddenHttpMethodFilter;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
@@ -16,10 +16,10 @@

 package example;

-import org.thymeleaf.spring5.ISpringTemplateEngine;
-import org.thymeleaf.spring5.SpringTemplateEngine;
-import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
-import org.thymeleaf.spring5.view.ThymeleafViewResolver;
+import org.thymeleaf.spring6.ISpringTemplateEngine;
+import org.thymeleaf.spring6.SpringTemplateEngine;
+import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver;
+import org.thymeleaf.spring6.view.ThymeleafViewResolver;
 import org.thymeleaf.templatemode.TemplateMode;
 import org.thymeleaf.templateresolver.ITemplateResolver;

@@ -14,8 +14,8 @@ repositories {
 }

 dependencies {
-	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.springframework:spring-framework-bom:5.3.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"
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -14,8 +14,8 @@ repositories {
 }

 dependencies {
-	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.springframework:spring-framework-bom:5.3.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"
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -14,8 +14,8 @@ repositories {
 }

 dependencies {
-	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.springframework:spring-framework-bom:5.3.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"
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2016 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,29 +17,39 @@ 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.config.ldap.EmbeddedLdapServerContextSourceFactoryBean;
-import org.springframework.security.config.ldap.LdapBindAuthenticationManagerFactory;
-import org.springframework.security.ldap.userdetails.PersonContextMapper;
+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;

@EnableWebSecurity
 public class SecurityConfiguration {

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

 	@Bean
-	AuthenticationManager authenticationManager(BaseLdapPathContextSource contextSource) {
-		LdapBindAuthenticationManagerFactory factory = new LdapBindAuthenticationManagerFactory(contextSource);
-		factory.setUserDnPatterns("uid={0},ou=people");
-		factory.setUserDetailsContextMapper(new PersonContextMapper());
-		return factory.createAuthenticationManager();
+	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);
 	}

 }
@@ -1,6 +1,6 @@
 plugins {
 	id "java"
-	id "nebula.integtest" version "8.2.0"
+//	id "nebula.integtest" version "8.2.0"
 	id "org.gretty" version "3.0.6"
 	id "war"
 }
@@ -14,8 +14,8 @@ repositories {
 }

 dependencies {
-	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.springframework:spring-framework-bom:5.3.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"
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -10,20 +10,19 @@ repositories {
 }

 dependencies {
-	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.8.0-SNAPSHOT")
+	implementation platform("org.springframework:spring-framework-bom:6.0.0-SNAPSHOT")
+	implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")

 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-data"
 	implementation "org.springframework.security:spring-security-web"
 	implementation 'jakarta.validation:jakarta.validation-api:2.0.2'
-	implementation 'javax.persistence:javax.persistence-api:2.2'
-	implementation 'org.hibernate:hibernate-entitymanager:5.4.22.Final'
-	implementation 'org.hibernate.validator:hibernate-validator:6.1.6.Final'
+	implementation 'jakarta.persistence:jakarta.persistence-api:3.0.0'
+	implementation 'org.hibernate.orm:hibernate-core:6.0.0.Beta2'
+	implementation 'org.hibernate.validator:hibernate-validator:7.0.1.Final'
 	implementation 'org.hsqldb:hsqldb:2.5.1'
-	implementation 'org.springframework.data:spring-data-jpa'
+	implementation 'org.springframework.data:spring-data-jpa:3.0.0-SNAPSHOT'

 	testImplementation "org.assertj:assertj-core:3.18.0"
 	testImplementation "org.springframework:spring-test"
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -18,12 +18,12 @@ package example;

 import java.util.Calendar;

-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-import javax.validation.constraints.NotEmpty;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToOne;
+import jakarta.validation.constraints.NotEmpty;

@Entity
 public class Message {
@@ -16,10 +16,10 @@

 package example;

-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;

 /**
 * A user.
@@ -1,7 +1,7 @@
 plugins {
 	id "java"
 	id "nebula.integtest" version "8.2.0"
-	id "org.gretty" version "3.0.6"
+	id "org.gretty" version "4.0.0"
 	id "war"
 }

@@ -14,14 +14,14 @@ repositories {
 }

 dependencies {
-	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.springframework:spring-framework-bom:6.0.0-SNAPSHOT")
+	implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")

 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"
 	implementation "org.springframework:spring-webmvc"
-	implementation "org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE"
+	implementation "org.thymeleaf:thymeleaf-spring6:3.1.0.M1"

 	testImplementation "org.assertj:assertj-core:3.18.0"
 	testImplementation "org.springframework:spring-test"
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat9"
+	servletContainer = "tomcat10"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
@@ -38,4 +38,4 @@ project.tasks.matching { it.name == "integrationTest" }.all {
 		integrationTest.systemProperty 'app.httpBaseURI', httpBaseUrl
 		integrationTest.systemProperty 'app.httpsBaseURI', httpsBaseUrl
 	}
-}
+}
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -51,8 +51,10 @@ public class LoginPage {

 		private WebDriver webDriver;

+		@FindBy(id = "username")
 		private WebElement username;

+		@FindBy(id = "password")
 		private WebElement password;

 		@FindBy(css = "button[type=submit]")
@@ -16,7 +16,7 @@

 package example;

-import javax.servlet.Filter;
+import jakarta.servlet.Filter;

 import org.springframework.web.filter.HiddenHttpMethodFilter;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
@@ -16,10 +16,10 @@

 package example;

-import org.thymeleaf.spring5.ISpringTemplateEngine;
-import org.thymeleaf.spring5.SpringTemplateEngine;
-import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
-import org.thymeleaf.spring5.view.ThymeleafViewResolver;
+import org.thymeleaf.spring6.ISpringTemplateEngine;
+import org.thymeleaf.spring6.SpringTemplateEngine;
+import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver;
+import org.thymeleaf.spring6.view.ThymeleafViewResolver;
 import org.thymeleaf.templatemode.TemplateMode;
 import org.thymeleaf.templateresolver.ITemplateResolver;

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

@@ -14,17 +14,15 @@ repositories {
 }

 dependencies {
-	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.springframework:spring-framework-bom:6.0.0-SNAPSHOT")
+	implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")

 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"
-	implementation "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.2"
-	implementation "org.apache.taglibs:taglibs-standard-jstlel:1.2.5"

-	providedCompile "javax.servlet:javax.servlet-api:4.0.1"
-	providedCompile "javax.servlet.jsp:javax.servlet.jsp-api:2.3.3"
+	providedCompile "jakarta.servlet:jakarta.servlet-api:5.0.0"
+	providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0"

 	testImplementation "org.assertj:assertj-core:3.18.0"
 	testImplementation "org.springframework:spring-test"
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat9"
+	servletContainer = "tomcat10"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -51,8 +51,10 @@ public class LoginPage {

 		private WebDriver webDriver;

+		@FindBy(id = "username")
 		private WebElement username;

+		@FindBy(id = "password")
 		private WebElement password;

 		@FindBy(css = "button[type=submit]")
@@ -1,7 +1,7 @@
 plugins {
 	id "java"
 	id "nebula.integtest" version "8.2.0"
-	id "org.gretty" version "3.0.6"
+	id "org.gretty" version "4.0.0"
 	id "war"
 }

@@ -14,17 +14,15 @@ repositories {
 }

 dependencies {
-	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.springframework:spring-framework-bom:6.0.0-SNAPSHOT")
+	implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")

 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"
-	implementation "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.2"
-	implementation "org.apache.taglibs:taglibs-standard-jstlel:1.2.5"

-	providedCompile "javax.servlet:javax.servlet-api:4.0.1"
-	providedCompile "javax.servlet.jsp:javax.servlet.jsp-api:2.3.3"
+	providedCompile "jakarta.servlet:jakarta.servlet-api:5.0.0"
+	providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0"

 	testImplementation "org.assertj:assertj-core:3.18.0"
 	testImplementation "org.springframework:spring-test"
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat9"
+	servletContainer = "tomcat10"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -14,8 +14,8 @@ repositories {
 }

 dependencies {
-	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.springframework:spring-framework-bom:5.3.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"
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -12,18 +12,18 @@ The https://docs.spring.io/spring-security/reference/servlet/saml2/logout.html[S

 === 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 https://developer.okta.com/docs/guides/build-sso-integration/saml2/main/[Okta SAML 2.0 IDP] 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 SimpleSAMLphp SAML 2.0 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 Okta SAML 2.0 IDP reference implementation
+4. Work against the SimpleSAMLphp 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 https://developer.okta.com/docs/guides/build-sso-integration/saml2/main/[Okta SAML 2.0 IDP] reference implementation.
+`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.

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

@@ -31,21 +31,20 @@ You can refer to the https://docs.spring.io/spring-security/reference/servlet/sa

 == Run the Sample

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

 === Open a Browser

 http://localhost:8080/

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

 === Type in your credentials

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

@@ -36,21 +36,19 @@ dependencies {
 		implementation "org.opensaml:opensaml-saml-api:4.1.1"
 		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.8.0-SNAPSHOT")
+	implementation platform("org.springframework:spring-framework-bom:6.0.0-SNAPSHOT")
+	implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")

 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"
 	implementation "org.springframework:spring-webmvc"
 	implementation "org.springframework.security:spring-security-saml2-service-provider"
-	implementation "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.2"
-	implementation "org.apache.taglibs:taglibs-standard-jstlel:1.2.5"
-	implementation "org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE"
-	implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.0.4.RELEASE"
+	implementation "org.thymeleaf:thymeleaf-spring6:3.1.0.M1"
+	implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.0.M1"

-	providedCompile "javax.servlet:javax.servlet-api:4.0.1"
-	providedCompile "javax.servlet.jsp:javax.servlet.jsp-api:2.3.3"
+	providedCompile "jakarta.servlet:jakarta.servlet-api:5.0.0"
+	providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0"

 	testImplementation "org.assertj:assertj-core:3.18.0"
 	testImplementation "org.springframework:spring-test"
@@ -58,6 +56,7 @@ dependencies {
 	testImplementation("org.junit.jupiter:junit-jupiter-api")
 	testImplementation "org.seleniumhq.selenium:htmlunit-driver:2.44.0"
 	testImplementation 'org.hamcrest:hamcrest:2.2'
+	testImplementation 'org.awaitility:awaitility:4.2.0'

 	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -16,8 +16,7 @@

 package example;

-import java.util.ArrayList;
-import java.util.List;
+import java.util.concurrent.TimeUnit;

 import com.gargoylesoftware.htmlunit.ElementNotFoundException;
 import com.gargoylesoftware.htmlunit.WebClient;
@@ -43,6 +42,7 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;

 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;

@ExtendWith(SpringExtension.class)
@ContextConfiguration(classes = ApplicationConfiguration.class)
@@ -81,20 +81,7 @@ public class Saml2JavaConfigurationITests {
 		HtmlPage home = (HtmlPage) this.webClient.getCurrentWindow().getEnclosedPage();
 		HtmlElement rpLogoutButton = home.getHtmlElementById("rp_logout_button");
 		HtmlPage loginPage = rpLogoutButton.click();
-		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");
+		assertThat(loginPage.getUrl().getFile()).isEqualTo("/login?logout");
 	}

 	private void performLogin() throws Exception {
@@ -111,6 +98,8 @@ public class Saml2JavaConfigurationITests {
 	}

 	private HtmlForm findForm(HtmlPage login) {
+		await().atMost(10, TimeUnit.SECONDS)
+				.until(() -> login.getForms().stream().map(HtmlForm::getId).anyMatch("form19"::equals));
 		for (HtmlForm form : login.getForms()) {
 			try {
 				if (form.getId().equals("form19")) {
@@ -16,7 +16,7 @@

 package example;

-import javax.servlet.Filter;
+import jakarta.servlet.Filter;

 import org.springframework.web.filter.HiddenHttpMethodFilter;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
@@ -16,11 +16,11 @@

 package example;

-import org.thymeleaf.extras.springsecurity5.dialect.SpringSecurityDialect;
-import org.thymeleaf.spring5.ISpringTemplateEngine;
-import org.thymeleaf.spring5.SpringTemplateEngine;
-import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
-import org.thymeleaf.spring5.view.ThymeleafViewResolver;
+import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect;
+import org.thymeleaf.spring6.ISpringTemplateEngine;
+import org.thymeleaf.spring6.SpringTemplateEngine;
+import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver;
+import org.thymeleaf.spring6.view.ThymeleafViewResolver;
 import org.thymeleaf.templatemode.TemplateMode;
 import org.thymeleaf.templateresolver.ITemplateResolver;

@@ -1,6 +1,6 @@
 plugins {
-	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
-	id 'org.springframework.boot' version '2.5.2'
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+	id 'org.springframework.boot' version '3.0.0-M1'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
@@ -1,2 +1,2 @@
-version=5.8.0-SNAPSHOT
-spring-security.version=5.8.0-SNAPSHOT
+version=6.0.0-SNAPSHOT
+spring-security.version=6.0.0-SNAPSHOT
@@ -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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -18,9 +18,9 @@ package example;

 import java.io.IOException;

-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;

 import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.core.Authentication;
@@ -18,8 +18,8 @@ package example;

 import java.security.SecureRandom;

-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;

 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -15,9 +15,8 @@
 */
 package example;

-import javax.servlet.http.HttpSession;
-
 import com.j256.twofactorauth.TimeBasedOneTimePasswordUtil;
+import jakarta.servlet.http.HttpSession;
 import org.junit.jupiter.api.Test;

 import org.springframework.beans.factory.annotation.Autowired;
@@ -1,6 +1,6 @@
 plugins {
-	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
-	id 'org.springframework.boot' version '2.5.2'
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+	id 'org.springframework.boot' version '3.0.0-M1'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
@@ -1,2 +1,2 @@
-version=5.8.0-SNAPSHOT
-spring-security.version=5.8.0-SNAPSHOT
+version=6.0.0-SNAPSHOT
+spring-security.version=6.0.0-SNAPSHOT
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Josh Cummings	88f886e646	Simplify SAML configuration	2022-03-31 12:51:40 -06:00
Marcus Da Coregio	cb4bd098e3	Re-enable SAML 2.0 samples with Okta IdP Closes gh-55	2022-03-23 10:18:48 -03:00
Marcus Da Coregio	bce2126fd1	Update samples to use Spring Security 6 Issue gh-46	2022-03-23 10:14:39 -03:00
Marcus Da Coregio	545ffedea3	Fix Spring Security version on SAML 2.0 Login Logout XML Sample Issue gh-57	2022-03-10 13:25:00 -03:00
Marcus Da Coregio	55e14fcb86	SAML 2.0 Login & Logout XML Sample Issue gh-57	2022-03-10 12:20:14 -03:00
Marcus Da Coregio	57c0b8a4c4	Switch remaining jcenter() to mavenCentral()	2022-01-17 12:44:01 -03:00
Marcus Da Coregio	3dd832f99f	Switch from jcenter() to mavenCentral()	2022-01-17 12:26:21 -03:00
Steve Riesenberg	e995914653	Add milestone repository Closes gh-58	2022-01-17 11:50:45 -03:00
Josh Cummings	a4cef77512	Add milestone repository	2022-01-03 17:24:50 -07:00
Marcus Da Coregio	c5a2162b07	Remove remaining usage of WebSecurityConfigurerAdapter	2021-12-15 09:32:05 -03:00
Eleftheria Stein	f1c448becc	Temporarily disable tests on SAML2 samples Issue gh-55	2021-12-13 17:39:25 +01:00
Eleftheria Stein	dec2e57170	Prevent gradle cache on tests Closes gh-54	2021-12-13 17:39:12 +01:00
Marcus Da Coregio	070916cbcd	Increase timeout for WebTestClient Sometimes the tests fail with the message Timeout on blocking read for 5000000000 NANOSECONDS	2021-12-10 14:29:54 -03:00
Marcus Da Coregio	15adedbf87	Fix broken links Issue gh-53	2021-12-10 14:14:40 -03:00
Marcus Da Coregio	7058a3592c	Fix broken links in README Closes gh-53	2021-12-10 14:14:37 -03:00
Marcus Da Coregio	2a9a874d41	Update servlet:xml:contacts to use Spring 6 Issue gh-46	2021-12-10 13:44:27 -03:00
Marcus Da Coregio	7d80162ab9	Update servlet:xml:dms to use Spring 6 Issue gh-46	2021-12-10 13:38:35 -03:00
Marcus Da Coregio	f4afba567a	Update xml:helloworld sample to use Spring 6 Issue gh-46	2021-12-10 13:38:02 -03:00
Marcus Da Coregio	a6e0f60def	Update java-configuration:hello-security to use Spring 6 Issue gh-46	2021-12-10 10:47:02 -03:00
Eleftheria Stein	75f86c51ec	Update java-configuration:hello-security-explicit to use Spring 6 Issue gh-46	2021-12-10 10:47:02 -03:00
Marcus Da Coregio	fe037cf4d7	Remove usage of WebSecurityConfigurerAdapter Switch to expose a SecurityFilterChain Bean Closes gh-52	2021-12-10 10:39:08 -03:00
Marcus Da Coregio	b2ec34de55	Update CI workflow to run with Java 17	2021-12-06 10:16:27 -03:00
Marcus Da Coregio	91a69b36f9	Migrate java-configuration:data sample to new major version Spring Security 6.0.0-SNAPSHOT, SpringFramework 6.0.0-SNAPSHOT, Hibernate-core 6.0.0.Beta2	2021-12-06 10:05:41 -03:00
Marcus Da Coregio	7b653aab91	Upgrade kotlin plugin version and jvm target	2021-12-03 11:45:10 -03:00
Marcus Da Coregio	a43cbcab41	Upgrade to Gradle 7.3	2021-12-03 11:35:39 -03:00
Marcus Da Coregio	6a60e655e3	Update to JDK 17 Issue gh-46	2021-12-03 11:17:41 -03:00