[orc] branch master updated: ORC-599: Bumping up guava to 28.1-jre

[omalley]

This is an automated email from the ASF dual-hosted git repository.

omalley pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/orc.git


The following commit(s) were added to refs/heads/master by this push:
     new 6df7e8e  ORC-599: Bumping up guava to 28.1-jre
6df7e8e is described below

commit 6df7e8ea251da96e3a0de6fc31f7726301be7cc3
Author: Panos Garefalakis <pga...@cloudera.com>
AuthorDate: Thu Feb 13 12:32:13 2020 +0000

    ORC-599: Bumping up guava to 28.1-jre
    
    Fixes #481
    
    Signed-off-by: Owen O'Malley <omal...@apache.org>
---
 .../src/test/org/apache/orc/impl/TestSerializationUtils.java  |  8 +++-----
 java/pom.xml                                                  | 11 ++++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/java/core/src/test/org/apache/orc/impl/TestSerializationUtils.java 
b/java/core/src/test/org/apache/orc/impl/TestSerializationUtils.java
index 4a8a0f2..5b06622 100644
--- a/java/core/src/test/org/apache/orc/impl/TestSerializationUtils.java
+++ b/java/core/src/test/org/apache/orc/impl/TestSerializationUtils.java
@@ -25,8 +25,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Random;
 
 import org.junit.Test;
@@ -136,21 +134,21 @@ public class TestSerializationUtils {
       LongMath.checkedSubtract(22222222222L, Long.MIN_VALUE);
       fail("expected ArithmeticException for overflow");
     } catch (ArithmeticException ex) {
-      assertEquals(ex.getMessage(), "overflow");
+      assertEquals("overflow: checkedSubtract(22222222222, 
-9223372036854775808)", ex.getMessage());
     }
 
     try {
       LongMath.checkedSubtract(-22222222222L, Long.MAX_VALUE);
       fail("expected ArithmeticException for overflow");
     } catch (ArithmeticException ex) {
-      assertEquals(ex.getMessage(), "overflow");
+      assertEquals("overflow: checkedSubtract(-22222222222, 
9223372036854775807)", ex.getMessage());
     }
 
     try {
       LongMath.checkedSubtract(Long.MIN_VALUE, Long.MAX_VALUE);
       fail("expected ArithmeticException for overflow");
     } catch (ArithmeticException ex) {
-      assertEquals(ex.getMessage(), "overflow");
+      assertEquals("overflow: checkedSubtract(-9223372036854775808, 
9223372036854775807)", ex.getMessage());
     }
 
     assertEquals(-8106206116692740190L,
diff --git a/java/pom.xml b/java/pom.xml
index 04c20c5..e296852 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -412,11 +412,6 @@
         <version>2.2.4</version>
       </dependency>
       <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>11.0.2</version>
-      </dependency>
-      <dependency>
         <groupId>com.google.protobuf</groupId>
         <artifactId>protobuf-java</artifactId>
         <version>2.5.0</version>
@@ -694,6 +689,12 @@
 
       <!-- test inter-project -->
       <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>28.1-jre</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>4.11</version>