Merge branch '6.0.x'

3 years ago · a9fa813a75
2 changed files with 5 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@ -50,5 +50,3 @@ atlassian-ide-plugin.xml
				@@ -50,5 +50,3 @@ atlassian-ide-plugin.xml

 # VS Code
 .vscode/
-
-cached-antora-playbook.yml
--- a/framework-docs/framework-docs.gradle
+++ b/framework-docs/framework-docs.gradle
@ -45,9 +45,11 @@ tasks.create("generateAntoraResources") {
				@@ -45,9 +45,11 @@ tasks.create("generateAntoraResources") {
 	dependsOn 'generateAntoraYml'
 }

-tasks.named("check") {
-	dependsOn 'antora'
-}
+// Commented out for now:
+// https://github.com/spring-projects/spring-framework/issues/30481
+// tasks.named("check") {
+//	dependsOn 'antora'
+// }

 jar {
 	enabled = false