You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by do...@apache.org on 2021/05/07 04:11:49 UTC

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

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

dongjoon pushed a commit to branch branch-1.6
in repository https://gitbox.apache.org/repos/asf/orc.git


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

commit ce310b284756fa150ed89f6824d8aece1da691a3
Author: Panos Garefalakis <pg...@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 <om...@apache.org>
    (cherry picked from commit 6df7e8ea251da96e3a0de6fc31f7726301be7cc3)
    Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
 .../src/test/org/apache/orc/impl/TestSerializationUtils.java  |  6 +++---
 java/pom.xml                                                  | 11 ++++++-----
 2 files changed, 9 insertions(+), 8 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 3373381..5b06622 100644
--- a/java/core/src/test/org/apache/orc/impl/TestSerializationUtils.java
+++ b/java/core/src/test/org/apache/orc/impl/TestSerializationUtils.java
@@ -134,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 d4f4d7b..43818ce 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -449,11 +449,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>
@@ -725,6 +720,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.13.1</version>