This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 6e9d207 [UI Part 1] Update pom.xml of Frontend (#4583)
6e9d207 is described below
commit 6e9d2074fb24821379d736f3926ed8313f55d81e
Author: Mingyu Chen <[email protected]>
AuthorDate: Fri Sep 11 17:48:42 2020 +0800
[UI Part 1] Update pom.xml of Frontend (#4583)
Add spring related dependencies
---
fe/fe-core/pom.xml | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++
fe/pom.xml | 6 ++++
2 files changed, 110 insertions(+)
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index bcb9804..8b91f86 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -66,6 +66,22 @@ under the License.
</profiles>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-web</artifactId>
+ <version>2.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-devtools</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>springloaded</artifactId>
+ <version>1.2.6.RELEASE</version>
+ </dependency>
+
<dependency>
<groupId>org.apache</groupId>
<artifactId>spark-dpp</artifactId>
@@ -165,6 +181,12 @@ under the License.
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>servlet-api-2.5</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/org.mortbay.jetty/jetty-util
-->
@@ -214,6 +236,12 @@ under the License.
<dependency>
<groupId>com.baidu</groupId>
<artifactId>jprotobuf-rpc-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/org.json/json -->
@@ -465,6 +493,82 @@ under the License.
<artifactId>spark-sql_2.12</artifactId>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>5.1.0.Final</version>
+ </dependency>
+
+ <!--
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web
-->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate.validator</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!--Spring boot-->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-configuration-processor</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>5.5.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna-platform</artifactId>
+ <version>5.5.0</version>
+ </dependency>
+
</dependencies>
<build>
diff --git a/fe/pom.xml b/fe/pom.xml
index 6ca26cb..1f1217d 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -37,6 +37,12 @@ under the License.
<name>doris-fe</name>
<url>https://github.com/apache/incubator-doris</url>
+ <parent>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>2.2.0.RELEASE</version>
+ </parent>
+
<properties>
<doris.home>${basedir}/../</doris.home>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
