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-23416
This commit is contained in:
Andy Wilkinson 2020-09-20 16:58:40 +01:00
parent 95f26c6358 4ed7febc47
commit a8c179e922
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> <extension>
<groupId>com.gradle</groupId> <groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId> <artifactId>gradle-enterprise-maven-extension</artifactId>
<version>1.6.3</version> <version>1.6.6</version>
</extension> </extension>
<extension> <extension>
<groupId>io.spring.ge.conventions</groupId> <groupId>io.spring.ge.conventions</groupId>

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.3</version> <version>1.6.6</version>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>