Skip to content

Commit 93997f6

Browse files
Matt Darwinkou
authored andcommitted
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 apache#873 from mattdarwin/upgrade-libs and squashes the following commits: 9b51f46 [Matt Darwin] Merge branch 'master' into upgrade-libs 284a4ce [Matt Darwin] Merge branch 'master' of https://github.com/apache/arrow 79550b1 [Matt Darwin] rolling back lilith to 0.9.44 since 8 doesn't support java 7 c63eef6 [Matt Darwin] Merge branch 'master' into upgrade-libs bc3b6a0 [Matt] Merge pull request #1 from apache/master 8599ba0 [Matt Darwin] backing out guava upgrade 80d81e6 [Matt Darwin] downgrading guava to 20 for java 7 compatibility 806f348 [Matt Darwin] Merge branch 'master' into upgrade-libs 8aafb7e [Matt Darwin] correcting indentation in BaseValueVector 94c1469 [Matt Darwin] upgrading netty to 4.0.49 cff5596 [Matt Darwin] reverting to netty 4.0.41.Final 568737d [Matt Darwin] switching to Collections from Guava for empty iterator c194e48 [Matt Darwin] upgraded hppc to 0.7.2 38be468 [Matt Darwin] upgrading libs except jackson and logback
1 parent 6a21b93 commit 93997f6

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

memory/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
<dependency>
2424
<groupId>com.google.code.findbugs</groupId>
2525
<artifactId>jsr305</artifactId>
26-
<version>3.0.1</version>
26+
<version>3.0.2</version>
2727
</dependency>
2828

2929
<dependency>
3030
<groupId>com.carrotsearch</groupId>
3131
<artifactId>hppc</artifactId>
32-
<version>0.7.1</version>
32+
<version>0.7.2</version>
3333
</dependency>
3434
</dependencies>
3535

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@
454454
<dependency>
455455
<groupId>io.netty</groupId>
456456
<artifactId>netty-handler</artifactId>
457-
<version>4.0.41.Final</version>
457+
<version>4.0.49.Final</version>
458458
</dependency>
459459

460460
<dependency>
@@ -495,7 +495,7 @@
495495
<!-- JMockit needs to be on class path before JUnit. -->
496496
<groupId>com.googlecode.jmockit</groupId>
497497
<artifactId>jmockit</artifactId>
498-
<version>1.3</version>
498+
<version>1.7</version>
499499
<scope>test</scope>
500500
</dependency>
501501
<dependency>
@@ -507,7 +507,7 @@
507507
<dependency>
508508
<groupId>org.mockito</groupId>
509509
<artifactId>mockito-core</artifactId>
510-
<version>1.9.5</version>
510+
<version>2.7.22</version>
511511
<scope>test</scope>
512512
<!-- Mockito contains old Hamcrest classes, causes issues with JUNIT -->
513513
<exclusions>

tools/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@
3838
<dependency>
3939
<groupId>org.apache.commons</groupId>
4040
<artifactId>commons-lang3</artifactId>
41-
<version>3.4</version>
41+
<version>3.6</version>
4242
</dependency>
4343
<dependency>
4444
<groupId>commons-cli</groupId>
4545
<artifactId>commons-cli</artifactId>
46-
<version>1.2</version>
46+
<version>1.4</version>
4747
</dependency>
4848
<dependency>
4949
<groupId>ch.qos.logback</groupId>

vector/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>joda-time</groupId>
3636
<artifactId>joda-time</artifactId>
37-
<version>2.9</version>
37+
<version>2.9.9</version>
3838
</dependency>
3939
<dependency>
4040
<groupId>com.fasterxml.jackson.core</groupId>
@@ -49,12 +49,12 @@
4949
<dependency>
5050
<groupId>com.carrotsearch</groupId>
5151
<artifactId>hppc</artifactId>
52-
<version>0.7.1</version>
52+
<version>0.7.2</version>
5353
</dependency>
5454
<dependency>
5555
<groupId>org.apache.commons</groupId>
5656
<artifactId>commons-lang3</artifactId>
57-
<version>3.4</version>
57+
<version>3.6</version>
5858
</dependency>
5959
<dependency>
6060
<groupId>commons-codec</groupId>

vector/src/main/java/org/apache/arrow/vector/BaseValueVector.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.apache.arrow.vector;
2020

21+
import java.util.Collections;
2122
import java.util.Iterator;
2223

2324
import com.google.flatbuffers.FlatBufferBuilder;
@@ -104,7 +105,7 @@ public void reset() {
104105

105106
@Override
106107
public Iterator<ValueVector> iterator() {
107-
return Iterators.emptyIterator();
108+
return Collections.emptyIterator();
108109
}
109110

110111
public static boolean checkBufRefs(final ValueVector vv) {

0 commit comments

Comments
 (0)