From 706a2dbe802a1aced701572fa6e335b9c7d16c46 Mon Sep 17 00:00:00 2001
From: Matt Darwin <matt.darwin@oracle.com>
Date: Thu, 2 Aug 2018 17:23:49 +0100
Subject: [PATCH 1/4] upgrading guava to 25.1, hadoop to 2.7.7, fastutil to
 8.2.1, slf4j to 1.7.25 and snappy to 1.1.7.2

---
 parquet-hadoop/pom.xml |  2 +-
 pom.xml                | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/parquet-hadoop/pom.xml b/parquet-hadoop/pom.xml
index 98972a2357..6a243be448 100644
--- a/parquet-hadoop/pom.xml
+++ b/parquet-hadoop/pom.xml
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>org.xerial.snappy</groupId>
       <artifactId>snappy-java</artifactId>
-      <version>1.1.2.6</version>
+      <version>1.1.7.2</version>
       <type>jar</type>
       <scope>compile</scope>
     </dependency>
diff --git a/pom.xml b/pom.xml
index 7b3f36fe5b..23aae9b1af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
     <jackson.version>1.9.13</jackson.version>
     <jackson.package>org.codehaus.jackson</jackson.package>
     <shade.prefix>shaded.parquet</shade.prefix>
-    <hadoop.version>2.7.3</hadoop.version>
+    <hadoop.version>2.7.7</hadoop.version>
     <hadoop1.version>1.2.1</hadoop1.version>
     <cascading.version>2.7.1</cascading.version>
     <cascading3.version>3.1.2</cascading3.version>
@@ -92,11 +92,11 @@
     <pig.classifier>h2</pig.classifier>
     <thrift-maven-plugin.version>0.10.0</thrift-maven-plugin.version>
     <thrift.version>0.9.3</thrift.version>
-    <fastutil.version>7.0.13</fastutil.version>
+    <fastutil.version>8.2.1</fastutil.version>
     <semver.api.version>0.9.33</semver.api.version>
-    <slf4j.version>1.7.22</slf4j.version>
+    <slf4j.version>1.7.25</slf4j.version>
     <avro.version>1.8.2</avro.version>
-    <guava.version>20.0</guava.version>
+    <guava.version>25.1-jre</guava.version>
     <brotli-codec.version>0.1.1</brotli-codec.version>
     <mockito.version>1.10.19</mockito.version>
 
@@ -213,13 +213,13 @@
             </execution>
           </executions>
         </plugin>
-        
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
           <version>2.7</version>
         </plugin>
-              
+
         <plugin>
           <artifactId>maven-enforcer-plugin</artifactId>
           <version>1.3.1</version>
@@ -373,7 +373,7 @@
           </execution>
         </executions-->
       </plugin>
-      
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
@@ -388,8 +388,8 @@
             <skip>true</skip>
           </configuration>
       </plugin>
-      
-            
+
+
       <plugin>
         <!-- Override source and target from the ASF parent -->
         <groupId>org.apache.maven.plugins</groupId>

From 6203fc7c7d2c9dc7b740708ff0f3373d08adef6c Mon Sep 17 00:00:00 2001
From: Matt Darwin <matt.darwin@oracle.com>
Date: Fri, 3 Aug 2018 10:49:06 +0100
Subject: [PATCH 2/4] fixed compilation error due to deprecated guava class

---
 .../main/java/org/apache/parquet/cli/util/Expressions.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 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)

From c29f5601047422c545c22557f38419324d0b24e9 Mon Sep 17 00:00:00 2001
From: Matt Darwin <matt.darwin@oracle.com>
Date: Mon, 6 Aug 2018 14:30:31 +0100
Subject: [PATCH 3/4] upgrading elephant bird /twitter from 4.4 to 4.17

---
 parquet-protobuf/pom.xml | 2 +-
 parquet-thrift/pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/parquet-protobuf/pom.xml b/parquet-protobuf/pom.xml
index b6f4627b16..07ef056ed3 100644
--- a/parquet-protobuf/pom.xml
+++ b/parquet-protobuf/pom.xml
@@ -30,7 +30,7 @@
   <packaging>jar</packaging>
 
   <properties>
-    <elephant-bird.version>4.4</elephant-bird.version>
+    <elephant-bird.version>4.17</elephant-bird.version>
     <protobuf.version>3.5.1</protobuf.version>
     <!-- allow using protoc from an alternative path -->
     <protoc.path>protoc</protoc.path>
diff --git a/parquet-thrift/pom.xml b/parquet-thrift/pom.xml
index 51a6b9b17f..e8c68d20cf 100644
--- a/parquet-thrift/pom.xml
+++ b/parquet-thrift/pom.xml
@@ -33,7 +33,7 @@
   <url>https://parquet.apache.org</url>
 
   <properties>
-    <elephant-bird.version>4.4</elephant-bird.version>
+    <elephant-bird.version>4.17</elephant-bird.version>
   </properties>
 
   <dependencies>

From 3c636bdede889da68c8d2e05b91efb4e660a0361 Mon Sep 17 00:00:00 2001
From: Matt Darwin <matt.darwin@oracle.com>
Date: Mon, 6 Aug 2018 15:04:01 +0100
Subject: [PATCH 4/4] reverting previous change

---
 parquet-protobuf/pom.xml | 2 +-
 parquet-thrift/pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/parquet-protobuf/pom.xml b/parquet-protobuf/pom.xml
index 07ef056ed3..b6f4627b16 100644
--- a/parquet-protobuf/pom.xml
+++ b/parquet-protobuf/pom.xml
@@ -30,7 +30,7 @@
   <packaging>jar</packaging>
 
   <properties>
-    <elephant-bird.version>4.17</elephant-bird.version>
+    <elephant-bird.version>4.4</elephant-bird.version>
     <protobuf.version>3.5.1</protobuf.version>
     <!-- allow using protoc from an alternative path -->
     <protoc.path>protoc</protoc.path>
diff --git a/parquet-thrift/pom.xml b/parquet-thrift/pom.xml
index e8c68d20cf..51a6b9b17f 100644
--- a/parquet-thrift/pom.xml
+++ b/parquet-thrift/pom.xml
@@ -33,7 +33,7 @@
   <url>https://parquet.apache.org</url>
 
   <properties>
-    <elephant-bird.version>4.17</elephant-bird.version>
+    <elephant-bird.version>4.4</elephant-bird.version>
   </properties>
 
   <dependencies>