root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.1.x' into 2.2.x 

Closes gh-22563
This commit is contained in:
Andy Wilkinson 2020-07-25 09:06:11 +01:00
parent 1a43cd1c8e ebfa26e3ac
commit ce7210c4f0
2 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -378,13 +378,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>

52
spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml
View File

@ -862,4 +862,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>