From dd3d8b43cd65a420e99d290f1771749fd4187d17 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Fri, 7 Jun 2019 20:55:55 -0700
Subject: [PATCH 1/2] Polish checkstyle settings

---
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1e2bffa7a2c..bcb89a6741e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,7 @@
 									<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
 									<includeTestSourceDirectory>true</includeTestSourceDirectory>
 									<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
+									<encoding>UTF-8</encoding>
 								</configuration>
 								<goals>
 									<goal>check</goal>
@@ -73,9 +74,10 @@
 									<configLocation>src/checkstyle/nohttp-checkstyle.xml</configLocation>
 									<suppressionsLocation>src/checkstyle/nohttp-checkstyle-suppressions.xml</suppressionsLocation>
 									<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
+									<encoding>UTF-8</encoding>
 									<sourceDirectories>${basedir}</sourceDirectories>
 									<includes>**/*</includes>
-									<excludes>.git/**/*,target/**/,**/.flattened-pom.xml</excludes>
+									<excludes>**/.git/**/*,**/target/**/,**/.flattened-pom.xml,**/*.class,**/spring-boot-gradle-plugin/build/**</excludes>
 								</configuration>
 								<goals>
 									<goal>check</goal>

From da1d4b8c3b379ebf7b247142f2239a0860e5ba90 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Fri, 7 Jun 2019 20:57:02 -0700
Subject: [PATCH 2/2] Run root nohttp checkstyle on CI

Closes gh-17081
---
 ci/scripts/build-project.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/scripts/build-project.sh b/ci/scripts/build-project.sh
index 08ee4e5c8da..da3c44e4723 100755
--- a/ci/scripts/build-project.sh
+++ b/ci/scripts/build-project.sh
@@ -5,5 +5,6 @@ source $(dirname $0)/common.sh
 repository=$(pwd)/distribution-repository
 
 pushd git-repo > /dev/null
+run_maven -N clean verify
 run_maven -f spring-boot-project/pom.xml clean deploy -U -Dfull -DaltDeploymentRepository=distribution::default::file://${repository}
 popd > /dev/null