From 7713a7f33a68d38c9df3667af98b8534202d5c63 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Sat, 25 May 2019 09:15:50 +0100
Subject: [PATCH] Fix inclusion of Gradle DSL snippets in plugin reference docs

Closes gh-16968
---
 .../spring-boot-gradle-plugin/pom.xml         | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

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 a43f9b423d8..050f728fbf8 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
@@ -53,7 +53,7 @@
 						<configuration>
 							<url>https://repo.spring.io/release/io/spring/docresources/spring-doc-resources/${spring-doc-resources.version}/spring-doc-resources-${spring-doc-resources.version}.zip</url>
 							<unpack>true</unpack>
-							<outputDirectory>${refdocs.build.directory}</outputDirectory>
+							<outputDirectory>${refdocs.build.directory}/asciidoc</outputDirectory>
 						</configuration>
 					</execution>
 				</executions>
@@ -99,7 +99,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${refdocs.build.directory}</outputDirectory>
+							<outputDirectory>${refdocs.build.directory}/asciidoc</outputDirectory>
 							<resources>
 								<resource>
 									<directory>src/main/asciidoc</directory>
@@ -108,6 +108,22 @@
 							</resources>
 						</configuration>
 					</execution>
+					<execution>
+						<id>copy-gradle-resources</id>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${refdocs.build.directory}/gradle</outputDirectory>
+							<resources>
+								<resource>
+									<directory>src/main/gradle</directory>
+									<filtering>false</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>
@@ -315,6 +331,12 @@
 										<stylesdir>css/</stylesdir>
 										<stylesheet>style.css</stylesheet>
 									</attributes>
+									<logHandler>
+										<outputToConsole>true</outputToConsole>
+										<failIf>
+											<severity>DEBUG</severity>
+										</failIf>
+									</logHandler>
 								</configuration>
 							</execution>
 							<execution>
@@ -330,7 +352,7 @@
 							</execution>
 						</executions>
 						<configuration>
-							<sourceDirectory>${refdocs.build.directory}</sourceDirectory>
+							<sourceDirectory>${refdocs.build.directory}/asciidoc</sourceDirectory>
 							<sourceDocumentName>index.adoc</sourceDocumentName>
 							<attributes>
 								<github-tag>${github-tag}</github-tag>