From b0fffbe42ef60924dc63307baadfaee984875894 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Fri, 28 Jun 2019 11:55:58 -0700
Subject: [PATCH 1/2] Upgrade to spring-javaformat 0.0.15

Closes gh-17359
---
 spring-boot-parent/pom.xml  | 2 +-
 spring-boot-samples/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml
index 80dcf24eaaf..61b5e116c67 100644
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@@ -24,7 +24,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.version>3.1.1</maven.version>
-		<spring-javaformat.version>0.0.14</spring-javaformat.version>
+		<spring-javaformat.version>0.0.15</spring-javaformat.version>
 		<nohttp-checkstyle.version>0.0.1.RELEASE</nohttp-checkstyle.version>
 	</properties>
 	<scm>
diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml
index 0f12c415725..e238a4bc42d 100644
--- a/spring-boot-samples/pom.xml
+++ b/spring-boot-samples/pom.xml
@@ -19,7 +19,7 @@
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
 		<java.version>1.8</java.version>
-		<spring-javaformat.version>0.0.14</spring-javaformat.version>
+		<spring-javaformat.version>0.0.15</spring-javaformat.version>
 		<nohttp-checkstyle.version>0.0.1.RELEASE</nohttp-checkstyle.version>
 		<disable.checks>false</disable.checks>
 	</properties>

From 9433ad2222ffd72d6cdb94c7362f8a57dfc04e1f Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Fri, 28 Jun 2019 21:15:01 -0700
Subject: [PATCH 2/2] Ignore SpringMethodVisibility check

Ignore the new `SpringMethodVisibility` on released versions since
the required changes can introduce subtle bugs.

See gh-17359
---
 spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml b/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
index 64f1fde5201..d2deda4063c 100644
--- a/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
+++ b/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
@@ -4,6 +4,7 @@
 	"https://checkstyle.org/dtds/suppressions_1_2.dtd">
 <suppressions>
 	<suppress files="[\\/]target[\\/]" checks=".*" />
+	<suppress files=".*" checks="SpringMethodVisibility"/>
 	<suppress files="SpringApplicationTests\.java" checks="FinalClass" />
 	<suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor" />
 	<suppress files=".+Application\.java" checks="HideUtilityClassConstructor" />