From 9761748c7cb451889d862afb910bf8919afb68dd Mon Sep 17 00:00:00 2001
From: Paul Hammant <paul@hammant.org>
Date: Wed, 31 Jan 2018 16:42:06 -0500
Subject: [PATCH] upgrade_guava

---
 modules/jooby-bom/pom.xml |  3 +--
 pom.xml                   | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml
index 7d1ed7ee44..08262f609d 100644
--- a/modules/jooby-bom/pom.xml
+++ b/modules/jooby-bom/pom.xml
@@ -23,7 +23,7 @@
   <slf4j-api.version>1.7.25</slf4j-api.version>
   <logback-classic.version>1.2.3</logback-classic.version>
   <caffeine.version>2.3.3</caffeine.version>
-  <guava.version>21.0</guava.version>
+  <guava.version>23.6-jre</guava.version>
   <guice.version>4.1.0</guice.version>
   <config.version>1.3.1</config.version>
   <handlebars.version>4.0.5</handlebars.version>
@@ -715,4 +715,3 @@
     </profile>
   </profiles>
 </project>
-
diff --git a/pom.xml b/pom.xml
index 81393c3caa..641a4a0793 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1986,15 +1986,15 @@
               <compilerArgs>
                 <arg>-parameters</arg>
               </compilerArgs>
-              <!-- eclipse compiler <debuglevel>lines,vars,source</debuglevel> <compilerId>eclipse</compilerId> 
-                <compilerArguments> <org.eclipse.jdt.core.compiler.codegen.methodParameters>generate</org.eclipse.jdt.core.compiler.codegen.methodParameters> 
-                <org.eclipse.jdt.core.compiler.debug.lineNumber>generate</org.eclipse.jdt.core.compiler.debug.lineNumber> 
-                <org.eclipse.jdt.core.compiler.debug.localVariable>generate</org.eclipse.jdt.core.compiler.debug.localVariable> 
-                <org.eclipse.jdt.core.compiler.debug.sourceFile>generate</org.eclipse.jdt.core.compiler.debug.sourceFile> 
-                <org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode>enabled</org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode> 
-                <org.eclipse.jdt.core.compiler.codegen.unusedLocal>preserve</org.eclipse.jdt.core.compiler.codegen.unusedLocal> 
-                <org.eclipse.jdt.core.compiler.compliance>1.8</org.eclipse.jdt.core.compiler.compliance> <org.eclipse.jdt.core.compiler.source>1.8</org.eclipse.jdt.core.compiler.source> 
-                <org.eclipse.jdt.core.compiler.codegen.targetPlatform>1.8</org.eclipse.jdt.core.compiler.codegen.targetPlatform> 
+              <!-- eclipse compiler <debuglevel>lines,vars,source</debuglevel> <compilerId>eclipse</compilerId>
+                <compilerArguments> <org.eclipse.jdt.core.compiler.codegen.methodParameters>generate</org.eclipse.jdt.core.compiler.codegen.methodParameters>
+                <org.eclipse.jdt.core.compiler.debug.lineNumber>generate</org.eclipse.jdt.core.compiler.debug.lineNumber>
+                <org.eclipse.jdt.core.compiler.debug.localVariable>generate</org.eclipse.jdt.core.compiler.debug.localVariable>
+                <org.eclipse.jdt.core.compiler.debug.sourceFile>generate</org.eclipse.jdt.core.compiler.debug.sourceFile>
+                <org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode>enabled</org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode>
+                <org.eclipse.jdt.core.compiler.codegen.unusedLocal>preserve</org.eclipse.jdt.core.compiler.codegen.unusedLocal>
+                <org.eclipse.jdt.core.compiler.compliance>1.8</org.eclipse.jdt.core.compiler.compliance> <org.eclipse.jdt.core.compiler.source>1.8</org.eclipse.jdt.core.compiler.source>
+                <org.eclipse.jdt.core.compiler.codegen.targetPlatform>1.8</org.eclipse.jdt.core.compiler.codegen.targetPlatform>
                 <encoding>UTF-8</encoding> </compilerArguments> -->
             </configuration>
             <dependencies>
@@ -2980,7 +2980,7 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
     <slf4j-api.version>1.7.25</slf4j-api.version>
     <logback-classic.version>1.2.3</logback-classic.version>
     <caffeine.version>2.3.3</caffeine.version>
-    <guava.version>21.0</guava.version>
+    <guava.version>23.6-jre</guava.version>
     <guice.version>4.1.0</guice.version>
     <config.version>1.3.1</config.version>
     <handlebars.version>4.0.5</handlebars.version>