Switch to spring-security SNAPSHOT dependencies

Issue gh-44
spring-projects · Mar 10, 2023 · af38540 · af38540
1 parent a7d250e
commit af38540
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 16 deletions.
diff --git a/docs/src/docs/asciidoc/examples/spring-authorization-server-docs-examples.gradle b/docs/src/docs/asciidoc/examples/spring-authorization-server-docs-examples.gradle
@@ -8,18 +8,18 @@ sourceCompatibility = "17"
 
 repositories {
 	mavenCentral()
-	maven { url 'https://repo.spring.io/milestone' }
+	maven { url "https://repo.spring.io/snapshot" }
 }
 
 dependencies {
 	implementation platform("org.springframework.boot:spring-boot-dependencies:3.0.0")
+	implementation platform("org.springframework.security:spring-security-bom:6.1.0-SNAPSHOT")
 	implementation "org.springframework.boot:spring-boot-starter-web"
 	implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
 	implementation "org.springframework.boot:spring-boot-starter-security"
 	implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
 	implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
 	implementation "org.springframework.boot:spring-boot-starter-data-jpa"
-	implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity6"
 	implementation project(":spring-security-oauth2-authorization-server")
 	runtimeOnly "com.h2database:h2"
 	testImplementation "org.springframework.boot:spring-boot-starter-test"

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.parallel=true
 org.gradle.caching=true
 springFrameworkVersion=6.0.5
-springSecurityVersion=6.1.0-M1
+springSecurityVersion=6.1.0-SNAPSHOT
 springJavaformatVersion=0.0.35
 springJavaformatExcludePackages=org/springframework/security/config org/springframework/security/oauth2
 checkstyleToolVersion=8.34

diff --git a/samples/custom-consent-authorizationserver/gradle.properties b/samples/custom-consent-authorizationserver/gradle.properties
@@ -0,0 +1 @@
+spring-security.version=6.1.0-SNAPSHOT
diff --git a/samples/custom-consent-authorizationserver/samples-custom-consent-authorizationserver.gradle b/samples/custom-consent-authorizationserver/samples-custom-consent-authorizationserver.gradle
@@ -10,7 +10,7 @@ sourceCompatibility = "17"
 
 repositories {
 	mavenCentral()
-	maven { url 'https://repo.spring.io/milestone' }
+	maven { url "https://repo.spring.io/snapshot" }
 }
 
 dependencies {

diff --git a/samples/default-authorizationserver/gradle.properties b/samples/default-authorizationserver/gradle.properties
@@ -0,0 +1 @@
+spring-security.version=6.1.0-SNAPSHOT
diff --git a/samples/default-authorizationserver/samples-default-authorizationserver.gradle b/samples/default-authorizationserver/samples-default-authorizationserver.gradle
@@ -10,7 +10,7 @@ sourceCompatibility = "17"
 
 repositories {
 	mavenCentral()
-	maven { url 'https://repo.spring.io/milestone' }
+	maven { url "https://repo.spring.io/snapshot" }
 }
 
 dependencies {

diff --git a/samples/device-client/gradle.properties b/samples/device-client/gradle.properties
@@ -0,0 +1 @@
+spring-security.version=6.1.0-SNAPSHOT
diff --git a/samples/device-client/samples-device-client.gradle b/samples/device-client/samples-device-client.gradle
@@ -10,6 +10,7 @@ sourceCompatibility = "17"
 
 repositories {
 	mavenCentral()
+	maven { url "https://repo.spring.io/snapshot" }
 }
 
 dependencies {

diff --git a/samples/device-grant-authorizationserver/gradle.properties b/samples/device-grant-authorizationserver/gradle.properties
@@ -0,0 +1 @@
+spring-security.version=6.1.0-SNAPSHOT
diff --git a/samples/device-grant-authorizationserver/samples-device-grant-authorizationserver.gradle b/samples/device-grant-authorizationserver/samples-device-grant-authorizationserver.gradle
@@ -9,16 +9,10 @@ version = project.rootProject.version
 sourceCompatibility = "17"
 
 repositories {
-	maven {
-		url = "https://repo.spring.io/snapshot"
-	}
 	mavenCentral()
+	maven { url = "https://repo.spring.io/snapshot" }
 }
 
-// Temporarily use SNAPSHOT version
-// TODO: Use 6.1.0-M2 version after release
-ext["spring-security.version"] = "6.1.0-SNAPSHOT"
-
 dependencies {
 	implementation "org.springframework.boot:spring-boot-starter-web"
 	implementation "org.springframework.boot:spring-boot-starter-security"

diff --git a/samples/federated-identity-authorizationserver/gradle.properties b/samples/federated-identity-authorizationserver/gradle.properties
@@ -0,0 +1 @@
+spring-security.version=6.1.0-SNAPSHOT
diff --git a/...erated-identity-authorizationserver/samples-federated-identity-authorizationserver.gradle b/...erated-identity-authorizationserver/samples-federated-identity-authorizationserver.gradle
@@ -10,7 +10,7 @@ sourceCompatibility = "17"
 
 repositories {
 	mavenCentral()
-	maven { url 'https://repo.spring.io/milestone' }
+	maven { url "https://repo.spring.io/snapshot" }
 }
 
 dependencies {

diff --git a/samples/messages-client/samples-messages-client.gradle b/samples/messages-client/samples-messages-client.gradle
@@ -10,7 +10,6 @@ sourceCompatibility = "17"
 
 repositories {
 	mavenCentral()
-	maven { url 'https://repo.spring.io/milestone' }
 }
 
 dependencies {
@@ -20,7 +19,6 @@ dependencies {
 	implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
 	implementation "org.springframework:spring-webflux"
 	implementation "io.projectreactor.netty:reactor-netty"
-	implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity6"
 	implementation "org.webjars:webjars-locator-core"
 	implementation "org.webjars:bootstrap:3.4.1"
 	implementation "org.webjars:jquery:3.4.1"

diff --git a/samples/messages-resource/samples-messages-resource.gradle b/samples/messages-resource/samples-messages-resource.gradle
@@ -10,7 +10,6 @@ sourceCompatibility = "17"
 
 repositories {
 	mavenCentral()
-	maven { url 'https://repo.spring.io/milestone' }
 }
 
 dependencies {