From 27294a15f811208adaca591e615c3b2b2ad8c09f Mon Sep 17 00:00:00 2001
From: Hiram Chirino <hiram@hiramchirino.com>
Date: Tue, 12 Jun 2018 15:43:25 -0500
Subject: [PATCH 1/2] Bump Spring Boot to 1.5.13

---
 app/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/pom.xml b/app/pom.xml
index b5ee0ecb934..5286bb3852d 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -61,7 +61,7 @@
     <kubernetes.client.version>2.4.1</kubernetes.client.version>
 
     <spring.version>4.3.12.RELEASE</spring.version>
-    <spring-boot.version>1.5.8.RELEASE</spring-boot.version>
+    <spring-boot.version>1.5.13.RELEASE</spring-boot.version>
 
     <swagger.version>1.5.19</swagger.version>
 

From 7338ca4733311acac0225e1582b97ae2010d4d34 Mon Sep 17 00:00:00 2001
From: Zoran Regvart <zoran@regvart.com>
Date: Wed, 13 Jun 2018 09:13:36 +0200
Subject: [PATCH 2/2] fix(build): disable errorprone name check

Our use of Lombok and Errorprone leads to an error[1] when compiling
connectors, as a workaround this disables the name check until this is
resolved in Errorprone.

Fixes #2805

[1] https://github.com/google/error-prone/issues/780
---
 app/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/pom.xml b/app/pom.xml
index 5286bb3852d..dfa73328f2d 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -514,6 +514,8 @@
 	            <arg>-XepDisableWarningsInGeneratedCode</arg>
 	            <arg>-XepExcludedPaths:.*/generated-sources/.*</arg>
 	            <arg>-implicit:none</arg>
+	            <!-- temporary disable until https://github.com/google/error-prone/issues/780 is resolved -->
+	            <arg>-Xep:ParameterName:OFF</arg>
 	          </compilerArgs>
 	        </configuration>
 	        <dependencies>