From 38be468c0a9801e217db9b3dcf670d6834c1a90b Mon Sep 17 00:00:00 2001
From: Matt Darwin <matt.darwin@oracle.com>
Date: Thu, 20 Jul 2017 15:11:10 +0100
Subject: [PATCH 1/9] upgrading libs except jackson and logback

---
 java/memory/pom.xml |  4 ++--
 java/pom.xml        | 14 +++++++-------
 java/tools/pom.xml  |  4 ++--
 java/vector/pom.xml |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/java/memory/pom.xml b/java/memory/pom.xml
index dc4d0daf93d..112f4d68b30 100644
--- a/java/memory/pom.xml
+++ b/java/memory/pom.xml
@@ -23,13 +23,13 @@
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
-      <version>3.0.1</version>
+      <version>3.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>com.carrotsearch</groupId>
       <artifactId>hppc</artifactId>
-      <version>0.7.1</version>
+      <version>0.7.2</version>
     </dependency>
   </dependencies>
 
diff --git a/java/pom.xml b/java/pom.xml
index 1ec3d561121..473d302e914 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -30,11 +30,11 @@
   <properties>
     <target.gen.source.path>${project.basedir}/target/generated-sources</target.gen.source.path>
     <dep.junit.version>4.11</dep.junit.version>
-    <dep.slf4j.version>1.7.6</dep.slf4j.version>
-    <dep.guava.version>18.0</dep.guava.version>
+    <dep.slf4j.version>1.7.25</dep.slf4j.version>
+    <dep.guava.version>22.0</dep.guava.version>
     <forkCount>2</forkCount>
     <jackson.version>2.7.1</jackson.version>
-    <hadoop.version>2.7.1</hadoop.version>
+    <!--<hadoop.version>2.7.1</hadoop.version>-->
     <checkstyle.failOnViolation>false</checkstyle.failOnViolation>
   </properties>
 
@@ -454,7 +454,7 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-handler</artifactId>
-      <version>4.0.41.Final</version>
+      <version>4.1.13.Final</version>
     </dependency>
 
     <dependency>
@@ -495,7 +495,7 @@
       <!-- JMockit needs to be on class path before JUnit. -->
       <groupId>com.googlecode.jmockit</groupId>
       <artifactId>jmockit</artifactId>
-      <version>1.3</version>
+      <version>1.7</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -507,7 +507,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>1.9.5</version>
+      <version>2.7.22</version>
       <scope>test</scope>
       <!-- Mockito  contains old Hamcrest classes, causes issues with JUNIT -->
       <exclusions>
@@ -526,7 +526,7 @@
     <dependency>
       <groupId>de.huxhorn.lilith</groupId>
       <artifactId>de.huxhorn.lilith.logback.appender.multiplex-classic</artifactId>
-      <version>0.9.44</version>
+      <version>8.1.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index 53331f2f245..c06828da7ca 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -38,12 +38,12 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.4</version>
+            <version>3.6</version>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
-            <version>1.2</version>
+            <version>1.4</version>
         </dependency>
         <dependency>
           <groupId>ch.qos.logback</groupId>
diff --git a/java/vector/pom.xml b/java/vector/pom.xml
index a117a2fb3b7..ae027934249 100644
--- a/java/vector/pom.xml
+++ b/java/vector/pom.xml
@@ -34,7 +34,7 @@
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>2.9</version>
+      <version>2.9.9</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.4</version>
+      <version>3.6</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>

From c194e48d49574827b744a8d378ee1f5829cf5342 Mon Sep 17 00:00:00 2001
From: Matt Darwin <matt.darwin@oracle.com>
Date: Thu, 20 Jul 2017 15:13:28 +0100
Subject: [PATCH 2/9] upgraded hppc to 0.7.2

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

diff --git a/java/vector/pom.xml b/java/vector/pom.xml
index ae027934249..be74c2e1245 100644
--- a/java/vector/pom.xml
+++ b/java/vector/pom.xml
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>com.carrotsearch</groupId>
       <artifactId>hppc</artifactId>
-      <version>0.7.1</version>
+      <version>0.7.2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

From 568737d384604476cb0a4f7303ec657f71a59bbf Mon Sep 17 00:00:00 2001
From: Matt Darwin <matt.darwin@oracle.com>
Date: Thu, 20 Jul 2017 15:22:32 +0100
Subject: [PATCH 3/9] switching to Collections from Guava for empty iterator

---
 .../main/java/org/apache/arrow/vector/BaseValueVector.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseValueVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseValueVector.java
index 2a61403c0dc..72d54d801a1 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/BaseValueVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseValueVector.java
@@ -17,6 +17,7 @@
  */
 package org.apache.arrow.vector;
 
+import java.util.Collections;
 import java.util.Iterator;
 
 import com.google.flatbuffers.FlatBufferBuilder;
@@ -98,9 +99,7 @@ public void reset() {}
   }
 
   @Override
-  public Iterator<ValueVector> iterator() {
-    return Iterators.emptyIterator();
-  }
+  public Iterator<ValueVector> iterator() {  return Collections.emptyIterator();  }
 
   public static boolean checkBufRefs(final ValueVector vv) {
     for(final ArrowBuf buffer : vv.getBuffers(false)) {

From cff5596aa5f7b77ab17f20b1d9b92c28bc3df79f Mon Sep 17 00:00:00 2001
From: Matt Darwin <matt.darwin@oracle.com>
Date: Thu, 20 Jul 2017 15:22:50 +0100
Subject: [PATCH 4/9] reverting to netty 4.0.41.Final

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

diff --git a/java/pom.xml b/java/pom.xml
index 473d302e914..36731049fb9 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -454,7 +454,7 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-handler</artifactId>
-      <version>4.1.13.Final</version>
+      <version>4.0.41.Final</version>
     </dependency>
 
     <dependency>

From 94c14698ca4bbe40c95371378048b1883e1b5ea9 Mon Sep 17 00:00:00 2001
From: Matt Darwin <matt.darwin@oracle.com>
Date: Thu, 20 Jul 2017 15:25:11 +0100
Subject: [PATCH 5/9] upgrading netty to 4.0.49

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

diff --git a/java/pom.xml b/java/pom.xml
index 36731049fb9..81e5437aa37 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -454,7 +454,7 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-handler</artifactId>
-      <version>4.0.41.Final</version>
+      <version>4.0.49.Final</version>
     </dependency>
 
     <dependency>

From 8aafb7e9c488b30b93f1875015afd118302b1884 Mon Sep 17 00:00:00 2001
From: Matt Darwin <matt.darwin@oracle.com>
Date: Thu, 20 Jul 2017 15:28:55 +0100
Subject: [PATCH 6/9] correcting indentation in BaseValueVector

---
 .../main/java/org/apache/arrow/vector/BaseValueVector.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseValueVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseValueVector.java
index 72d54d801a1..6a75e6d6b9a 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/BaseValueVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseValueVector.java
@@ -99,7 +99,9 @@ public void reset() {}
   }
 
   @Override
-  public Iterator<ValueVector> iterator() {  return Collections.emptyIterator();  }
+  public Iterator<ValueVector> iterator() {
+    return Collections.emptyIterator();
+  }
 
   public static boolean checkBufRefs(final ValueVector vv) {
     for(final ArrowBuf buffer : vv.getBuffers(false)) {

From 80d81e64a909a41c46fb62f2b23f713269a646d4 Mon Sep 17 00:00:00 2001
From: Matt Darwin <(none)>
Date: Mon, 24 Jul 2017 14:50:47 +0100
Subject: [PATCH 7/9] downgrading guava to 20 for java 7 compatibility

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

diff --git a/java/pom.xml b/java/pom.xml
index 9fac7ba01e0..ecf7678bd76 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -31,7 +31,7 @@
     <target.gen.source.path>${project.basedir}/target/generated-sources</target.gen.source.path>
     <dep.junit.version>4.11</dep.junit.version>
     <dep.slf4j.version>1.7.25</dep.slf4j.version>
-    <dep.guava.version>22.0</dep.guava.version>
+    <dep.guava.version>20.0</dep.guava.version>
     <forkCount>2</forkCount>
     <jackson.version>2.7.1</jackson.version>
     <!--<hadoop.version>2.7.1</hadoop.version>-->

From 8599ba069ab0a39f9f27269b8af0d8c8d37fc9b6 Mon Sep 17 00:00:00 2001
From: Matt Darwin <(none)>
Date: Tue, 1 Aug 2017 15:34:57 +0100
Subject: [PATCH 8/9] backing out guava upgrade

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

diff --git a/java/pom.xml b/java/pom.xml
index ecf7678bd76..5958b541bc5 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -31,7 +31,7 @@
     <target.gen.source.path>${project.basedir}/target/generated-sources</target.gen.source.path>
     <dep.junit.version>4.11</dep.junit.version>
     <dep.slf4j.version>1.7.25</dep.slf4j.version>
-    <dep.guava.version>20.0</dep.guava.version>
+    <dep.guava.version>18.0</dep.guava.version>
     <forkCount>2</forkCount>
     <jackson.version>2.7.1</jackson.version>
     <!--<hadoop.version>2.7.1</hadoop.version>-->

From 79550b15a5c8db0e391f0d1f5be5ce4e4de717f0 Mon Sep 17 00:00:00 2001
From: Matt Darwin <(none)>
Date: Tue, 8 Aug 2017 20:24:15 +0100
Subject: [PATCH 9/9] rolling back lilith to 0.9.44 since 8 doesn't support
 java 7

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

diff --git a/java/pom.xml b/java/pom.xml
index 8e952a877a8..14834c69867 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -526,7 +526,7 @@
     <dependency>
       <groupId>de.huxhorn.lilith</groupId>
       <artifactId>de.huxhorn.lilith.logback.appender.multiplex-classic</artifactId>
-      <version>8.1.1</version>
+      <version>0.9.44</version>
       <scope>test</scope>
     </dependency>