From 0e31343b928fb5cf15aa380459e72123ccf29227 Mon Sep 17 00:00:00 2001
From: spencergibb <sgibb@pivotal.io>
Date: Fri, 4 Feb 2022 11:20:01 -0500
Subject: [PATCH 1/3] move comment

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f3ace09a..0b809cb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,8 +20,8 @@
 	<url>https://spring.io/spring-cloud</url>
 	<properties>
 		<java.version>1.8</java.version>
-		<resource.delimiter>@
-		</resource.delimiter> <!-- delimiter that doesn't clash with Spring ${} placeholders -->
+		<!-- delimiter that doesn't clash with Spring ${} placeholders -->
+		<resource.delimiter>@</resource.delimiter>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.compiler.source>${java.version}</maven.compiler.source>

From 84ecff1ac8dad8e3f8af7f25ac49a16060427ddc Mon Sep 17 00:00:00 2001
From: spencergibb <sgibb@pivotal.io>
Date: Fri, 4 Feb 2022 11:21:22 -0500
Subject: [PATCH 2/3] Updates boot version to 2.6.3

---
 pom.xml                                 | 2 +-
 spring-cloud-build-dependencies/pom.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0b809cb6..a4c855d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>2.6.1</spring-boot.version>
+		<spring-boot.version>2.6.3</spring-boot.version>
 		<spring-cloud-build.version>3.1.1-SNAPSHOT</spring-cloud-build.version>
 		<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
 		<docs.classes.dir>${project.build.directory}/build-docs-classes</docs.classes.dir>
diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml
index 84d0a69a..3fb1c49f 100644
--- a/spring-cloud-build-dependencies/pom.xml
+++ b/spring-cloud-build-dependencies/pom.xml
@@ -14,12 +14,12 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-dependencies</artifactId>
-		<version>2.6.1</version>
+		<version>2.6.3</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.6.1</spring-boot.version>
+		<spring-boot.version>2.6.3</spring-boot.version>
 		<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
 	</properties>
 	<build>

From 711fbce9ba938f788426a0ff5cd455b8eff4ab0e Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@vmware.com>
Date: Wed, 2 Feb 2022 13:58:44 -0500
Subject: [PATCH 3/3] Remove lf from NewlineAtEndOfFileCheck

Different OSs may check out files with different line separators.
So, to better support other development environments it would be great to just require any end of file, not just Linux-specific.
---
 spring-cloud-build-tools/src/main/resources/checkstyle.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/spring-cloud-build-tools/src/main/resources/checkstyle.xml b/spring-cloud-build-tools/src/main/resources/checkstyle.xml
index c3e1de40..36b37e95 100644
--- a/spring-cloud-build-tools/src/main/resources/checkstyle.xml
+++ b/spring-cloud-build-tools/src/main/resources/checkstyle.xml
@@ -20,9 +20,7 @@
 		<property name="headerFile" value="${checkstyle.header.file}"/>
 		<property name="fileExtensions" value="java,groovy"/>
 	</module>
-	<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck">
-		<property name="lineSeparator" value="lf"/>
-	</module>
+	<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck"/>
 
 	<!-- TreeWalker Checks -->
 	<module name="com.puppycrawl.tools.checkstyle.TreeWalker">