[impala] 02/02: IMPALA-10261: Include org/apache/hive/com/google in impala-minimal-hive-exec

[jo...@apache.org]

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

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

commit ca4d6912be7c89acd518bbbe44e7c2407f1bb217
Author: Joe McDonnell <jo...@cloudera.com>
AuthorDate: Mon Oct 19 14:50:12 2020 -0700

    IMPALA-10261: Include org/apache/hive/com/google in impala-minimal-hive-exec
    
    Newer versions of Hive shade guava, which means that they require
    the presence of artifacts in org/apache/hive/com/google. To
    support these newer versions, this adds that path to the inclusions
    for impala-minimal-hive-exec.
    
    Testing:
     - Tested with a newer version of Hive that has the shading
       and verified that Impala starts up and functions.
    
    Change-Id: I87ac089fdacc6fc5089ed68be92dedce514050b9
    Reviewed-on: http://gerrit.cloudera.org:8080/16614
    Reviewed-by: Tim Armstrong <ta...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 java/shaded-deps/hive-exec/pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/java/shaded-deps/hive-exec/pom.xml b/java/shaded-deps/hive-exec/pom.xml
index ce1f876..191e153 100644
--- a/java/shaded-deps/hive-exec/pom.xml
+++ b/java/shaded-deps/hive-exec/pom.xml
@@ -114,6 +114,9 @@ the same dependencies
                 <include>org/apache/hadoop/hive/ql/ErrorMsg.class</include>
                 <include>org/apache/orc/**</include>
                 <include>com/google/**</include>
+                <!-- IMPALA-10261: Some versions of Hive shade guava, so include
+                 the shaded path as well -->
+                <include>org/apache/hive/com/google/**</include>
               </includes>
             </filter>
           </filters>