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

Merge branch '2.1.x' into 2.2.x 

Closes gh-23129
This commit is contained in:
Andy Wilkinson 2020-08-28 16:00:29 +01:00
parent 627ede8bff b6569bb075
commit e2323fd45c
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.mvn/extensions.xml
View File

@ -2,7 +2,7 @@
<extension> <extension>
<groupId>com.gradle</groupId> <groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId> <artifactId>gradle-enterprise-maven-extension</artifactId>
<version>1.6.2</version> <version>1.6.3</version>
</extension> </extension>
<extension> <extension>
<groupId>io.spring.ge.conventions</groupId> <groupId>io.spring.ge.conventions</groupId>

3
.mvn/gradle-enterprise.xml
View File

@ -6,6 +6,9 @@
</server> </server>
<buildScan> <buildScan>
<publishIfAuthenticated>true</publishIfAuthenticated> <publishIfAuthenticated>true</publishIfAuthenticated>
<obfuscation>
<ipAddresses>#{{'0.0.0.0'}}</ipAddresses>
</obfuscation>
</buildScan> </buildScan>
<buildCache> <buildCache>
<local> <local>

2
pom.xml
View File

@ -381,7 +381,7 @@
<plugin> <plugin>
<groupId>com.gradle</groupId> <groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId> <artifactId>gradle-enterprise-maven-extension</artifactId>
<version>1.6.2</version> <version>1.6.3</version>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>