From df386be4f12a5d03c3913e7bc87c9d2d8438ba8e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 14 Jan 2020 17:39:31 +0000 Subject: [PATCH] Use a consistent version of spring-javaformat See gh-19710 --- buildSrc/build.gradle | 7 ++++--- buildSrc/gradle.properties | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 buildSrc/gradle.properties diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 5550193fc7..ea576e92c6 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -1,12 +1,13 @@ plugins { id 'java-gradle-plugin' - id 'io.spring.javaformat' version '0.0.19-SNAPSHOT' + id 'io.spring.javaformat' version "$javaFormatVersion" id 'checkstyle' } repositories { mavenCentral() gradlePluginPortal() + maven { url 'https://repo.spring.io/snapshot' } maven { url 'https://repo.spring.io/release' } } @@ -14,7 +15,7 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 dependencies { - checkstyle 'io.spring.javaformat:spring-javaformat-checkstyle:0.0.15' + checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:$javaFormatVersion" implementation 'com.fasterxml.jackson.core:jackson-databind:2.10.0' implementation 'commons-codec:commons-codec:1.13' implementation 'org.apache.maven:maven-embedder:3.6.2' @@ -22,7 +23,7 @@ dependencies { implementation 'org.springframework:spring-core:5.2.2.RELEASE' implementation 'org.springframework:spring-web:5.2.2.RELEASE' implementation 'com.google.code.gson:gson:2.8.5' - implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.15' + implementation "io.spring.javaformat:spring-javaformat-gradle-plugin:$javaFormatVersion" testImplementation 'org.assertj:assertj-core:3.11.1' testImplementation 'org.apache.logging.log4j:log4j-core:2.12.1' testImplementation 'org.junit.jupiter:junit-jupiter:5.5.2' diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties new file mode 100644 index 0000000000..b4f9e946f8 --- /dev/null +++ b/buildSrc/gradle.properties @@ -0,0 +1 @@ +javaFormatVersion=0.0.19-SNAPSHOT \ No newline at end of file