Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.0.x' 

Closes gh-13157
This commit is contained in:
Steve Riesenberg 2023-05-12 13:54:56 -05:00
parent d62f82f763 4240155e9e
commit e96a5e9bd1
No known key found for this signature in database
GPG Key ID: 5F311AB48A55D521
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/modules/ROOT/pages/migration/index.adoc
View File

@ -1,10 +1,11 @@
[[migration]] [[migration]]
= Migrating to 6.0 = Migrating to 6.0
:primary-site-url: https://docs.spring.io/spring-security/reference
The Spring Security team has prepared the 5.8 release to simplify upgrading to Spring Security 6.0. The Spring Security team has prepared the 5.8 release to simplify upgrading to Spring Security 6.0.
Use 5.8 and Use 5.8 and
ifdef::spring-security-version[] ifdef::spring-security-version[]
xref:5.8.2@migration/index.adoc[its preparation steps] {primary-site-url}/5.8/migration/index.html[its preparation steps]
endif::[] endif::[]
ifndef::spring-security-version[] ifndef::spring-security-version[]
its preparation steps its preparation steps

3
docs/modules/ROOT/pages/migration/servlet/exploits.adoc
View File

@ -1,8 +1,9 @@
= Exploit Protection Migrations = Exploit Protection Migrations
:primary-site-url: https://docs.spring.io/spring-security/reference
The 5.8 migration guide contains several steps for The 5.8 migration guide contains several steps for
ifdef::spring-security-version[] ifdef::spring-security-version[]
xref:5.8.2@migration/servlet/exploits.adoc[exploit protection migrations] when updating to 6.0. {primary-site-url}/5.8/migration/servlet/exploits.html[exploit protection migrations] when updating to 6.0.
endif::[] endif::[]
ifndef::spring-security-version[] ifndef::spring-security-version[]
exploit protection migrations when updating to 6.0. exploit protection migrations when updating to 6.0.