From f2af42ebf27450ce1d47a33ea725d75d3b0cc25a Mon Sep 17 00:00:00 2001
From: Gabor Szadovszky <gabor@apache.org>
Date: Thu, 29 Nov 2018 11:40:04 +0100
Subject: [PATCH 1/2] PARQUET-1466: Upgrade to the latest guava 27.0-jre

---
 .../main/java/org/apache/parquet/cli/util/Expressions.java    | 4 ++--
 pom.xml                                                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/util/Expressions.java b/parquet-cli/src/main/java/org/apache/parquet/cli/util/Expressions.java
index 06b28b46ae..d18ef559f2 100644
--- a/parquet-cli/src/main/java/org/apache/parquet/cli/util/Expressions.java
+++ b/parquet-cli/src/main/java/org/apache/parquet/cli/util/Expressions.java
@@ -19,7 +19,7 @@
 
 package org.apache.parquet.cli.util;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import org.apache.avro.Schema;
@@ -385,7 +385,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-      return Objects.toStringHelper(this)
+      return MoreObjects.toStringHelper(this)
           .add("type", type)
           .add("value", value)
           .add("children", children)
diff --git a/pom.xml b/pom.xml
index 9324a1a4bc..5768e42f5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
     <semver.api.version>0.9.33</semver.api.version>
     <slf4j.version>1.7.22</slf4j.version>
     <avro.version>1.8.2</avro.version>
-    <guava.version>20.0</guava.version>
+    <guava.version>27.0-jre</guava.version>
     <brotli-codec.version>0.1.1</brotli-codec.version>
     <mockito.version>1.10.19</mockito.version>
 

From 715432432227daba7c3ce4e2d168a80fd6e2255e Mon Sep 17 00:00:00 2001
From: Gabor Szadovszky <gabor@apache.org>
Date: Mon, 14 Jan 2019 09:46:18 +0100
Subject: [PATCH 2/2] Upgrade to the most recent 27.0.1 release

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

diff --git a/pom.xml b/pom.xml
index 5768e42f5f..d1ce7dd4e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
     <semver.api.version>0.9.33</semver.api.version>
     <slf4j.version>1.7.22</slf4j.version>
     <avro.version>1.8.2</avro.version>
-    <guava.version>27.0-jre</guava.version>
+    <guava.version>27.0.1-jre</guava.version>
     <brotli-codec.version>0.1.1</brotli-codec.version>
     <mockito.version>1.10.19</mockito.version>