Skip to content

Commit

Permalink
Merge branch '2.1.x' into 2.2.x
Browse files Browse the repository at this point in the history
Closes gh-22620
  • Loading branch information
wilkinsona committed Jul 28, 2020
2 parents 3212b94 + 68e2a9b commit 5ac4a8a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<extension>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<version>1.5.3</version>
<version>1.6.0</version>
</extension>
<extension>
<groupId>io.spring.ge.conventions</groupId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<version>1.5.3</version>
<version>1.6.0</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down

0 comments on commit 5ac4a8a

Please sign in to comment.