From 585aed8f8fc77900fbdd8d7d8e31f60d078b68a9 Mon Sep 17 00:00:00 2001
From: Nelson Osacky <nosacky@gradle.com>
Date: Fri, 24 Jul 2020 17:46:53 +0200
Subject: [PATCH 1/2] Add generated-snippets as output to test goal

The generated snippets were not declared as an output to the
`spring-boot-actuator-autoconfigure` test goal so when the test was
pulled from the cache, it did not contain the `generated-snippets`
directory. This directory is required as an input to the Asciidoctor
plugin.

See gh-22555
---
 .../pom.xml                                   | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml b/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml
index b079e67c47e..e48c86b767c 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml
@@ -734,4 +734,56 @@
 			</build>
 		</profile>
 	</profiles>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>com.gradle</groupId>
+				<artifactId>gradle-enterprise-maven-extension</artifactId>
+				<configuration>
+					<gradleEnterprise>
+						<plugins>
+							<plugin>
+								<artifactId>maven-surefire-plugin</artifactId>
+								<executions>
+									<execution>
+										<id>default-test</id>
+										<outputs>
+											<directories>
+												<directory>
+													<name>generated-snippets</name>
+													<path>${project.basedir}/target/generated-snippets</path>
+												</directory>
+											</directories>
+										</outputs>
+									</execution>
+								</executions>
+							</plugin>
+							<plugin>
+								<artifactId>asciidoctor-maven-plugin</artifactId>
+								<executions>
+									<execution>
+										<id>generate-html-documentation</id>
+										<inputs>
+											<fileSets>
+												<fileSet>
+													<name>generated-snippets</name>
+													<paths>
+														<path>${project.basedir}/target/generated-snippets</path>
+													</paths>
+													<includes>
+														<include>**/*</include>
+													</includes>
+													<normalization>RELATIVE_PATH</normalization>
+												</fileSet>
+											</fileSets>
+										</inputs>
+									</execution>
+								</executions>
+							</plugin>
+						</plugins>
+					</gradleEnterprise>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>

From d1ea5befea381982b20cc151680c1ee61dc91153 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Sat, 25 Jul 2020 08:27:05 +0100
Subject: [PATCH 2/2] Polish "Add generated-snippets as output to test goal"

See gh-22555
---
 pom.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8e0ebeddfc8..adf5416ea3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -248,13 +248,17 @@
 						</lifecycleMappingMetadata>
 					</configuration>
 				</plugin>
+				<plugin>
+					<groupId>com.gradle</groupId>
+					<artifactId>gradle-enterprise-maven-extension</artifactId>
+					<version>1.5.3</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>com.gradle</groupId>
 				<artifactId>gradle-enterprise-maven-extension</artifactId>
-				<version>1.5.3</version>
 				<configuration>
 					<gradleEnterprise>
 						<plugins>