diff --git a/reactive/rsocket/hello-security/build.gradle b/reactive/rsocket/hello-security/build.gradle
index d188451..561550e 100644
--- a/reactive/rsocket/hello-security/build.gradle
+++ b/reactive/rsocket/hello-security/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/reactive/webflux-fn/hello-security/build.gradle b/reactive/webflux-fn/hello-security/build.gradle
index b5aae82..672c860 100644
--- a/reactive/webflux-fn/hello-security/build.gradle
+++ b/reactive/webflux-fn/hello-security/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/reactive/webflux-fn/hello/build.gradle b/reactive/webflux-fn/hello/build.gradle
index 1e520af..027086c 100644
--- a/reactive/webflux-fn/hello/build.gradle
+++ b/reactive/webflux-fn/hello/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/reactive/webflux/java/authentication/x509/build.gradle b/reactive/webflux/java/authentication/x509/build.gradle
index dd773f6..9cf166f 100644
--- a/reactive/webflux/java/authentication/x509/build.gradle
+++ b/reactive/webflux/java/authentication/x509/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/reactive/webflux/java/hello-security-explicit/build.gradle b/reactive/webflux/java/hello-security-explicit/build.gradle
index 4d34ec2..0bf1334 100644
--- a/reactive/webflux/java/hello-security-explicit/build.gradle
+++ b/reactive/webflux/java/hello-security-explicit/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/reactive/webflux/java/hello-security/build.gradle b/reactive/webflux/java/hello-security/build.gradle
index 3ac381e..76c27d9 100644
--- a/reactive/webflux/java/hello-security/build.gradle
+++ b/reactive/webflux/java/hello-security/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/reactive/webflux/java/hello/build.gradle b/reactive/webflux/java/hello/build.gradle
index 1e520af..027086c 100644
--- a/reactive/webflux/java/hello/build.gradle
+++ b/reactive/webflux/java/hello/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/reactive/webflux/java/method/build.gradle b/reactive/webflux/java/method/build.gradle
index 80187bb..69a2ea3 100644
--- a/reactive/webflux/java/method/build.gradle
+++ b/reactive/webflux/java/method/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/reactive/webflux/java/oauth2/login/build.gradle b/reactive/webflux/java/oauth2/login/build.gradle
index 225f9da..e823595 100644
--- a/reactive/webflux/java/oauth2/login/build.gradle
+++ b/reactive/webflux/java/oauth2/login/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/reactive/webflux/java/oauth2/resource-server/build.gradle b/reactive/webflux/java/oauth2/resource-server/build.gradle
index 7f6573e..22c1990 100644
--- a/reactive/webflux/java/oauth2/resource-server/build.gradle
+++ b/reactive/webflux/java/oauth2/resource-server/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/reactive/webflux/java/oauth2/webclient/build.gradle b/reactive/webflux/java/oauth2/webclient/build.gradle
index 7adb7cc..fbe6a06 100644
--- a/reactive/webflux/java/oauth2/webclient/build.gradle
+++ b/reactive/webflux/java/oauth2/webclient/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/reactive/webflux/kotlin/hello-security/build.gradle.kts b/reactive/webflux/kotlin/hello-security/build.gradle.kts
index d9261b4..4252302 100644
--- a/reactive/webflux/kotlin/hello-security/build.gradle.kts
+++ b/reactive/webflux/kotlin/hello-security/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("org.springframework.boot") version "3.0.0-M1"
+    id("org.springframework.boot") version "3.0.0-SNAPSHOT"
     id("io.spring.dependency-management") version "1.0.11.RELEASE"
     kotlin("jvm") version "1.6.0"
     kotlin("plugin.spring") version "1.6.0"
diff --git a/servlet/spring-boot/java/authentication/username-password/mfa/build.gradle b/servlet/spring-boot/java/authentication/username-password/mfa/build.gradle
index f626778..9e8899a 100644
--- a/servlet/spring-boot/java/authentication/username-password/mfa/build.gradle
+++ b/servlet/spring-boot/java/authentication/username-password/mfa/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
diff --git a/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/build.gradle b/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/build.gradle
index 5340f91..a0aafdb 100644
--- a/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/build.gradle
+++ b/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
 }
diff --git a/servlet/spring-boot/java/hello-security-explicit/build.gradle b/servlet/spring-boot/java/hello-security-explicit/build.gradle
index 880c19a..0286c7e 100644
--- a/servlet/spring-boot/java/hello-security-explicit/build.gradle
+++ b/servlet/spring-boot/java/hello-security-explicit/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/servlet/spring-boot/java/hello-security/build.gradle b/servlet/spring-boot/java/hello-security/build.gradle
index 1d4cea9..a47199d 100644
--- a/servlet/spring-boot/java/hello-security/build.gradle
+++ b/servlet/spring-boot/java/hello-security/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/servlet/spring-boot/java/hello/build.gradle b/servlet/spring-boot/java/hello/build.gradle
index 5e4f518..435ed22 100644
--- a/servlet/spring-boot/java/hello/build.gradle
+++ b/servlet/spring-boot/java/hello/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/servlet/spring-boot/java/jwt/login/build.gradle b/servlet/spring-boot/java/jwt/login/build.gradle
index ff109f9..cbf2c56 100644
--- a/servlet/spring-boot/java/jwt/login/build.gradle
+++ b/servlet/spring-boot/java/jwt/login/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id 'java'
 }
diff --git a/servlet/spring-boot/java/ldap/build.gradle b/servlet/spring-boot/java/ldap/build.gradle
index 9ffc99c..8d3c699 100644
--- a/servlet/spring-boot/java/ldap/build.gradle
+++ b/servlet/spring-boot/java/ldap/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id 'java'
 }
diff --git a/servlet/spring-boot/java/oauth2/login/build.gradle b/servlet/spring-boot/java/oauth2/login/build.gradle
index 10ffa1e..38e9ce5 100644
--- a/servlet/spring-boot/java/oauth2/login/build.gradle
+++ b/servlet/spring-boot/java/oauth2/login/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/servlet/spring-boot/java/oauth2/resource-server/hello-security/build.gradle b/servlet/spring-boot/java/oauth2/resource-server/hello-security/build.gradle
index cb4dae4..81fb1fa 100644
--- a/servlet/spring-boot/java/oauth2/resource-server/hello-security/build.gradle
+++ b/servlet/spring-boot/java/oauth2/resource-server/hello-security/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/servlet/spring-boot/java/oauth2/resource-server/jwe/build.gradle b/servlet/spring-boot/java/oauth2/resource-server/jwe/build.gradle
index 4276e9f..c55a6f2 100644
--- a/servlet/spring-boot/java/oauth2/resource-server/jwe/build.gradle
+++ b/servlet/spring-boot/java/oauth2/resource-server/jwe/build.gradle
@@ -15,7 +15,7 @@
  */
 
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/build.gradle b/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/build.gradle
index a65f5fc..8e69886 100644
--- a/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/build.gradle
+++ b/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/build.gradle
@@ -15,7 +15,7 @@
  */
 
 plugins {
-	id 'org.springframework.boot' version '2.6.4'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/gradle.properties b/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/gradle.properties
index e19a862..ce1417e 100644
--- a/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/gradle.properties
+++ b/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/gradle.properties
@@ -1,2 +1,2 @@
-version=5.7.0-SNAPSHOT
-spring-security.version=5.7.0-SNAPSHOT
+version=6.0.0-SNAPSHOT
+spring-security.version=6.0.0-SNAPSHOT
diff --git a/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/src/main/java/example/OAuth2ResourceServerSecurityConfiguration.java b/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/src/main/java/example/OAuth2ResourceServerSecurityConfiguration.java
index 0841bdd..7d473d6 100644
--- a/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/src/main/java/example/OAuth2ResourceServerSecurityConfiguration.java
+++ b/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/src/main/java/example/OAuth2ResourceServerSecurityConfiguration.java
@@ -19,7 +19,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/servlet/spring-boot/java/oauth2/resource-server/opaque/build.gradle b/servlet/spring-boot/java/oauth2/resource-server/opaque/build.gradle
index c58f5df..8e69886 100644
--- a/servlet/spring-boot/java/oauth2/resource-server/opaque/build.gradle
+++ b/servlet/spring-boot/java/oauth2/resource-server/opaque/build.gradle
@@ -15,7 +15,7 @@
  */
 
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/servlet/spring-boot/java/oauth2/resource-server/static/build.gradle b/servlet/spring-boot/java/oauth2/resource-server/static/build.gradle
index 4276e9f..c55a6f2 100644
--- a/servlet/spring-boot/java/oauth2/resource-server/static/build.gradle
+++ b/servlet/spring-boot/java/oauth2/resource-server/static/build.gradle
@@ -15,7 +15,7 @@
  */
 
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/servlet/spring-boot/java/oauth2/webclient/build.gradle b/servlet/spring-boot/java/oauth2/webclient/build.gradle
index 259b84e..6dd1347 100644
--- a/servlet/spring-boot/java/oauth2/webclient/build.gradle
+++ b/servlet/spring-boot/java/oauth2/webclient/build.gradle
@@ -15,7 +15,7 @@
  */
 
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle b/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle
index 7f88a7b..02e7891 100644
--- a/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle
+++ b/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/servlet/spring-boot/java/saml2/login/build.gradle b/servlet/spring-boot/java/saml2/login/build.gradle
index 1045382..87007fb 100644
--- a/servlet/spring-boot/java/saml2/login/build.gradle
+++ b/servlet/spring-boot/java/saml2/login/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'
diff --git a/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle b/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle
index 7f88a7b..02e7891 100644
--- a/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle
+++ b/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.0.0-M1'
+	id 'org.springframework.boot' version '3.0.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id "nebula.integtest" version "8.2.0"
 	id 'java'