From e2c5772b3da611baeb005360690008d443d4fa62 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@users.noreply.github.com>
Date: Mon, 1 Nov 2021 09:56:58 -0500
Subject: [PATCH] Use explicit version from antora.yml

---
 docs/antora.yml                  |  6 ++----
 docs/spring-security-docs.gradle | 21 ++-------------------
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/docs/antora.yml b/docs/antora.yml
index 0237a48024..913bb8f4e8 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -1,5 +1,3 @@
 name: ROOT
-title: Spring Security
-start_page: ROOT:index.adoc
-nav:
-- modules/ROOT/nav.adoc
+version: 6.0
+prerelease: true
diff --git a/docs/spring-security-docs.gradle b/docs/spring-security-docs.gradle
index 5ee9288720..460507c45b 100644
--- a/docs/spring-security-docs.gradle
+++ b/docs/spring-security-docs.gradle
@@ -2,12 +2,6 @@ apply plugin: 'io.spring.convention.docs'
 apply plugin: 'java'
 
 tasks.register("generateAntora") {
-	group = "Documentation"
-	description = "Generates antora files"
-	dependsOn 'generateAntoraYml', 'generateAntoraComponentVersion'
-}
-
-tasks.register("generateAntoraYml") {
 	group = "Documentation"
 	description = "Generates the antora.yml for dynamic properties"
 	doLast {
@@ -30,7 +24,8 @@ tasks.register("generateAntoraYml") {
 		def outputFile = new File("$buildDir/generateAntora/antora.yml")
 		outputFile.getParentFile().mkdirs()
 		outputFile.createNewFile()
-		outputFile.setText("""name: ROOT
+		def antoraYmlText = file("antora.yml").getText()
+		outputFile.setText("""$antoraYmlText
 title: Spring Security
 start_page: ROOT:index.adoc
 asciidoc:
@@ -49,18 +44,6 @@ ${ymlVersions}
 	}
 }
 
-tasks.register("generateAntoraComponentVersion") {
-	group = "Documentation"
-	description = "Generates the antora.component.version file"
-	doLast {
-		def outputFile = new File("$buildDir/generateAntora/antora.component.version")
-		outputFile.getParentFile().mkdirs()
-		outputFile.createNewFile()
-		def antoraVersion = project.version.replaceAll(/^(\d+\.\d+)\.\d+(-\w+)?$/, '$1')
-		outputFile.setText("$antoraVersion")
-	}
-}
-
 
 
 dependencies {