Merge branch '2.2.x'

Closes gh-19800
5 years ago · c5e47c725c
parent fabd692812 b44442ee3c
commit c5e47c725c
3 changed files with 1 additions and 3 deletions
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@ -7,7 +7,6 @@ plugins {
 repositories {
 	mavenCentral()
 	gradlePluginPortal()
 	maven { url 'https://repo.spring.io/snapshot' }
 	maven { url 'https://repo.spring.io/release' }
 }
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@ -1 +1 @@
-javaFormatVersion=0.0.19-SNAPSHOT
+javaFormatVersion=0.0.19
--- a/buildSrc/settings.gradle
+++ b/buildSrc/settings.gradle
@ -2,7 +2,6 @@ pluginManagement {
 	repositories {
 		mavenCentral()
 		gradlePluginPortal()
 		maven { url 'https://repo.spring.io/snapshot' }
 	}
 	resolutionStrategy {
 		eachPlugin {
		`@ -1 +1 @@`
			`javaFormatVersion=0.0.19-SNAPSHOT`				`javaFormatVersion=0.0.19`