Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mattdarwin wants to merge 14 commits into from
Closed

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

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
38be468
upgrading libs except jackson and logback
Jul 20, 2017
c194e48
upgraded hppc to 0.7.2
Jul 20, 2017
568737d
switching to Collections from Guava for empty iterator
Jul 20, 2017
cff5596
reverting to netty 4.0.41.Final
Jul 20, 2017
94c1469
upgrading netty to 4.0.49
Jul 20, 2017
8aafb7e
correcting indentation in BaseValueVector
Jul 20, 2017
806f348
Merge branch 'master' into upgrade-libs
Jul 24, 2017
80d81e6
downgrading guava to 20 for java 7 compatibility
Jul 24, 2017
8599ba0
backing out guava upgrade
Aug 1, 2017
bc3b6a0
Merge pull request #1 from apache/master
mattdarwin Aug 1, 2017
c63eef6
Merge branch 'master' into upgrade-libs
Aug 1, 2017
79550b1
rolling back lilith to 0.9.44 since 8 doesn't support java 7
Aug 8, 2017
284a4ce
Merge branch 'master' of https://github.com/apache/arrow
Aug 8, 2017
9b51f46
Merge branch 'master' into upgrade-libs
Aug 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions java/memory/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
10 changes: 5 additions & 5 deletions java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<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>
<!--<hadoop.version>2.7.1</hadoop.version>-->
<checkstyle.failOnViolation>false</checkstyle.failOnViolation>
</properties>

Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>

@jacques-n jacques-n Aug 8, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this support java 7?

<scope>test</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions java/tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions java/vector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion java/vector/src/main/java/org/apache/arrow/vector/BaseValueVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*/
package org.apache.arrow.vector;

import java.util.Collections;
import java.util.Iterator;

import com.google.flatbuffers.FlatBufferBuilder;
Expand Down Expand Up @@ -99,7 +100,7 @@ public void reset() {}

@Override
public Iterator<ValueVector> iterator() {
return Iterators.emptyIterator();
return Collections.emptyIterator();
}

public static boolean checkBufRefs(final ValueVector vv) {
Expand Down