Merge pull request #1051 from grails/prevent-spring-security-core-dow…

…ngrade document how to avoid spring-security-core downgrade
grails · Jan 2, 2025 · 820d931 · 820d931
2 parents efd1e60 + aac5574
commit 820d931
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
@@ -9,6 +9,7 @@ def softwareVersion = SoftwareVersion.build(version.toString())
 def asciidoctorAttributes = [
         stableversion        : softwareVersion.stableVersion,
         snapshotversion      : softwareVersion.snapshotVersion,
+        springsecuritycoreversion : libs.versions.spring.security.get(),
         copyright            : 'Apache License, Version 2.0',
         docinfo1             : 'true',
         doctype              : 'book',

diff --git a/plugin/src/docs/introduction/configGroovy.adoc b/plugin/src/docs/introduction/configGroovy.adoc
@@ -26,5 +26,7 @@ dependencies {
     implementation 'org.grails.plugins:cxf:3.1.1'
     // CXF above security.
     implementation 'org.grails.plugins:spring-security-core:{stableversion}'
+    // required for Grails 6, since spring-boot-dependencies:2.7.18 downgrades
+    implementation 'org.springframework.security:spring-security-core:{springsecuritycoreversion}'
 }
 ----
diff --git a/plugin/src/docs/introduction/gettingStarted.adoc b/plugin/src/docs/introduction/gettingStarted.adoc
@@ -10,6 +10,8 @@ Begin by installing the Spring Security plugin into your Grails project. Add the
 [source,gradle,subs="+attributes"]
 ----
 implementation 'org.grails.plugins:spring-security-core:{stableversion}'
+// required for Grails 6, since spring-boot-dependencies:2.7.18 downgrades
+implementation 'org.springframework.security:spring-security-core:{springsecuritycoreversion}'
 ----
 
 .Step 2: Run the Initialization Script

diff --git a/plugin/src/docs/introduction/installation.adoc b/plugin/src/docs/introduction/installation.adoc
@@ -22,6 +22,8 @@ Ensure you have the following set up:
 dependencies {
     // ... other dependencies
     implementation 'org.grails.plugins:spring-security-core:{stableversion}'
+    // required for Grails 6, since spring-boot-dependencies:2.7.18 downgrades
+    implementation 'org.springframework.security:spring-security-core:{springsecuritycoreversion}'
 }
 ----
 +

diff --git a/plugin/src/docs/tutorials/usingControllerAnnotations.adoc b/plugin/src/docs/tutorials/usingControllerAnnotations.adoc
@@ -14,7 +14,9 @@ $ cd bookstore
 ----
 dependencies {
    ...
-   compile 'org.grails.plugins:spring-security-core:{project-version}'
+   implementation 'org.grails.plugins:spring-security-core:{project-version}'
+   // required for Grails 6, since spring-boot-dependencies:2.7.18 downgrades
+   implementation 'org.springframework.security:spring-security-core:{springsecuritycoreversion}'
    ...
 }
 ----