From 942e3dd13254ca55915ae9473aa524c2ee2e86ff Mon Sep 17 00:00:00 2001 From: Mike Smithson Date: Wed, 1 Apr 2020 23:25:09 -0400 Subject: [PATCH 1/2] Add instruction to format code in buildSrc See gh-20806 --- CONTRIBUTING.adoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 2a826b7895..1e9767ee2c 100755 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -53,6 +53,8 @@ added after the original pull request but before a merge. https://github.com/spring-io/spring-javaformat/#intellij-idea[Spring JavaFormat IntelliJ Plugin] or format the code from the Gradle build by running `./gradlew format`. +* If you want to format the buildSrc module, you can format the code + by running `./gradlew -p buildSrc format` from the project root directory. * The build includes checkstyle rules for many of our code conventions. Run `./gradlew checkstyleMain checkstyleTest` if you want to check you changes are compliant. From 06ce3e0d4d9d74f6947d99f6921d46143d02e317 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 25 Apr 2020 09:38:51 +0200 Subject: [PATCH 2/2] Polish "Add instruction to format code in buildSrc" See gh-20806 --- CONTRIBUTING.adoc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 1e9767ee2c..5ca6c4c047 100755 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -52,9 +52,8 @@ added after the original pull request but before a merge. automatically. You can also install the https://github.com/spring-io/spring-javaformat/#intellij-idea[Spring JavaFormat IntelliJ Plugin] or format the code from the Gradle build by running - `./gradlew format`. -* If you want to format the buildSrc module, you can format the code - by running `./gradlew -p buildSrc format` from the project root directory. + `./gradlew format`. Note that if you have format violations in `buildSrc`, you can fix + them by running `./gradlew -p buildSrc format` from the project root directory. * The build includes checkstyle rules for many of our code conventions. Run `./gradlew checkstyleMain checkstyleTest` if you want to check you changes are compliant.