From 8997143f3196935ecdd42f01137197ea19647690 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 24 May 2018 11:39:29 +0200
Subject: [PATCH 1/2] Fix checkstyle violations

---
 .../boot/autoconfigure/jersey/JerseyAutoConfiguration.java   | 3 ++-
 .../boot/autoconfigure/kafka/KafkaProperties.java            | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
index 414aea4da0..c219ccdf65 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
@@ -115,7 +115,8 @@ public class JerseyAutoConfiguration implements ServletContextAware {
 	private void resolveApplicationPath() {
 		if (StringUtils.hasLength(this.jersey.getApplicationPath())) {
 			this.path = parseApplicationPath(this.jersey.getApplicationPath());
-		} else {
+		}
+		else {
 			this.path = findApplicationPath(
 					AnnotationUtils.findAnnotation(this.config.getApplication().getClass(), ApplicationPath.class));
 		}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java
index 8fa779330e..1dc2b402fd 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java
@@ -153,7 +153,6 @@ public class KafkaProperties {
 	 * <p>
 	 * This allows you to add additional properties, if necessary, and override the
 	 * default kafkaConsumerFactory bean.
-	 * 
 	 * @return the consumer properties initialized with the customizations defined
 	 *         on this instance
 	 */
@@ -168,7 +167,6 @@ public class KafkaProperties {
 	 * <p>
 	 * This allows you to add additional properties, if necessary, and override the
 	 * default kafkaProducerFactory bean.
-	 * 
 	 * @return the producer properties initialized with the customizations defined
 	 *         on this instance
 	 */
@@ -181,7 +179,8 @@ public class KafkaProperties {
 	private static String resourceToPath(Resource resource) {
 		try {
 			return resource.getFile().getAbsolutePath();
-		} catch (IOException ex) {
+		}
+		catch (IOException ex) {
 			throw new IllegalStateException("Resource '" + resource + "' must be on a file system", ex);
 		}
 	}

From 625f428aade59b0543144a4434a9df512c054d54 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 24 May 2018 11:25:10 +0200
Subject: [PATCH 2/2] Upgrade to gson 2.8.5

Closes gh-13245
---
 spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 35d7eab854..47a0a94362 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -80,7 +80,7 @@
 		<glassfish-el.version>3.0.0</glassfish-el.version>
 		<gradle.version>2.9</gradle.version>
 		<groovy.version>2.4.15</groovy.version>
-		<gson.version>2.8.4</gson.version>
+		<gson.version>2.8.5</gson.version>
 		<h2.version>1.4.197</h2.version>
 		<hamcrest.version>1.3</hamcrest.version>
 		<hazelcast.version>3.7.8</hazelcast.version>