From 23073d9e763616bfe54b8de67b6b558653c86bc9 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Fri, 16 Oct 2020 14:44:14 +0100
Subject: [PATCH] Make block switches work on every page of multi-page docs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There's a bug in some versions of AsciidoctorJ where extensions are
only called on this first conversion performed by a given Asciidoctor
instance. This affects the multi-page documentation where there are
multiple conversions performed – one for each page in the
documentation.

This commit upgrades the version of AsciidoctorJ used by the
Asciidoctor Gradle plugin to 2.4.1, which contains fix for the problem.

Closes gh-23709
---
 .../boot/build/AsciidoctorConventions.java                | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java
index af35a595f5f..b598b6be97e 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java
@@ -46,6 +46,7 @@ import org.springframework.util.StringUtils;
  *
  * <ul>
  * <li>All warnings are made fatal.
+ * <li>The version of AsciidoctorJ is upgraded to 2.4.1.
  * <li>A task is created to resolve and unzip our documentation resources (CSS and
  * Javascript).
  * <li>For each {@link AsciidoctorTask} (HTML only):
@@ -69,10 +70,13 @@ import org.springframework.util.StringUtils;
  */
 class AsciidoctorConventions {
 
+	private static final String ASCIIDOCTORJ_VERSION = "2.4.1";
+
 	void apply(Project project) {
 		project.getPlugins().withType(AsciidoctorJPlugin.class, (asciidoctorPlugin) -> {
 			configureDocResourcesRepository(project);
 			makeAllWarningsFatal(project);
+			upgradeAsciidoctorJVersion(project);
 			UnzipDocumentationResources unzipResources = createUnzipDocumentationResourcesTask(project);
 			project.getTasks().withType(AbstractAsciidoctorTask.class, (asciidoctorTask) -> {
 				configureCommonAttributes(project, asciidoctorTask);
@@ -110,6 +114,10 @@ class AsciidoctorConventions {
 		project.getExtensions().getByType(AsciidoctorJExtension.class).fatalWarnings(".*");
 	}
 
+	private void upgradeAsciidoctorJVersion(Project project) {
+		project.getExtensions().getByType(AsciidoctorJExtension.class).setVersion(ASCIIDOCTORJ_VERSION);
+	}
+
 	private UnzipDocumentationResources createUnzipDocumentationResourcesTask(Project project) {
 		Configuration documentationResources = project.getConfigurations().maybeCreate("documentationResources");
 		documentationResources.getDependencies()