Merge branch '5.7.x' into 5.8.x

Steve Riesenberg · Steve Riesenberg · commit 87c074fc26f0 · 2022-11-23T17:14:56.000-06:00
diff --git a/docs/antora-linked-worktree-patch.js b/docs/antora-linked-worktree-patch.js
diff --git a/docs/local-antora-playbook.yml b/docs/local-antora-playbook.yml
@@ -1,7 +1,6 @@
 # The purpose of this Antora playbook is to generate a preview of the docs in the current branch.
 antora:
   extensions:
-  - ./antora-linked-worktree-patch.js
   - '@antora/collector-extension'
 site:
   title: Spring Security
diff --git a/docs/spring-security-docs.gradle b/docs/spring-security-docs.gradle
@@ -6,7 +6,7 @@ apply plugin: 'io.spring.convention.docs'
 apply plugin: 'java'
 
 antora {
-	version = '~3.1'
+	version = '3.2.0-alpha.2'
 	playbook = file('local-antora-playbook.yml')
 	options = ['--clean', '--stacktrace']
 	environment = [
@@ -15,7 +15,7 @@ antora {
 		'ALGOLIA_INDEX_NAME': 'security-docs'
 	]
 	dependencies = [
-		'@antora/collector-extension': '1.0.0-alpha.2'
+		'@antora/collector-extension': '1.0.0-alpha.3'
 	]
 }
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ apply plugin: 'io.spring.convention.docs'`
`6`	`6`	`apply plugin: 'java'`
`7`	`7`
`8`	`8`	`antora {`
`9`		`- version = '~3.1'`
	`9`	`+ version = '3.2.0-alpha.2'`
`10`	`10`	`playbook = file('local-antora-playbook.yml')`
`11`	`11`	`options = ['--clean', '--stacktrace']`
`12`	`12`	`environment = [`
`@@ -15,7 +15,7 @@ antora {`
`15`	`15`	`'ALGOLIA_INDEX_NAME': 'security-docs'`
`16`	`16`	`]`
`17`	`17`	`dependencies = [`
`18`		`- '@antora/collector-extension': '1.0.0-alpha.2'`
	`18`	`+ '@antora/collector-extension': '1.0.0-alpha.3'`
`19`	`19`	`]`
`20`	`20`	`}`
`21`	`21`