From d5fc3245379b9b1ab88e1964acdff8efef04651a Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Fri, 20 Sep 2019 11:57:36 +0100
Subject: [PATCH] Upgrade to Asciidoctor Maven Plugin 1.6.0

Closes gh-17234
---
 .../spring-boot-actuator-autoconfigure/pom.xml           | 2 +-
 spring-boot-project/spring-boot-parent/pom.xml           | 9 ++-------
 .../spring-boot-tools/spring-boot-gradle-plugin/pom.xml  | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml b/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml
index ada47616650..bc4232b2998 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml
@@ -799,7 +799,7 @@
 							<dependency>
 								<groupId>org.asciidoctor</groupId>
 								<artifactId>asciidoctorj-pdf</artifactId>
-								<version>1.5.0-alpha.11</version>
+								<version>1.5.0-alpha.18</version>
 							</dependency>
 						</dependencies>
 					</plugin>
diff --git a/spring-boot-project/spring-boot-parent/pom.xml b/spring-boot-project/spring-boot-parent/pom.xml
index 76fbc4631ec..de27e968f58 100644
--- a/spring-boot-project/spring-boot-parent/pom.xml
+++ b/spring-boot-project/spring-boot-parent/pom.xml
@@ -293,17 +293,12 @@
 				<plugin>
 					<groupId>org.asciidoctor</groupId>
 					<artifactId>asciidoctor-maven-plugin</artifactId>
-					<version>1.5.7.1</version>
+					<version>1.6.0</version>
 					<dependencies>
-						<dependency>
-							<groupId>org.asciidoctor</groupId>
-							<artifactId>asciidoctorj</artifactId>
-							<version>1.5.8</version>
-						</dependency>
 						<dependency>
 							<groupId>org.asciidoctor</groupId>
 							<artifactId>asciidoctorj-pdf</artifactId>
-							<version>1.5.0-alpha.11</version>
+							<version>1.5.0-alpha.18</version>
 						</dependency>
 					</dependencies>
 				</plugin>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml
index 3e9f7388fa8..80c84688093 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml
@@ -360,7 +360,7 @@
 							<dependency>
 								<groupId>io.spring.asciidoctor</groupId>
 								<artifactId>spring-asciidoctor-extensions</artifactId>
-								<version>0.1.3.RELEASE</version>
+								<version>0.2.0.RELEASE</version>
 							</dependency>
 						</dependencies>
 					</plugin>