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

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


The following commit(s) were added to refs/heads/branch-1.8 by this push:
     new 71bd145b4 ORC-1328: Exclude the proto files from the shaded protobuf 
jar
71bd145b4 is described below

commit 71bd145b45e101ea6d940215c8910d2c7262a33a
Author: Eduard Tudenhoefner <[email protected]>
AuthorDate: Wed Dec 7 02:52:27 2022 -0800

    ORC-1328: Exclude the proto files from the shaded protobuf jar
    
    ### Why are the changes needed?
    
    It looks like the shaded-protobuf.jar has the same issue that was fixed in 
https://github.com/apache/orc/pull/1334
    
    ### What changes were proposed in this pull request?
    
    Exclude the proto files
    
    ### How was this patch tested?
    
    Test manually.
    
    Closes #1336 from nastra/orc-1327.
    
    Authored-by: Eduard Tudenhoefner <[email protected]>
    Signed-off-by: Dongjoon Hyun <[email protected]>
    (cherry picked from commit 72deb94d5e45c90fe2fcd8a01cf38bf85ef15f91)
    Signed-off-by: Dongjoon Hyun <[email protected]>
---
 java/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/pom.xml b/java/pom.xml
index 453f97b0e..8a50bcec1 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -462,6 +462,7 @@
                       <exclude>META-INF/DEPENDENCIES</exclude>
                       <exclude>META-INF/LICENSE</exclude>
                       <exclude>META-INF/NOTICE</exclude>
+                      <exclude>google/protobuf/**</exclude>
                     </excludes>
                   </filter>
                 </filters>

Reply via email to