Merge branch '1.2.x' into 1.3.x

Author: jgrandja

.gitignore

@@ -38,3 +38,5 @@ out/
 ### Mac ###
 .DS_Store
 cached-antora-playbook.yml
+
+node_modules

docs/antora-playbook.yml

@@ -0,0 +1,38 @@
+antora:
+  extensions:
+  - require: '@springio/antora-extensions'
+    root_component_name: 'authorization-server'
+site:
+  title: Spring Authorization Server
+  url: https://docs.spring.io/spring-authorization-server/reference
+  robots: allow
+git:
+  ensure_git_suffix: false
+content:
+  sources:
+  - url: https://github.com/spring-projects/spring-authorization-server
+    branches: [main,'{1..9}.+({0..9}).x','!(1.{0..1}.x)']
+    tags: ['{1..9}.+({0..9}).+({0..9})?(-{RC,M}*)','!(1.{0..1}.+({0..9})?(-{RC,M}*))']
+    start_path: docs
+asciidoc:
+  attributes:
+    page-stackoverflow-url: https://stackoverflow.com/tags/spring-authorization-server
+    page-related-doc-categories: security
+    page-related-doc-projects: framework
+    page-pagination: ''
+    hide-uri-scheme: '@'
+    tabs-sync-option: '@'
+  extensions:
+  - '@asciidoctor/tabs'
+  - '@springio/asciidoctor-extensions'
+urls:
+  latest_version_segment_strategy: redirect:to
+  latest_version_segment: ''
+  redirect_facility: httpd
+ui:
+  bundle:
+    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.16/ui-bundle.zip
+    snapshot: true
+runtime:
+  log:
+    failure_level: warn

docs/package.json

@@ -0,0 +1,10 @@
+{
+  "dependencies": {
+    "antora": "3.2.0-alpha.6",
+    "@antora/atlas-extension": "1.0.0-alpha.2",
+    "@antora/collector-extension": "1.0.0-beta.2",
+    "@asciidoctor/tabs": "1.0.0-beta.6",
+    "@springio/antora-extensions": "1.14.2",
+    "@springio/asciidoctor-extensions": "1.0.0-alpha.13"
+  }
+}

docs/spring-authorization-server-docs.gradle

@@ -13,14 +13,11 @@ java {
 }
 
 antora {
-	playbook = "cached-antora-playbook.yml"
-	playbookProvider {
-		repository = "spring-projects/spring-authorization-server"
-		branch = "docs-build"
-		path = "lib/antora/templates/per-branch-antora-playbook.yml"
-		checkLocalBranch = true
-	}
 	options = [clean: true, fetch: !project.gradle.startParameter.offline, stacktrace: true]
+	environment = [
+		'BUILD_REFNAME': 'HEAD',
+		'BUILD_VERSION': project.version,
+	]
 }
 
 tasks.named("generateAntoraYml") {