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

Merge branch '2.1.x' into 2.2.x 

Closes gh-23056
This commit is contained in:
Andy Wilkinson 2020-08-24 09:22:44 +01:00
parent 17e2d72bcb 7a14477ac6
commit 947ba7081a
2 changed files with 2 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>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</extension>
<extension>
<groupId>io.spring.ge.conventions</groupId>

2
pom.xml
View File

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