Skip to content

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

Merge branch '2.1.x' into 2.2.x 

Closes gh-23129
parents 627ede8b b6569bb0
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
.mvn/extensions.xml
View file @ e2323fd4
...@@ -2,7 +2,7 @@ ...@@ -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>
......
.mvn/gradle-enterprise.xml
View file @ e2323fd4
...@@ -6,6 +6,9 @@ ...@@ -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>
......
pom.xml
View file @ e2323fd4
...@@ -381,7 +381,7 @@ ...@@ -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>
......
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