[carbondata] branch master updated: [CARBONDATA-3569] Remove some conflicting jars from assembly jar

[ja...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new c9061c7  [CARBONDATA-3569] Remove some conflicting jars from assembly jar
c9061c7 is described below

commit c9061c7b3a0fb807d497d84f6095a2d41fd2e3cd
Author: Zhang Zhichao <44...@qq.com>
AuthorDate: Wed Nov 13 17:26:01 2019 +0800

    [CARBONDATA-3569] Remove some conflicting jars from assembly jar
    
    Remove some conflicting jars from assembly jar, these jars already are included in spark jars path.
    
    This closes #3446
---
 assembly/pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index d6a3ce6..8bd9084 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -110,6 +110,9 @@
               <exclude>org.apache.hive:*</exclude>
               <exclude>com.google.guava:guava</exclude>
               <exclude>org.xerial.snappy:snappy-java</exclude>
+              <exclude>*:servlet-api</exclude>
+              <exclude>*:javax.inject</exclude>
+              <exclude>javax.activation:activation</exclude>
               <!--add more items to be excluded from the assembly-->
             </excludes>
           </artifactSet>