From d716ee4bd537bf562685123f8653e7cf2190eeee Mon Sep 17 00:00:00 2001
From: lgcareer <18610854716@163.com>
Date: Wed, 21 Aug 2019 20:11:13 +0800
Subject: [PATCH] Remove useless dependencies and add jsp-2.1-6.1.14 (#720)

* Remove useless dependencies and add jsp-2.1-6.1.14

* Determine if principal is empty in getJdbcUrl method
---
 escheduler-common/pom.xml                     | 117 ++++++++++++++++++
 .../common/job/db/HiveDataSource.java         |   8 +-
 pom.xml                                       |   6 +
 3 files changed, 130 insertions(+), 1 deletion(-)

diff --git a/escheduler-common/pom.xml b/escheduler-common/pom.xml
index b71a1dcc6b..8f93821216 100644
--- a/escheduler-common/pom.xml
+++ b/escheduler-common/pom.xml
@@ -152,6 +152,18 @@
 					<artifactId>jersey-json</artifactId>
 					<groupId>com.sun.jersey</groupId>
 				</exclusion>
+				<exclusion>
+					<artifactId>jersey-server</artifactId>
+					<groupId>com.sun.jersey</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>jersey-core</artifactId>
+					<groupId>com.sun.jersey</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>xz</artifactId>
+					<groupId>org.tukaani</groupId>
+				</exclusion>
 				<!--<exclusion>-->
 					<!--<groupId>com.google.protobuf</groupId>-->
 					<!--<artifactId>protobuf-java</artifactId>-->
@@ -195,6 +207,18 @@
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-mapreduce-client-shuffle</artifactId>
 				</exclusion>
+				<exclusion>
+					<artifactId>jersey-client</artifactId>
+					<groupId>com.sun.jersey</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>jersey-core</artifactId>
+					<groupId>com.sun.jersey</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>jaxb-api</artifactId>
+					<groupId>javax.xml.bind</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
@@ -231,6 +255,14 @@
 					<groupId>org.fusesource.leveldbjni</groupId>
 					<artifactId>leveldbjni-all</artifactId>
 				</exclusion>
+				<exclusion>
+					<artifactId>jersey-core</artifactId>
+					<groupId>com.sun.jersey</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>jersey-server</artifactId>
+					<groupId>com.sun.jersey</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
@@ -379,6 +411,86 @@
 					<artifactId>jasper-runtime</artifactId>
 					<groupId>tomcat</groupId>
 				</exclusion>
+				<exclusion>
+					<artifactId>slider-core</artifactId>
+					<groupId>org.apache.slider</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>hbase-server</artifactId>
+					<groupId>org.apache.hbase</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>jersey-client</artifactId>
+					<groupId>com.sun.jersey</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>jersey-core</artifactId>
+					<groupId>com.sun.jersey</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>jersey-json</artifactId>
+					<groupId>com.sun.jersey</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>jersey-server</artifactId>
+					<groupId>com.sun.jersey</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>jersey-guice</artifactId>
+					<groupId>com.sun.jersey.contribs</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>hbase-common</artifactId>
+					<groupId>org.apache.hbase</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>hbase-hadoop2-compat</artifactId>
+					<groupId>org.apache.hbase</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>hbase-client</artifactId>
+					<groupId>org.apache.hbase</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>hbase-hadoop-compat</artifactId>
+					<groupId>org.apache.hbase</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>tephra-hbase-compat-1.0</artifactId>
+					<groupId>co.cask.tephra</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>jaxb-api</artifactId>
+					<groupId>javax.xml.bind</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>hive-llap-client</artifactId>
+					<groupId>org.apache.hive</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>hive-llap-common</artifactId>
+					<groupId>org.apache.hive</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>hive-llap-server</artifactId>
+					<groupId>org.apache.hive</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>tephra-core</artifactId>
+					<groupId>co.cask.tephra</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>ant</artifactId>
+					<groupId>ant</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>stringtemplate</artifactId>
+					<groupId>org.antlr</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>antlr-runtime</artifactId>
+					<groupId>org.antlr</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
@@ -428,6 +540,11 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>jsp-2.1</artifactId>
+		</dependency>
 	</dependencies>
 
 
diff --git a/escheduler-common/src/main/java/cn/escheduler/common/job/db/HiveDataSource.java b/escheduler-common/src/main/java/cn/escheduler/common/job/db/HiveDataSource.java
index 719c5eb300..0d45924e8e 100644
--- a/escheduler-common/src/main/java/cn/escheduler/common/job/db/HiveDataSource.java
+++ b/escheduler-common/src/main/java/cn/escheduler/common/job/db/HiveDataSource.java
@@ -45,7 +45,13 @@ public class HiveDataSource extends BaseDataSource {
       jdbcUrl += "/";
     }
 
-    jdbcUrl += getDatabase() + ";principal=" + getPrincipal();
+    jdbcUrl += getDatabase();
+
+    if (StringUtils.isNotEmpty(getPrincipal())){
+      jdbcUrl += ";principal=" + getPrincipal();
+    }
+
+
 
     if (StringUtils.isNotEmpty(getOther())) {
       jdbcUrl += ";" + getOther();
diff --git a/pom.xml b/pom.xml
index a97650aafb..df7ab3ed5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -375,6 +375,12 @@
 				<version>6.1.0.jre8</version>
 			</dependency>
 
+			<dependency>
+				<groupId>org.mortbay.jetty</groupId>
+				<artifactId>jsp-2.1</artifactId>
+				<version>6.1.14</version>
+			</dependency>
+
 		</dependencies>
 	</dependencyManagement>