Skip to content

S
spring-boot
Commit ce7210c4 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '2.1.x' into 2.2.x 

Closes gh-22563
parents 1a43cd1c ebfa26e3
Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 1 deletion
pom.xml
View file @ ce7210c4
...@@ -378,13 +378,17 @@ ...@@ -378,13 +378,17 @@
</lifecycleMappingMetadata> </lifecycleMappingMetadata>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<version>1.5.3</version>
</plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>com.gradle</groupId> <groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId> <artifactId>gradle-enterprise-maven-extension</artifactId>
<version>1.5.3</version>
<configuration> <configuration>
<gradleEnterprise> <gradleEnterprise>
<plugins> <plugins>
......
spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml
View file @ ce7210c4
...@@ -862,4 +862,56 @@ ...@@ -862,4 +862,56 @@
</build> </build>
</profile> </profile>
</profiles> </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> </project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment