Merge branch '6.1.x'

mklinkj · Nov 27, 2023 · 51a2cf8 · 51a2cf8
2 parents 7cd20da + bdf52af
commit 51a2cf8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,6 +5,7 @@ org-springframework-boot = "3.2.0"
 org-springframework-spring-framework-bom = "org.springframework:spring-framework-bom:6.1.1"
 org-springframework-security-spring-security-bom = "org.springframework.security:spring-security-bom:6.2.0"
 org-springframework-data-spring-data-bom = "org.springframework.data:spring-data-bom:2023.1.0"
+org-springframework-security-spring-security-oauth2-authorization-server = "org.springframework.security:spring-security-oauth2-authorization-server:1.2.0"
 
 [plugins]
 io-spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.4" }

diff --git a/servlet/spring-boot/java/oauth2/authorization-server/build.gradle b/servlet/spring-boot/java/oauth2/authorization-server/build.gradle
@@ -15,7 +15,7 @@ ext["micrometer.version"] = "1.10.0-SNAPSHOT"
 
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
-	implementation 'org.springframework.security:spring-security-oauth2-authorization-server:1.0.0-SNAPSHOT'
+	implementation libs.org.springframework.security.spring.security.oauth2.authorization.server
 
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'

diff --git a/settings.gradle b/settings.gradle
@@ -16,7 +16,7 @@ pluginManagement {
 
 plugins {
     id "com.gradle.enterprise" version "3.10.2"
-    id "io.spring.ge.conventions" version "0.0.7"
+    id "io.spring.ge.conventions" version "0.0.14"
 }
 
 include ":reactive:rsocket:hello-security"