From 0c3bafb5055aec5dd9d69a5b526f47a245d66ea9 Mon Sep 17 00:00:00 2001 From: Steve Riesenberg Date: Fri, 12 May 2023 15:41:51 -0500 Subject: [PATCH 1/2] Fix hard-coded link in remote build Issue gh-12675 --- docs/modules/ROOT/pages/migration/index.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/modules/ROOT/pages/migration/index.adoc b/docs/modules/ROOT/pages/migration/index.adoc index e0cc526ca5..f112b4947d 100644 --- a/docs/modules/ROOT/pages/migration/index.adoc +++ b/docs/modules/ROOT/pages/migration/index.adoc @@ -1,11 +1,11 @@ [[migration]] = Preparing for 6.0 -:primary-site-url: https://docs.spring.io/spring-security/reference +:spring-security-reference-base-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. Use 5.8 and the steps below to minimize changes when ifdef::spring-security-version[] -{primary-site-url}/6.0/migration/index.html[updating to 6.0]. +{spring-security-reference-base-url}/6.0/migration/index.html[updating to 6.0]. endif::[] ifndef::spring-security-version[] updating to 6.0. From e234f85b2f8e6d3af82bcebc29d2198da6d53c9a Mon Sep 17 00:00:00 2001 From: Steve Riesenberg Date: Fri, 12 May 2023 15:43:14 -0500 Subject: [PATCH 2/2] Fix hard-coded link in remote build Issue gh-13156 --- docs/modules/ROOT/pages/migration/index.adoc | 4 ++-- docs/modules/ROOT/pages/migration/servlet/exploits.adoc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/modules/ROOT/pages/migration/index.adoc b/docs/modules/ROOT/pages/migration/index.adoc index 981887b0f2..e52c9e2a38 100644 --- a/docs/modules/ROOT/pages/migration/index.adoc +++ b/docs/modules/ROOT/pages/migration/index.adoc @@ -1,11 +1,11 @@ [[migration]] = Migrating to 6.0 -:primary-site-url: https://docs.spring.io/spring-security/reference +:spring-security-reference-base-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. Use 5.8 and ifdef::spring-security-version[] -{primary-site-url}/5.8/migration/index.html[its preparation steps] +{spring-security-reference-base-url}/5.8/migration/index.html[its preparation steps] endif::[] ifndef::spring-security-version[] its preparation steps diff --git a/docs/modules/ROOT/pages/migration/servlet/exploits.adoc b/docs/modules/ROOT/pages/migration/servlet/exploits.adoc index 47f1878e11..bddafec6c2 100644 --- a/docs/modules/ROOT/pages/migration/servlet/exploits.adoc +++ b/docs/modules/ROOT/pages/migration/servlet/exploits.adoc @@ -1,9 +1,9 @@ = Exploit Protection Migrations -:primary-site-url: https://docs.spring.io/spring-security/reference +:spring-security-reference-base-url: https://docs.spring.io/spring-security/reference The 5.8 migration guide contains several steps for ifdef::spring-security-version[] -{primary-site-url}/5.8/migration/servlet/exploits.html[exploit protection migrations] when updating to 6.0. +{spring-security-reference-base-url}/5.8/migration/servlet/exploits.html[exploit protection migrations] when updating to 6.0. endif::[] ifndef::spring-security-version[] exploit protection migrations when updating to 6.0.