From 40063ee1f9a7c5f7511f731cd3c1ea0430b593d5 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Fri, 10 Nov 2023 11:01:23 +0100 Subject: [PATCH] Update Spring Security links --- spring-boot-project/spring-boot-docs/build.gradle | 6 +----- .../spring-boot-docs/src/docs/asciidoc/attributes.adoc | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle index b26644503b..afcfa23eb4 100644 --- a/spring-boot-project/spring-boot-docs/build.gradle +++ b/spring-boot-project/spring-boot-docs/build.gradle @@ -297,10 +297,6 @@ tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) { String formatted = version.split("\\.").take(2).join('.') return version.endsWith("-SNAPSHOT") ? formatted + "-SNAPSHOT" : formatted } - def securityVersion = versionConstraints["org.springframework.security:spring-security-core"] - if (securityVersion.endsWith("-SNAPSHOT")) { - securityVersion = securityVersion.substring(0, securityVersion.length() - "-SNAPSHOT".length()) - } attributes "hibernate-version": versionConstraints["org.hibernate.orm:hibernate-core"].split("\\.").take(2).join('.'), "jetty-version": versionConstraints["org.eclipse.jetty:jetty-server"], "jooq-version": versionConstraints["org.jooq:jooq"], @@ -322,7 +318,7 @@ tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) { "spring-graphql-version": versionConstraints["org.springframework.graphql:spring-graphql"], "spring-integration-version": versionConstraints["org.springframework.integration:spring-integration-core"], "spring-kafka-version": versionConstraints["org.springframework.kafka:spring-kafka"], - "spring-security-version": securityVersion, + "spring-security-version-antora": toAntoraVersion(versionConstraints["org.springframework.security:spring-security-core"]), "spring-webservices-version": versionConstraints["org.springframework.ws:spring-ws-core"], "tomcat-version": tomcatVersion.split("\\.").take(2).join('.'), "remote-spring-application-output": runRemoteSpringApplicationExample.outputs.files.singleFile, diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc index 03081c9de2..6ae0b2ee8a 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc @@ -91,7 +91,7 @@ :spring-kafka-docs: https://docs.spring.io/spring-kafka/docs/{spring-kafka-version}/reference/html/ :spring-restdocs: https://spring.io/projects/spring-restdocs :spring-security: https://spring.io/projects/spring-security -:spring-security-docs: https://docs.spring.io/spring-security/reference/{spring-security-version} +:spring-security-docs: https://docs.spring.io/spring-security/reference/{spring-security-version-antora} :spring-authorization-server: https://spring.io/projects/spring-authorization-server :spring-session: https://spring.io/projects/spring-session :spring-webservices-docs: https://docs.spring.io/spring-ws/docs/{spring-webservices-version}/reference/html/