Add Gradle Enterprise plugin

Issue gh-94

.github/workflows/continuous-integraion-workflow.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: '17'
+          java-version: '11'
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:

.idea/misc.xml

@@ -4,5 +4,5 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="temurin-17" project-jdk-type="JavaSDK" />
-</project>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" />
+</project>

build.gradle

@@ -20,4 +20,26 @@ 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
+	}
+}
+

gradle.properties

@@ -1,5 +1,5 @@
-version=6.0.0-SNAPSHOT
-spring-security.version=6.0.0-SNAPSHOT
-org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError
+version=5.6.0
+spring-security.version=5.6.0
+org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.parallel=true
 org.gradle.caching=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

reactive/rsocket/hello-security/build.gradle

@@ -1,13 +1,12 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
-	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+	id 'org.springframework.boot' version '2.5.2'
+	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 

reactive/rsocket/hello-security/gradle.properties

@@ -1,2 +1,2 @@
-version=6.0.0-SNAPSHOT
-spring-security.version=6.0.0-SNAPSHOT
+version=5.6.0
+spring-security.version=5.6.0

reactive/rsocket/hello-security/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

reactive/webflux-fn/hello-security/build.gradle

@@ -1,13 +1,12 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
-	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+	id 'org.springframework.boot' version '2.5.2'
+	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 

reactive/webflux-fn/hello-security/gradle.properties

@@ -1,2 +1,2 @@
-version=6.0.0-SNAPSHOT
-spring-security.version=6.0.0-SNAPSHOT
+version=5.6.0
+spring-security.version=5.6.0

reactive/webflux-fn/hello-security/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

reactive/webflux-fn/hello/build.gradle

@@ -1,13 +1,12 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
-	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+	id 'org.springframework.boot' version '2.5.2'
+	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 

reactive/webflux-fn/hello/gradle.properties

@@ -1,2 +1,2 @@
-version=6.0.0-SNAPSHOT
-spring-security.version=6.0.0-SNAPSHOT
+version=5.6.0
+spring-security.version=5.6.0

reactive/webflux-fn/hello/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

reactive/webflux/java/authentication/username-password/form/build.gradle

@@ -1,13 +1,12 @@
 plugins {
-	id 'org.springframework.boot' version '2.6.4'
-	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+	id 'org.springframework.boot' version '2.5.2'
+	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 

reactive/webflux/java/authentication/username-password/form/gradle.properties

@@ -1,2 +1,2 @@
-version=5.7.0-SNAPSHOT
-spring-security.version=5.7.0-SNAPSHOT
+version=5.6.0
+spring-security.version=5.6.0

reactive/webflux/java/authentication/username-password/form/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

reactive/webflux/java/authentication/username-password/form/src/integTest/java/example/pages/LoginPage.java

@@ -70,10 +70,8 @@ public class LoginPage {
 
 		private WebDriver driver;
 
-		@FindBy(id = "username")
 		private WebElement username;
 
-		@FindBy(id = "password")
 		private WebElement password;
 
 		@FindBy(css = "button[type=submit]")

reactive/webflux/java/authentication/x509/build.gradle

@@ -1,13 +1,12 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
-	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+	id 'org.springframework.boot' version '2.5.2'
+	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 

reactive/webflux/java/authentication/x509/gradle.properties

@@ -1,2 +1,2 @@
-version=6.0.0-SNAPSHOT
-spring-security.version=6.0.0-SNAPSHOT
+version=5.6.0
+spring-security.version=5.6.0

reactive/webflux/java/authentication/x509/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

reactive/webflux/java/hello-security-explicit/build.gradle

@@ -1,13 +1,12 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
-	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+	id 'org.springframework.boot' version '2.5.2'
+	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 

reactive/webflux/java/hello-security-explicit/gradle.properties

@@ -1,2 +1,2 @@
-version=6.0.0-SNAPSHOT
-spring-security.version=6.0.0-SNAPSHOT
+version=5.6.0
+spring-security.version=5.6.0

reactive/webflux/java/hello-security-explicit/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

reactive/webflux/java/hello-security-explicit/src/integTest/java/example/pages/LoginPage.java

@@ -51,10 +51,8 @@ public class LoginPage {
 
 		private WebDriver webDriver;
 
-		@FindBy(id = "username")
 		private WebElement username;
 
-		@FindBy(id = "password")
 		private WebElement password;
 
 		@FindBy(css = "button[type=submit]")

reactive/webflux/java/hello-security/build.gradle

@@ -1,13 +1,12 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
-	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+	id 'org.springframework.boot' version '2.5.2'
+	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 

reactive/webflux/java/hello-security/gradle.properties

@@ -1,2 +1,2 @@
-version=6.0.0-SNAPSHOT
-spring-security.version=6.0.0-SNAPSHOT
+version=5.6.0
+spring-security.version=5.6.0

reactive/webflux/java/hello-security/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

reactive/webflux/java/hello/build.gradle

@@ -1,13 +1,12 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
-	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+	id 'org.springframework.boot' version '2.5.2'
+	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 

reactive/webflux/java/hello/gradle.properties

@@ -1,2 +1,2 @@
-version=6.0.0-SNAPSHOT
-spring-security.version=6.0.0-SNAPSHOT
+version=5.6.0
+spring-security.version=5.6.0

reactive/webflux/java/hello/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

reactive/webflux/java/method/build.gradle

@@ -1,13 +1,12 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
-	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+	id 'org.springframework.boot' version '2.5.2'
+	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 

reactive/webflux/java/method/gradle.properties

@@ -1,2 +1,2 @@
-version=6.0.0-SNAPSHOT
-spring-security.version=6.0.0-SNAPSHOT
+version=5.6.0
+spring-security.version=5.6.0

reactive/webflux/java/method/gradle/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

reactive/webflux/java/method/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

reactive/webflux/java/oauth2/login/build.gradle

@@ -1,13 +1,12 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
-	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+	id 'org.springframework.boot' version '2.5.2'
+	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 
@@ -15,7 +14,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-springsecurity6'
+	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5'
 
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
@@ -26,4 +25,4 @@ dependencies {
 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
 	outputs.upToDateWhen { false }
-}
+}

reactive/webflux/java/oauth2/login/gradle.properties

@@ -1,2 +1,2 @@
-version=6.0.0-SNAPSHOT
-spring-security.version=6.0.0-SNAPSHOT
+version=5.6.0
+spring-security.version=5.6.0

reactive/webflux/java/oauth2/login/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

reactive/webflux/java/oauth2/resource-server/build.gradle

@@ -1,13 +1,12 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
-	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+	id 'org.springframework.boot' version '2.5.2'
+	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 
@@ -23,4 +22,4 @@ dependencies {
 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
 	outputs.upToDateWhen { false }
-}
+}

reactive/webflux/java/oauth2/resource-server/gradle.properties

@@ -1,2 +1,2 @@
-version=6.0.0-SNAPSHOT
-spring-security.version=6.0.0-SNAPSHOT
+version=5.6.0
+spring-security.version=5.6.0

reactive/webflux/java/oauth2/resource-server/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

reactive/webflux/java/oauth2/webclient/build.gradle

@@ -1,13 +1,12 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
-	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+	id 'org.springframework.boot' version '2.5.2'
+	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 
@@ -15,7 +14,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-springsecurity6'
+	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5'
 	implementation 'io.projectreactor.netty:reactor-netty'
 
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
@@ -26,4 +25,4 @@ dependencies {
 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
 	outputs.upToDateWhen { false }
-}
+}

reactive/webflux/java/oauth2/webclient/gradle.properties

@@ -1,2 +1,2 @@
-version=6.0.0-SNAPSHOT
-spring-security.version=6.0.0-SNAPSHOT
+version=5.6.0
+spring-security.version=5.6.0

reactive/webflux/java/oauth2/webclient/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

reactive/webflux/kotlin/hello-security/build.gradle.kts

@@ -1,10 +1,10 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    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"
+    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"
 }
 
 repositories {
@@ -12,16 +12,13 @@ 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-springsecurity6")
+    implementation("org.thymeleaf.extras:thymeleaf-extras-springsecurity5")
     implementation("io.projectreactor.kotlin:reactor-kotlin-extensions")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
@@ -37,10 +34,10 @@ dependencies {
 tasks.withType<KotlinCompile> {
     kotlinOptions {
         freeCompilerArgs = listOf("-Xjsr305=strict")
-        jvmTarget = "17"
+        jvmTarget = "1.8"
     }
 }
 
 tasks.withType<Test> {
     useJUnitPlatform()
-}
+}

reactive/webflux/kotlin/hello-security/gradle.properties

@@ -1 +1 @@
-spring-security.version=6.0.0-SNAPSHOT
+spring-security.version=5.6.0

reactive/webflux/kotlin/hello-security/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

servlet/java-configuration/aspectj/build.gradle

@@ -4,28 +4,17 @@ plugins {
 }
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	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.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.0")
-	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
+	implementation platform("org.springframework.security:spring-security-bom:5.6.0")
 	implementation platform("org.junit:junit-bom:5.7.0")
 
 	implementation "org.springframework.security:spring-security-config"

servlet/java-configuration/aspectj/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -8,14 +8,13 @@ plugins {
 apply from: "gradle/gretty.gradle"
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 
 dependencies {
 	implementation platform("org.springframework:spring-framework-bom:5.3.0")
-	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
+	implementation platform("org.springframework.security:spring-security-bom:5.6.0")
 	implementation platform("org.junit:junit-bom:5.7.0")
 
 	implementation "org.springframework.security:spring-security-config"

servlet/java-configuration/authentication/preauth/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -8,14 +8,13 @@ plugins {
 apply from: "gradle/gretty.gradle"
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 
 dependencies {
 	implementation platform("org.springframework:spring-framework-bom:5.3.0")
-	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
+	implementation platform("org.springframework.security:spring-security-bom:5.6.0")
 	implementation platform("org.junit:junit-bom:5.7.0")
 
 	implementation "org.springframework.security:spring-security-config"
@@ -36,4 +35,4 @@ dependencies {
 tasks.withType(Test).configureEach {
 	useJUnitPlatform()
 	outputs.upToDateWhen { false }
-}
+}

servlet/java-configuration/authentication/remember-me/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -1,27 +1,26 @@
 plugins {
 	id "java"
 	id "nebula.integtest" version "8.2.0"
-	id "org.gretty" version "4.0.0"
+	id "org.gretty" version "3.0.6"
 	id "war"
 }
 
 apply from: "gradle/gretty.gradle"
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 
 dependencies {
-	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.springframework:spring-framework-bom:5.3.0")
+	implementation platform("org.springframework.security:spring-security-bom:5.6.0")
 	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-spring6:3.1.0.M1"
+	implementation "org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE"
 
 	testImplementation "org.assertj:assertj-core:3.18.0"
 	testImplementation "org.springframework:spring-test"

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

@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat10"
+	servletContainer = "tomcat9"
 	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
 	}
-}
+}

servlet/java-configuration/authentication/username-password/form/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

servlet/java-configuration/authentication/username-password/form/src/main/java/example/MvcWebApplicationInitializer.java

@@ -16,7 +16,7 @@
 
 package example;
 
-import jakarta.servlet.Filter;
+import javax.servlet.Filter;
 
 import org.springframework.web.filter.HiddenHttpMethodFilter;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;

servlet/java-configuration/authentication/username-password/form/src/main/java/example/WebMvcConfiguration.java

@@ -16,10 +16,10 @@
 
 package example;
 
-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.spring5.ISpringTemplateEngine;
+import org.thymeleaf.spring5.SpringTemplateEngine;
+import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
+import org.thymeleaf.spring5.view.ThymeleafViewResolver;
 import org.thymeleaf.templatemode.TemplateMode;
 import org.thymeleaf.templateresolver.ITemplateResolver;
 

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

@@ -8,14 +8,13 @@ plugins {
 apply from: "gradle/gretty.gradle"
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 
 dependencies {
 	implementation platform("org.springframework:spring-framework-bom:5.3.0")
-	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
+	implementation platform("org.springframework.security:spring-security-bom:5.6.0")
 	implementation platform("org.junit:junit-bom:5.7.0")
 
 	implementation "org.springframework.security:spring-security-config"

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

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -8,14 +8,13 @@ plugins {
 apply from: "gradle/gretty.gradle"
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 
 dependencies {
 	implementation platform("org.springframework:spring-framework-bom:5.3.0")
-	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
+	implementation platform("org.springframework.security:spring-security-bom:5.6.0")
 	implementation platform("org.junit:junit-bom:5.7.0")
 
 	implementation "org.hsqldb:hsqldb:2.5.1"

servlet/java-configuration/authentication/username-password/jdbc/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -8,14 +8,13 @@ plugins {
 apply from: "gradle/gretty.gradle"
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 
 dependencies {
 	implementation platform("org.springframework:spring-framework-bom:5.3.0")
-	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
+	implementation platform("org.springframework.security:spring-security-bom:5.6.0")
 	implementation platform("org.junit:junit-bom:5.7.0")
 
 	implementation "org.springframework.security:spring-security-config"

servlet/java-configuration/authentication/username-password/ldap/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -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"
 }
@@ -8,14 +8,13 @@ plugins {
 //apply from: "gradle/gretty.gradle"
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 
 dependencies {
 	implementation platform("org.springframework:spring-framework-bom:5.3.0")
-	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
+	implementation platform("org.springframework.security:spring-security-bom:5.6.0")
 	implementation platform("org.junit:junit-bom:5.7.0")
 
 	implementation "org.springframework.security:spring-security-config"

servlet/java-configuration/authentication/x509/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

servlet/java-configuration/data/build.gradle

@@ -4,25 +4,25 @@ plugins {
 }
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 
 dependencies {
-	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.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.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 '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 '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 'org.hsqldb:hsqldb:2.5.1'
-	implementation 'org.springframework.data:spring-data-jpa:3.0.0-SNAPSHOT'
+	implementation 'org.springframework.data:spring-data-jpa'
 
 	testImplementation "org.assertj:assertj-core:3.18.0"
 	testImplementation "org.springframework:spring-test"

servlet/java-configuration/data/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

servlet/java-configuration/data/src/main/java/example/Message.java

@@ -18,12 +18,12 @@ package example;
 
 import java.util.Calendar;
 
-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;
+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;
 
 @Entity
 public class Message {

servlet/java-configuration/data/src/main/java/example/User.java

@@ -16,10 +16,10 @@
 
 package example;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 
 /**
  * A user.

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

@@ -1,27 +1,26 @@
 plugins {
 	id "java"
 	id "nebula.integtest" version "8.2.0"
-	id "org.gretty" version "4.0.0"
+	id "org.gretty" version "3.0.6"
 	id "war"
 }
 
 apply from: "gradle/gretty.gradle"
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 
 dependencies {
-	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.springframework:spring-framework-bom:5.3.0")
+	implementation platform("org.springframework.security:spring-security-bom:5.6.0")
 	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-spring6:3.1.0.M1"
+	implementation "org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE"
 
 	testImplementation "org.assertj:assertj-core:3.18.0"
 	testImplementation "org.springframework:spring-test"

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

@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat10"
+	servletContainer = "tomcat9"
 	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
 	}
-}
+}

servlet/java-configuration/hello-mvc-security/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

servlet/java-configuration/hello-mvc-security/src/integTest/java/example/pages/LoginPage.java

@@ -51,10 +51,8 @@ public class LoginPage {
 
 		private WebDriver webDriver;
 
-		@FindBy(id = "username")
 		private WebElement username;
 
-		@FindBy(id = "password")
 		private WebElement password;
 
 		@FindBy(css = "button[type=submit]")

servlet/java-configuration/hello-mvc-security/src/main/java/example/MvcWebApplicationInitializer.java

@@ -16,7 +16,7 @@
 
 package example;
 
-import jakarta.servlet.Filter;
+import javax.servlet.Filter;
 
 import org.springframework.web.filter.HiddenHttpMethodFilter;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;

servlet/java-configuration/hello-mvc-security/src/main/java/example/WebMvcConfiguration.java

@@ -16,10 +16,10 @@
 
 package example;
 
-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.spring5.ISpringTemplateEngine;
+import org.thymeleaf.spring5.SpringTemplateEngine;
+import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
+import org.thymeleaf.spring5.view.ThymeleafViewResolver;
 import org.thymeleaf.templatemode.TemplateMode;
 import org.thymeleaf.templateresolver.ITemplateResolver;
 

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

@@ -1,28 +1,29 @@
 plugins {
 	id "java"
 	id "nebula.integtest" version "8.2.0"
-	id "org.gretty" version "4.0.0"
+	id "org.gretty" version "3.0.6"
 	id "war"
 }
 
 apply from: "gradle/gretty.gradle"
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 
 dependencies {
-	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.springframework:spring-framework-bom:5.3.0")
+	implementation platform("org.springframework.security:spring-security-bom:5.6.0")
 	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 "jakarta.servlet:jakarta.servlet-api:5.0.0"
-	providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0"
+	providedCompile "javax.servlet:javax.servlet-api:4.0.1"
+	providedCompile "javax.servlet.jsp:javax.servlet.jsp-api:2.3.3"
 
 	testImplementation "org.assertj:assertj-core:3.18.0"
 	testImplementation "org.springframework:spring-test"

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

@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat10"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'

servlet/java-configuration/hello-security-explicit/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

servlet/java-configuration/hello-security-explicit/src/integTest/java/example/pages/LoginPage.java

@@ -51,10 +51,8 @@ public class LoginPage {
 
 		private WebDriver webDriver;
 
-		@FindBy(id = "username")
 		private WebElement username;
 
-		@FindBy(id = "password")
 		private WebElement password;
 
 		@FindBy(css = "button[type=submit]")

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

@@ -1,28 +1,29 @@
 plugins {
 	id "java"
 	id "nebula.integtest" version "8.2.0"
-	id "org.gretty" version "4.0.0"
+	id "org.gretty" version "3.0.6"
 	id "war"
 }
 
 apply from: "gradle/gretty.gradle"
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 
 dependencies {
-	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.springframework:spring-framework-bom:5.3.0")
+	implementation platform("org.springframework.security:spring-security-bom:5.6.0")
 	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 "jakarta.servlet:jakarta.servlet-api:5.0.0"
-	providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0"
+	providedCompile "javax.servlet:javax.servlet-api:4.0.1"
+	providedCompile "javax.servlet.jsp:javax.servlet.jsp-api:2.3.3"
 
 	testImplementation "org.assertj:assertj-core:3.18.0"
 	testImplementation "org.springframework:spring-test"

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

@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat10"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'

servlet/java-configuration/hello-security/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -8,14 +8,13 @@ plugins {
 apply from: "gradle/gretty.gradle"
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 
 dependencies {
 	implementation platform("org.springframework:spring-framework-bom:5.3.0")
-	implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT")
+	implementation platform("org.springframework.security:spring-security-bom:5.6.0")
 	implementation platform("org.junit:junit-bom:5.7.0")
 
 	implementation "org.springframework.security:spring-security-config"

servlet/java-configuration/max-sessions/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -24,8 +24,7 @@ plugins {
 apply from: "gradle/gretty.gradle"
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 	maven { url "https://build.shibboleth.net/nexus/content/repositories/releases/" }
 }
@@ -36,19 +35,21 @@ 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:6.0.0-SNAPSHOT")
-	implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT")
+	implementation platform("org.springframework:spring-framework-bom:5.3.11")
+	implementation platform("org.springframework.security:spring-security-bom:5.6.0")
 	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 "org.thymeleaf:thymeleaf-spring6:3.1.0.M1"
-	implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.0.M1"
+	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"
 
-	providedCompile "jakarta.servlet:jakarta.servlet-api:5.0.0"
-	providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0"
+	providedCompile "javax.servlet:javax.servlet-api:4.0.1"
+	providedCompile "javax.servlet.jsp:javax.servlet.jsp-api:2.3.3"
 
 	testImplementation "org.assertj:assertj-core:3.18.0"
 	testImplementation "org.springframework:spring-test"
@@ -56,7 +57,6 @@ 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")
 }

servlet/java-configuration/saml2/login/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

servlet/java-configuration/saml2/login/src/integTest/java/example/Saml2JavaConfigurationITests.java

@@ -16,16 +16,15 @@
 
 package example;
 
-import java.util.concurrent.TimeUnit;
+import java.io.IOException;
 
-import com.gargoylesoftware.htmlunit.ElementNotFoundException;
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlInput;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput;
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -41,9 +40,6 @@ import org.springframework.test.web.servlet.htmlunit.MockMvcWebClientBuilder;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.awaitility.Awaitility.await;
-
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = ApplicationConfiguration.class)
 @WebAppConfiguration
@@ -70,47 +66,35 @@ public class Saml2JavaConfigurationITests {
 
 	@Test
 	void authenticationAttemptWhenValidThenShowsUserEmailAddress() throws Exception {
-		performLogin();
-		HtmlPage home = (HtmlPage) this.webClient.getCurrentWindow().getEnclosedPage();
-		assertThat(home.asText()).contains("You're email address is testuser@spring.security.saml");
+		HtmlPage relyingParty = performLogin();
+		Assertions.assertThat(relyingParty.asText()).contains("You're email address is testuser@spring.security.saml");
 	}
 
 	@Test
 	void logoutWhenRelyingPartyInitiatedLogoutThenLoginPageWithLogoutParam() throws Exception {
-		performLogin();
-		HtmlPage home = (HtmlPage) this.webClient.getCurrentWindow().getEnclosedPage();
-		HtmlElement rpLogoutButton = home.getHtmlElementById("rp_logout_button");
+		HtmlPage relyingParty = performLogin();
+		HtmlElement rpLogoutButton = relyingParty.getHtmlElementById("rp_logout_button");
 		HtmlPage loginPage = rpLogoutButton.click();
-		assertThat(loginPage.getUrl().getFile()).isEqualTo("/login?logout");
+		Assertions.assertThat(loginPage.getUrl().getFile()).isEqualTo("/login?logout");
 	}
 
-	private void performLogin() throws Exception {
+	@Test
+	void logoutWhenAssertingPartyInitiatedLogoutThenLoginPageWithLogoutParam() throws Exception {
+		HtmlPage relyingParty = performLogin();
+		HtmlElement apLogoutButton = relyingParty.getHtmlElementById("ap_logout_button");
+		HtmlPage loginPage = apLogoutButton.click();
+		Assertions.assertThat(loginPage.getUrl().getFile()).isEqualTo("/login?logout");
+	}
+
+	private HtmlPage performLogin() throws IOException {
 		HtmlPage login = this.webClient.getPage("/");
-		this.webClient.waitForBackgroundJavaScript(10000);
-		HtmlForm form = findForm(login);
+		HtmlForm form = login.getFormByName("f");
 		HtmlInput username = form.getInputByName("username");
-		HtmlPasswordInput password = form.getInputByName("password");
-		HtmlSubmitInput submit = login.getHtmlElementById("okta-signin-submit");
-		username.type("testuser@spring.security.saml");
-		password.type("12345678");
-		submit.click();
-		this.webClient.waitForBackgroundJavaScript(10000);
-	}
-
-	private HtmlForm findForm(HtmlPage login) {
-		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")) {
-					return form;
-				}
-			}
-			catch (ElementNotFoundException ex) {
-				// Continue
-			}
-		}
-		throw new IllegalStateException("Could not resolve login form");
+		HtmlInput password = form.getInputByName("password");
+		HtmlSubmitInput submit = login.getHtmlElementById("submit_button");
+		username.setValueAttribute("user");
+		password.setValueAttribute("password");
+		return submit.click();
 	}
 
 }

servlet/java-configuration/saml2/login/src/main/java/example/IndexController.java

@@ -31,7 +31,7 @@ public class IndexController {
 
 	@GetMapping("/")
 	public String index(Model model, @AuthenticationPrincipal Saml2AuthenticatedPrincipal principal) {
-		String emailAddress = principal.getFirstAttribute("email");
+		String emailAddress = principal.getFirstAttribute("emailAddress");
 		model.addAttribute("emailAddress", emailAddress);
 		model.addAttribute("userAttributes", principal.getAttributes());
 		return "index";

servlet/java-configuration/saml2/login/src/main/java/example/MvcWebApplicationInitializer.java

@@ -16,7 +16,7 @@
 
 package example;
 
-import jakarta.servlet.Filter;
+import javax.servlet.Filter;
 
 import org.springframework.web.filter.HiddenHttpMethodFilter;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;

servlet/java-configuration/saml2/login/src/main/java/example/SecurityConfiguration.java

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

servlet/java-configuration/saml2/login/src/main/java/example/WebMvcConfiguration.java

@@ -16,11 +16,11 @@
 
 package example;
 
-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.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.templatemode.TemplateMode;
 import org.thymeleaf.templateresolver.ITemplateResolver;
 

servlet/java-configuration/saml2/login/src/main/resources/templates/index.html

@@ -36,6 +36,11 @@
                 </button>
             </form>
         </li>
+        <li class="nav-item">
+            <a id="ap_logout_button" class="nav-link" href="https://simplesaml-for-spring-saml.apps.pcfone.io/saml2/idp/SingleLogoutService.php?ReturnTo=http://localhost:8080/login?logout">
+                AP-initiated Logout
+            </a>
+        </li>
     </ul>
     </div>
     <main role="main" class="container">

servlet/spring-boot/java/authentication/username-password/mfa/build.gradle

@@ -1,13 +1,12 @@
 plugins {
-	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+	id 'org.springframework.boot' version '2.5.2'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }
 

servlet/spring-boot/java/authentication/username-password/mfa/gradle.properties

@@ -1,2 +1,2 @@
-version=6.0.0-SNAPSHOT
-spring-security.version=6.0.0-SNAPSHOT
+version=5.6.0
+spring-security.version=5.6.0

servlet/spring-boot/java/authentication/username-password/mfa/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

servlet/spring-boot/java/authentication/username-password/mfa/src/main/java/example/MfaAuthenticationHandler.java

@@ -18,9 +18,9 @@ package example;
 
 import java.io.IOException;
 
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.core.Authentication;

servlet/spring-boot/java/authentication/username-password/mfa/src/main/java/example/MfaController.java

@@ -18,8 +18,8 @@ package example;
 
 import java.security.SecureRandom;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.context.SecurityContextHolder;

servlet/spring-boot/java/authentication/username-password/mfa/src/test/java/example/MfaApplicationTests.java

@@ -15,8 +15,9 @@
  */
 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;

servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/build.gradle

@@ -1,13 +1,12 @@
 plugins {
-	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'io.spring.dependency-management' version '1.0.10.RELEASE'
+	id 'org.springframework.boot' version '2.5.2'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
 
 repositories {
-	mavenCentral()
-	maven { url "https://repo.spring.io/milestone" }
+	jcenter()
 	maven { url "https://repo.spring.io/snapshot" }
 }