arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject arrow git commit: ARROW-1243: [JAVA] update all libs to latest versions
Date Wed, 09 Aug 2017 13:10:13 GMT
Repository: arrow
Updated Branches:
  refs/heads/master a9c2f196e -> 7fdbcc606


ARROW-1243: [JAVA] update all libs to latest versions

NB this commit excludes Jackson and logback upgrades, since they are dealt with in 871 and
872

Author: Matt Darwin <(none)>
Author: Matt Darwin <matt.darwin@oracle.com>
Author: Matt <mattdarwin@yahoo.co.uk>

Closes #873 from mattdarwin/upgrade-libs and squashes the following commits:

9b51f46e [Matt Darwin] Merge branch 'master' into upgrade-libs
284a4ce3 [Matt Darwin] Merge branch 'master' of https://github.com/apache/arrow
79550b15 [Matt Darwin] rolling back lilith to 0.9.44 since 8 doesn't support java 7
c63eef64 [Matt Darwin] Merge branch 'master' into upgrade-libs
bc3b6a07 [Matt] Merge pull request #1 from apache/master
8599ba06 [Matt Darwin] backing out guava upgrade
80d81e64 [Matt Darwin] downgrading guava to 20 for java 7 compatibility
806f3489 [Matt Darwin] Merge branch 'master' into upgrade-libs
8aafb7e9 [Matt Darwin] correcting indentation in BaseValueVector
94c14698 [Matt Darwin] upgrading netty to 4.0.49
cff5596a [Matt Darwin] reverting to netty 4.0.41.Final
568737d3 [Matt Darwin] switching to Collections from Guava for empty iterator
c194e48d [Matt Darwin] upgraded hppc to 0.7.2
38be468c [Matt Darwin] upgrading libs except jackson and logback


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/7fdbcc60
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/7fdbcc60
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/7fdbcc60

Branch: refs/heads/master
Commit: 7fdbcc60693884f701b40ee74ff86f5da71976af
Parents: a9c2f19
Author: Matt Darwin <(none)>
Authored: Wed Aug 9 09:10:08 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Wed Aug 9 09:10:08 2017 -0400

----------------------------------------------------------------------
 java/memory/pom.xml                                            | 4 ++--
 java/pom.xml                                                   | 6 +++---
 java/tools/pom.xml                                             | 4 ++--
 java/vector/pom.xml                                            | 6 +++---
 .../src/main/java/org/apache/arrow/vector/BaseValueVector.java | 3 ++-
 5 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/7fdbcc60/java/memory/pom.xml
----------------------------------------------------------------------
diff --git a/java/memory/pom.xml b/java/memory/pom.xml
index 9a8d2d7..1070747 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>
 

http://git-wip-us.apache.org/repos/asf/arrow/blob/7fdbcc60/java/pom.xml
----------------------------------------------------------------------
diff --git a/java/pom.xml b/java/pom.xml
index 5702e96..b0621c5 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>
@@ -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>

http://git-wip-us.apache.org/repos/asf/arrow/blob/7fdbcc60/java/tools/pom.xml
----------------------------------------------------------------------
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index 9d067ef..8aadb44 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>

http://git-wip-us.apache.org/repos/asf/arrow/blob/7fdbcc60/java/vector/pom.xml
----------------------------------------------------------------------
diff --git a/java/vector/pom.xml b/java/vector/pom.xml
index e15ab9a..a81bbd0 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>
@@ -49,12 +49,12 @@
     <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>
       <artifactId>commons-lang3</artifactId>
-      <version>3.4</version>
+      <version>3.6</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>

http://git-wip-us.apache.org/repos/asf/arrow/blob/7fdbcc60/java/vector/src/main/java/org/apache/arrow/vector/BaseValueVector.java
----------------------------------------------------------------------
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 05d2aa9..598e578 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
@@ -18,6 +18,7 @@
 
 package org.apache.arrow.vector;
 
+import java.util.Collections;
 import java.util.Iterator;
 
 import com.google.flatbuffers.FlatBufferBuilder;
@@ -104,7 +105,7 @@ public abstract class BaseValueVector implements ValueVector {
 
   @Override
   public Iterator<ValueVector> iterator() {
-    return Iterators.emptyIterator();
+    return Collections.emptyIterator();
   }
 
   public static boolean checkBufRefs(final ValueVector vv) {


Mime
View raw message