From 42b3e5bd10091046a11796a477d6a799bc1b8f7a Mon Sep 17 00:00:00 2001
From: Tboy <guo.jiwei@immomo.com>
Date: Mon, 3 Feb 2020 11:06:31 +0800
Subject: [PATCH] fix api server startup failure (#1886)

* move version to parent pom

* move version properties to parent pom for easy management

* remove freemarker dependency

* delete CombinedApplicationServer

* #1871 correct spelling

* #1873 some updates for TaskQueueZkImpl

* #1875 remove unused properties in pom

* #1878
1. remove tomcat dependency
2. remove combined_logback.xml in api module
3. format pom.xml for not aligning

* #1885 fix api server startup failure
1. add jsp-2.1 dependency
2. remove jasper-runtime dependency
---
 dolphinscheduler-api/pom.xml |  5 +++++
 pom.xml                      | 23 ++++++++++++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml
index 4dd2f31f8e..bac74da0b0 100644
--- a/dolphinscheduler-api/pom.xml
+++ b/dolphinscheduler-api/pom.xml
@@ -183,6 +183,11 @@
       <artifactId>servlet-api</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-2.1</artifactId>
+    </dependency>
+
     <!-- just for test -->
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/pom.xml b/pom.xml
index 742c15e636..86d95e44a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
         <oshi.core.version>3.5.0</oshi.core.version>
         <clickhouse.jdbc.version>0.1.52</clickhouse.jdbc.version>
         <mssql.jdbc.version>6.1.0.jre8</mssql.jdbc.version>
-        <jsp.version>6.1.14</jsp.version>
+        <jsp-2.1.version>6.1.14</jsp-2.1.version>
         <spotbugs.version>3.1.12</spotbugs.version>
         <checkstyle.version>3.0.0</checkstyle.version>
         <apache.rat.version>0.13</apache.rat.version>
@@ -116,7 +116,6 @@
         <cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
         <mockito.version>2.21.0</mockito.version>
         <powermock.version>2.0.2</powermock.version>
-        <jasper-runtime.version>5.5.23</jasper-runtime.version>
         <servlet-api.version>2.5</servlet-api.version>
         <swagger.version>1.9.3</swagger.version>
         <springfox.version>2.9.2</springfox.version>
@@ -442,12 +441,6 @@
                 <version>${hadoop.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>${javax.servlet.api.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-collections4</artifactId>
@@ -502,10 +495,12 @@
                 <version>${jcip.version}</version>
                 <optional>true</optional>
             </dependency>
+
+            <!-- for api module -->
             <dependency>
-                <groupId>tomcat</groupId>
-                <artifactId>jasper-runtime</artifactId>
-                <version>${jasper-runtime.version}</version>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jsp-2.1</artifactId>
+                <version>${jsp-2.1.version}</version>
             </dependency>
 
             <dependency>
@@ -513,6 +508,12 @@
                 <artifactId>servlet-api</artifactId>
                 <version>${servlet-api.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>${javax.servlet.api.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.springfox</groupId>
                 <artifactId>springfox-swagger2</artifactId>