[carbondata] branch master updated: [HOTFIX] exclude servlet-api.jar and jsp-api.jar from dependency

[ajantha]

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

ajantha 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 09b3d60  [HOTFIX] exclude servlet-api.jar and jsp-api.jar from 
dependency
09b3d60 is described below

commit 09b3d6026683fcd552bc014221fe2c793dfee6c9
Author: Zhang Zhichao <441586...@qq.com>
AuthorDate: Sun Feb 23 15:19:58 2020 +0800

    [HOTFIX] exclude servlet-api.jar and jsp-api.jar from dependency
    
    Why is this PR needed?
    When run app in idea, spark ui will throw exception.
    
    What changes were proposed in this PR?
    servlet-api.jar 2.5 and jsp-api.jar 2.1 conflict with jetty, so exclude 
these two jars from dependencies.
    
    Does this PR introduce any user interface change?
    No
    Is any new testcase added?
    No
    
    This closes #3635
---
 core/pom.xml              | 10 ++++++++++
 integration/flink/pom.xml | 10 ++++++++++
 integration/hive/pom.xml  | 20 ++++++++++++++++++++
 pom.xml                   | 12 ++++++------
 4 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 4fa9a05..e8ff8e1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -62,6 +62,16 @@
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-client</artifactId>
       <version>${hadoop.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet.jsp</groupId>
+          <artifactId>jsp-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.xerial.snappy</groupId>
diff --git a/integration/flink/pom.xml b/integration/flink/pom.xml
index 9e47fd3..0acbd53 100644
--- a/integration/flink/pom.xml
+++ b/integration/flink/pom.xml
@@ -173,6 +173,16 @@
             <artifactId>hadoop-client</artifactId>
             <version>2.7.5</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet.jsp</groupId>
+                    <artifactId>jsp-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
diff --git a/integration/hive/pom.xml b/integration/hive/pom.xml
index 4eeb8fc..68ffdc0 100644
--- a/integration/hive/pom.xml
+++ b/integration/hive/pom.xml
@@ -68,6 +68,16 @@
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-service</artifactId>
             <version>${hive.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet.jsp</groupId>
+                    <artifactId>jsp-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hive</groupId>
@@ -92,6 +102,16 @@
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-client</artifactId>
             <version>${hadoop.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet.jsp</groupId>
+                    <artifactId>jsp-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.carbondata</groupId>
diff --git a/pom.xml b/pom.xml
index cf36a2f..c72a68d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -172,11 +172,11 @@
           </exclusion>
           <exclusion>
             <groupId>javax.servlet</groupId>
-            <artifactId>*</artifactId>
+            <artifactId>servlet-api</artifactId>
           </exclusion>
           <exclusion>
             <groupId>javax.servlet.jsp</groupId>
-            <artifactId>*</artifactId>
+            <artifactId>jsp-api</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
@@ -192,11 +192,11 @@
           </exclusion>
           <exclusion>
             <groupId>javax.servlet</groupId>
-            <artifactId>*</artifactId>
+            <artifactId>servlet-api</artifactId>
           </exclusion>
           <exclusion>
             <groupId>javax.servlet.jsp</groupId>
-            <artifactId>*</artifactId>
+            <artifactId>jsp-api</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
@@ -212,11 +212,11 @@
           </exclusion>
           <exclusion>
             <groupId>javax.servlet</groupId>
-            <artifactId>*</artifactId>
+            <artifactId>servlet-api</artifactId>
           </exclusion>
           <exclusion>
             <groupId>javax.servlet.jsp</groupId>
-            <artifactId>*</artifactId>
+            <artifactId>jsp-api</artifactId>
           </exclusion>
         </exclusions>
       </dependency>