From 144af074b7dd321f6868fc802e976c32ef13317c Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@users.noreply.github.com>
Date: Tue, 26 Oct 2021 14:20:35 -0500
Subject: [PATCH] Use a dynamic version for Antora

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

diff --git a/docs/antora.yml b/docs/antora.yml
index 2f9c395641..0237a48024 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -1,6 +1,5 @@
 name: ROOT
 title: Spring Security
-version: 5.6
 start_page: ROOT:index.adoc
 nav:
 - modules/ROOT/nav.adoc
diff --git a/docs/spring-security-docs.gradle b/docs/spring-security-docs.gradle
index 6c303abf28..f2a7ed55da 100644
--- a/docs/spring-security-docs.gradle
+++ b/docs/spring-security-docs.gradle
@@ -2,6 +2,12 @@ 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 {
@@ -26,7 +32,6 @@ tasks.register("generateAntora") {
 		outputFile.createNewFile()
 		outputFile.setText("""name: ROOT
 title: Spring Security
-version: 5.6
 start_page: ROOT:index.adoc
 asciidoc:
   attributes:
@@ -44,6 +49,20 @@ ${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$2')
+		outputFile.setText("$antoraVersion")
+	}
+}
+
+
+
 dependencies {
 	testImplementation platform(project(":spring-security-dependencies"))
 	testImplementation "com.unboundid:unboundid-ldapsdk"