You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by lz...@apache.org on 2022/08/11 09:50:01 UTC

[flink-table-store] branch master updated: [FLINK-28903] flink-table-store-hive-catalog could not shade hive-shims-0.23

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

lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-table-store.git


The following commit(s) were added to refs/heads/master by this push:
     new 3b6e602c [FLINK-28903] flink-table-store-hive-catalog could not shade hive-shims-0.23
3b6e602c is described below

commit 3b6e602cd64223a7861d30c57054d57b9557cf94
Author: Nicholas Jiang <pr...@163.com>
AuthorDate: Thu Aug 11 17:49:57 2022 +0800

    [FLINK-28903] flink-table-store-hive-catalog could not shade hive-shims-0.23
    
    This closes #265
    
    Co-authored-by: JingsongLi <lz...@aliyun.com>
---
 flink-table-store-dist/pom.xml                     |  4 ----
 .../flink-table-store-hive-catalog/pom.xml         | 22 +++++++++++++++++++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/flink-table-store-dist/pom.xml b/flink-table-store-dist/pom.xml
index bcafa356..ae5db1a5 100644
--- a/flink-table-store-dist/pom.xml
+++ b/flink-table-store-dist/pom.xml
@@ -184,10 +184,6 @@ under the License.
                                     <pattern>org.apache.flink.streaming.util.serialization.TypeInformationKeyValueSerializationSchema</pattern>
                                     <shadedPattern>org.apache.flink.table.store.shaded.streaming.util.serialization.TypeInformationKeyValueSerializationSchema</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>org.apache.hadoop.security.token.delegation.HiveDelegationTokenSupport</pattern>
-                                    <shadedPattern>org.apache.flink.table.store.shaded.org.apache.hadoop.security.token.delegation.HiveDelegationTokenSupport</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>org.apache.kafka</pattern>
                                     <shadedPattern>org.apache.flink.table.store.shaded.org.apache.kafka</shadedPattern>
diff --git a/flink-table-store-hive/flink-table-store-hive-catalog/pom.xml b/flink-table-store-hive/flink-table-store-hive-catalog/pom.xml
index 7fc8c6ce..794644cd 100644
--- a/flink-table-store-hive/flink-table-store-hive-catalog/pom.xml
+++ b/flink-table-store-hive/flink-table-store-hive-catalog/pom.xml
@@ -476,7 +476,6 @@ under the License.
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <minimizeJar>true</minimizeJar>
                             <artifactSet>
                                 <includes>
                                     <include>org.apache.flink:flink-table-store-hive-common</include>
@@ -485,6 +484,7 @@ under the License.
                                     <include>com.google.guava:guava</include>
                                     <include>org.apache.hive:hive-common</include>
                                     <include>org.apache.hive.shims:hive-shims-common</include>
+                                    <include>org.apache.hive.shims:hive-shims-0.23</include>
                                     <include>org.apache.hive:hive-serde</include>
                                     <include>org.apache.hive:hive-metastore</include>
                                 </includes>
@@ -502,6 +502,26 @@ under the License.
                                     <pattern>org.apache.hadoop.hive</pattern>
                                     <shadedPattern>org.apache.flink.table.store.shaded.org.apache.hadoop.hive</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org.apache.hadoop.fs.ProxyLocalFileSystem</pattern>
+                                    <shadedPattern>org.apache.flink.table.store.shaded.org.apache.hadoop.fs.ProxyLocalFileSystem</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.apache.hadoop.fs.ProxyFileSystem</pattern>
+                                    <shadedPattern>org.apache.flink.table.store.shaded.org.apache.hadoop.fs.ProxyFileSystem</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.apache.hadoop.fs.DefaultFileAccess</pattern>
+                                    <shadedPattern>org.apache.flink.table.store.shaded.org.apache.hadoop.fs.DefaultFileAccess</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.apache.hadoop.mapred.WebHCatJTShim23</pattern>
+                                    <shadedPattern>org.apache.flink.table.store.shaded.org.apache.hadoop.mapred.WebHCatJTShim23</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.apache.hadoop.security.token.delegation.HiveDelegationTokenSupport</pattern>
+                                    <shadedPattern>org.apache.flink.table.store.shaded.org.apache.hadoop.security.token.delegation.HiveDelegationTokenSupport</shadedPattern>
+                                </relocation>
                                 <relocation>
                                     <pattern>org.apache.hive</pattern>
                                     <shadedPattern>org.apache.flink.table.store.shaded.org.apache.hive</shadedPattern>