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 4bdeef3 [chore][fix][doc](fe-plugin)(mysqldump) fix build auditlog
plugin error (#7804)
4bdeef3 is described below
commit 4bdeef3b64413847f4a0b0c011d3eacad1e15b9e
Author: Zhengguo Yang <yangz...@gmail.com>
AuthorDate: Wed Jan 26 09:11:23 2022 +0800
[chore][fix][doc](fe-plugin)(mysqldump) fix build auditlog plugin error
(#7804)
1. fix problems when build fe_plugins
2. format
3. add docs about dump data using mysql dump
---
build_plugin.sh | 6 -
docs/.vuepress/sidebar/en.js | 1 +
docs/.vuepress/sidebar/zh-CN.js | 1 +
.../administrator-guide/export_with_mysql_dump.md | 41 +++++
docs/en/community/how-to-deploy-to-maven.md | 16 +-
.../administrator-guide/export_with_mysql_dump.md | 41 +++++
docs/zh-CN/community/how-to-deploy-to-maven.md | 16 +-
extension/DataX/doriswriter/pom.xml | 9 +-
.../doriswriter/src/main/assembly/package.xml | 12 +-
extension/flink-doris-connector/pom.xml | 15 +-
extension/spark-doris-connector/pom.xml | 18 +--
fe/checkstyle.xml | 5 -
fe/fe-common/pom.xml | 19 ---
fe/fe-core/pom.xml | 121 +-------------
fe/fe-core/src/test/resources/log4j2.xml | 18 +--
fe/pom.xml | 135 +++++-----------
fe/spark-dpp/pom.xml | 58 ++-----
fe_plugins/auditdemo/pom.xml | 15 +-
fe_plugins/auditdemo/src/main/assembly/zip.xml | 3 +-
fe_plugins/auditloader/pom.xml | 15 +-
fe_plugins/auditloader/src/main/assembly/zip.xml | 3 +-
fe_plugins/pom.xml | 14 --
fs_brokers/apache_hdfs_broker/conf/hdfs-site.xml | 3 -
fs_brokers/apache_hdfs_broker/pom.xml | 64 +-------
samples/connect/java/client/pom.xml | 15 +-
samples/doris-demo/flink-demo/pom.xml | 12 +-
samples/doris-demo/pom.xml | 85 +++++-----
samples/doris-demo/spark-demo/pom.xml | 13 +-
samples/doris-demo/spring-jdbc-demo/pom.xml | 179 +++++++++------------
.../src/main/resources/logback.xml | 62 ++++---
.../src/main/resources/mybatis/DemoMapper.xml | 7 +-
.../src/main/resources/mybatis/mybatis-config.xml | 20 +--
samples/doris-demo/stream-load-demo/pom.xml | 6 +-
33 files changed, 339 insertions(+), 709 deletions(-)
diff --git a/build_plugin.sh b/build_plugin.sh
index b6c1375..c8b35ed 100755
--- a/build_plugin.sh
+++ b/build_plugin.sh
@@ -82,12 +82,6 @@ echo "Get params:
CLEAN -- $CLEAN
"
-# check if palo-fe.jar exist
-if [ ! -f "$DORIS_HOME/fe/fe-core/target/palo-fe.jar" ]; then
- echo "ERROR: palo-fe.jar does not exist. Please build FE first"
- exit -1
-fi
-
cd ${DORIS_HOME}
PLUGIN_MODULE=
if [ ${ALL_PLUGIN} -eq 1 ] ; then
diff --git a/docs/.vuepress/sidebar/en.js b/docs/.vuepress/sidebar/en.js
index 9081d69..8fee736 100644
--- a/docs/.vuepress/sidebar/en.js
+++ b/docs/.vuepress/sidebar/en.js
@@ -202,6 +202,7 @@ module.exports = [
"bucket-shuffle-join",
"dynamic-partition",
"export-manual",
+ "export_with_mysql_dump",
"outfile",
"privilege",
"ldap",
diff --git a/docs/.vuepress/sidebar/zh-CN.js b/docs/.vuepress/sidebar/zh-CN.js
index e94119d..0d2e382 100644
--- a/docs/.vuepress/sidebar/zh-CN.js
+++ b/docs/.vuepress/sidebar/zh-CN.js
@@ -201,6 +201,7 @@ module.exports = [
"bucket-shuffle-join",
"dynamic-partition",
"export-manual",
+ "export_with_mysql_dump",
"outfile",
"partition_cache",
"privilege",
diff --git a/docs/en/administrator-guide/export_with_mysql_dump.md
b/docs/en/administrator-guide/export_with_mysql_dump.md
new file mode 100644
index 0000000..ee2ce76
--- /dev/null
+++ b/docs/en/administrator-guide/export_with_mysql_dump.md
@@ -0,0 +1,41 @@
+---
+{
+"title": "Use mysqldump data to export table structure or data",
+"language": "en"
+}
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+# Use mysqldump data to export table structure or data
+Doris has supported exporting data or table structures through the `mysqldump`
tool after version 0.15
+
+## Example
+### Export
+ 1. Export the table1 table in the test database: `mysqldump -h127.0.0.1
-P9030 -uroot --no-tablespaces --databases test --tables table1`
+ 2. Export the table1 table structure in the test database: `mysqldump
-h127.0.0.1 -P9030 -uroot --no-tablespaces --databases test --tables table1
--no-data`
+ 3. Export all tables in the test1, test2 database: `mysqldump -h127.0.0.1
-P9030 -uroot --no-tablespaces --databases test1 test2`
+ 4. Export all databases and tables `mysqldump -h127.0.0.1 -P9030 -uroot
--no-tablespaces --all-databases`
+For more usage parameters, please refer to the manual of `mysqldump`
+### Import
+The results exported by `mysqldump` can be redirected to a file, which can
then be imported into Doris through the source command `source filename.sql`
+## Notice
+1. Since there is no concept of tablespace in mysql in Doris, add the
`--no-tablespaces` parameter when using `mysqldump`
+2. Using mysqldump to export data and table structure is only used for
development and testing or when the amount of data is small. Do not use it in a
production environment with a large amount of data.
diff --git a/docs/en/community/how-to-deploy-to-maven.md
b/docs/en/community/how-to-deploy-to-maven.md
index f7a9b80..da717e5 100644
--- a/docs/en/community/how-to-deploy-to-maven.md
+++ b/docs/en/community/how-to-deploy-to-maven.md
@@ -85,9 +85,7 @@ Switch to the flink connector directory, let’s take flink
version 1.11.6 and s
export DORIS_HOME=$PWD/../../
source ${DORIS_HOME}/env.sh
if [ -f ${DORIS_HOME}/custom_env.sh ]; then source
${DORIS_HOME}/custom_env.sh; fi
- export FLINK_VERSION="1.11.6"
- export SCALA_VERSION="2.12"
- mvn deploy
+ mvn deploy -Dflink.version=1.11.6 -Dscala.version=2.12
```
@@ -101,9 +99,7 @@ Switch to the spark connector directory, let’s take spark
version 2.3.4 and sc
export DORIS_HOME=$PWD/../../
source ${DORIS_HOME}/env.sh
if [ -f ${DORIS_HOME}/custom_env.sh ]; then source
${DORIS_HOME}/custom_env.sh; fi
- export SPARK_VERSION="2.3.4"
- export SCALA_VERSION="2.11"
- mvn deploy
+ mvn deploy -Dscala.version=2.11 -Dspark.version=2.3.4
```
## Publish to Release
@@ -123,10 +119,8 @@ Take the release of Doris Flink Connector 1.0.0 as an
example, the flink version
cd extension/flink-doris-connector/
export DORIS_HOME=$PWD/../../
source ${DORIS_HOME}/env.sh
-export FLINK_VERSION=1.13.5
-export SCALA_VERSION=2.12
-mvn release:clean
-mvn release:prepare
+mvn release:clean -Dflink.version=1.13.5 -Dscala.version=2.12
+mvn release:prepare -Dflink.version=1.13.5 -Dscala.version=2.12
```
After that, maven needs to enter three information
1. The version information of Doris Flink Connector, we can do it by default,
you can directly press Enter or enter the version you want
@@ -188,4 +182,4 @@ Vote open for at least 72 hours.
```
After the vote is passed, it can be published to Maven Central
-
\ No newline at end of file
+
diff --git a/docs/zh-CN/administrator-guide/export_with_mysql_dump.md
b/docs/zh-CN/administrator-guide/export_with_mysql_dump.md
new file mode 100644
index 0000000..1bd664f
--- /dev/null
+++ b/docs/zh-CN/administrator-guide/export_with_mysql_dump.md
@@ -0,0 +1,41 @@
+---
+{
+"title": "使用mysqldump数据导出表结构或者数据",
+"language": "zh-CN"
+}
+---
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+# 使用mysqldump数据导出表结构或者数据
+Doris 在0.15 之后的版本已经支持通过`mysqldump` 工具导出数据或者表结构
+
+## 使用示例
+### 导出
+ 1. 导出 test 数据库中的 table1 表：`mysqldump -h127.0.0.1 -P9030 -uroot
--no-tablespaces --databases test --tables table1`
+ 2. 导出 test 数据库中的 table1 表结构：`mysqldump -h127.0.0.1 -P9030 -uroot
--no-tablespaces --databases test --tables table1 --no-data`
+ 3. 导出 test1, test2 数据库中所有表：`mysqldump -h127.0.0.1 -P9030 -uroot
--no-tablespaces --databases test1 test2`
+ 4. 导出所有数据库和表 `mysqldump -h127.0.0.1 -P9030 -uroot --no-tablespaces
--all-databases`
+更多的使用参数可以参考`mysqldump` 的使用手册
+### 导入
+ `mysqldump` 导出的结果可以重定向到文件中，之后可以通过 source 命令导入到Doris 中 `source filename.sql`
+## 注意
+ 1. 由于Doris 中没有mysql 里的 tablespace 概念，因此在使用mysqldump 时要加上 `--no-tablespaces`
参数
+ 2. 使用mysqldump 导出数据和表结构仅用于开发测试或者数据量很小的情况，请勿用于大数据量的生产环境
diff --git a/docs/zh-CN/community/how-to-deploy-to-maven.md
b/docs/zh-CN/community/how-to-deploy-to-maven.md
index 82ca944..fa16663 100644
--- a/docs/zh-CN/community/how-to-deploy-to-maven.md
+++ b/docs/zh-CN/community/how-to-deploy-to-maven.md
@@ -87,9 +87,7 @@ under the License.
export DORIS_HOME=$PWD/../../
source ${DORIS_HOME}/env.sh
if [ -f ${DORIS_HOME}/custom_env.sh ]; then source
${DORIS_HOME}/custom_env.sh; fi
- export FLINK_VERSION="1.11.6"
- export SCALA_VERSION="2.12"
- mvn deploy
+ mvn deploy -Dflink.version=1.11.6 -Dscala.version=2.12
```
@@ -103,9 +101,7 @@ under the License.
export DORIS_HOME=$PWD/../../
source ${DORIS_HOME}/env.sh
if [ -f ${DORIS_HOME}/custom_env.sh ]; then source
${DORIS_HOME}/custom_env.sh; fi
- export SPARK_VERSION="2.3.4"
- export SCALA_VERSION="2.11"
- mvn deploy
+ mvn deploy -Dscala.version=2.11 -Dspark.version=2.3.4
```
## 发布到 Release
@@ -127,10 +123,8 @@ under the License.
cd extension/flink-doris-connector/
export DORIS_HOME=$PWD/../../
source ${DORIS_HOME}/env.sh
-export FLINK_VERSION=1.13.5
-export SCALA_VERSION=2.12
-mvn release:clean
-mvn release:prepare
+mvn release:clean -Dflink.version=1.13.5 -Dscala.version=2.12
+mvn release:prepare -Dflink.version=1.13.5 -Dscala.version=2.12
```
之后maven 需要输入三个信息
1. Doris Flink Connector 的版本信息， 我们默认就可以，可以直接回车或者输入自己想要的版本
@@ -188,4 +182,4 @@ Vote open for at least 72 hours.
```
投票通过后就可以发布到 Maven Central 了
-
\ No newline at end of file
+
diff --git a/extension/DataX/doriswriter/pom.xml
b/extension/DataX/doriswriter/pom.xml
index 1051436..8819485 100644
--- a/extension/DataX/doriswriter/pom.xml
+++ b/extension/DataX/doriswriter/pom.xml
@@ -17,8 +17,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<artifactId>datax-all</artifactId>
@@ -26,12 +25,10 @@ under the License.
<version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
<modelVersion>4.0.0</modelVersion>
<artifactId>doriswriter</artifactId>
<name>doriswriter</name>
<packaging>jar</packaging>
-
<dependencies>
<dependency>
<groupId>com.alibaba.datax</groupId>
@@ -52,19 +49,16 @@ under the License.
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
-
<dependency>
<groupId>com.alibaba.datax</groupId>
<artifactId>plugin-rdbms-util</artifactId>
<version>${datax-project-version}</version>
</dependency>
-
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.driver.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
@@ -82,7 +76,6 @@ under the License.
<encoding>${project-sourceEncoding}</encoding>
</configuration>
</plugin>
-
<!-- assembly plugin -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/extension/DataX/doriswriter/src/main/assembly/package.xml
b/extension/DataX/doriswriter/src/main/assembly/package.xml
index 9fca5e9..7159633 100644
--- a/extension/DataX/doriswriter/src/main/assembly/package.xml
+++ b/extension/DataX/doriswriter/src/main/assembly/package.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,12 +17,10 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<assembly
-
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
- <id></id>
+<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+ <id/>
<formats>
<format>dir</format>
</formats>
@@ -45,7 +42,6 @@ under the License.
<outputDirectory>plugin/writer/doriswriter</outputDirectory>
</fileSet>
</fileSets>
-
<dependencySets>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
diff --git a/extension/flink-doris-connector/pom.xml
b/extension/flink-doris-connector/pom.xml
index 21a5a6f..10b750a 100644
--- a/extension/flink-doris-connector/pom.xml
+++ b/extension/flink-doris-connector/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,9 +17,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://maven.apache.org/POM/4.0.0";
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -50,7 +47,6 @@ under the License.
<system>GitHub</system>
<url>https://github.com/apache/incubator-doris/issues</url>
</issueManagement>
-
<mailingLists>
<mailingList>
<name>Dev Mailing List</name>
@@ -58,7 +54,6 @@ under the License.
<subscribe>dev-subscr...@doris.apache.org</subscribe>
<unsubscribe>dev-unsubscr...@doris.apache.org</unsubscribe>
</mailingList>
-
<mailingList>
<name>Commits Mailing List</name>
<post>commits@doris.apache.org</post>
@@ -78,7 +73,6 @@ under the License.
<doris.thirdparty>${env.DORIS_THIRDPARTY}</doris.thirdparty>
<project.scm.id>github</project.scm.id>
</properties>
-
<profiles>
<profile>
<id>thirdparty</id>
@@ -99,14 +93,12 @@ under the License.
<name>env.CUSTOM_MAVEN_REPO</name>
</property>
</activation>
-
<repositories>
<repository>
<id>custom-nexus</id>
<url>${env.CUSTOM_MAVEN_REPO}</url>
</repository>
</repositories>
-
<pluginRepositories>
<pluginRepository>
<id>custom-nexus</id>
@@ -132,7 +124,6 @@ under the License.
<activeByDefault>true</activeByDefault>
</activation>
</profile>
-
<!-- for general repository -->
<profile>
<id>general-env</id>
@@ -141,7 +132,6 @@ under the License.
<name>!env.CUSTOM_MAVEN_REPO</name>
</property>
</activation>
-
<repositories>
<repository>
<id>central</id>
@@ -151,7 +141,6 @@ under the License.
</repositories>
</profile>
</profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
@@ -269,7 +258,6 @@ under the License.
<scope>test</scope>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -441,5 +429,4 @@ under the License.
</plugin>
</plugins>
</build>
-
</project>
diff --git a/extension/spark-doris-connector/pom.xml
b/extension/spark-doris-connector/pom.xml
index 9e4ac08..cfa2c5d 100644
--- a/extension/spark-doris-connector/pom.xml
+++ b/extension/spark-doris-connector/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,9 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://maven.apache.org/POM/4.0.0";
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -50,7 +47,6 @@
<system>GitHub</system>
<url>https://github.com/apache/incubator-doris/issues</url>
</issueManagement>
-
<mailingLists>
<mailingList>
<name>Dev Mailing List</name>
@@ -58,7 +54,6 @@
<subscribe>dev-subscr...@doris.apache.org</subscribe>
<unsubscribe>dev-unsubscr...@doris.apache.org</unsubscribe>
</mailingList>
-
<mailingList>
<name>Commits Mailing List</name>
<post>commits@doris.apache.org</post>
@@ -66,7 +61,6 @@
<unsubscribe>commits-unsubscr...@doris.apache.org</unsubscribe>
</mailingList>
</mailingLists>
-
<properties>
<scala.version>${env.scala.version}</scala.version>
<spark.version>${env.spark.version}</spark.version>
@@ -79,7 +73,6 @@
<doris.thirdparty>${env.DORIS_THIRDPARTY}</doris.thirdparty>
<project.scm.id>github</project.scm.id>
</properties>
-
<profiles>
<!-- for custom internal repository -->
<profile>
@@ -89,14 +82,12 @@
<name>env.CUSTOM_MAVEN_REPO</name>
</property>
</activation>
-
<repositories>
<repository>
<id>custom-nexus</id>
<url>${env.CUSTOM_MAVEN_REPO}</url>
</repository>
</repositories>
-
<pluginRepositories>
<pluginRepository>
<id>custom-nexus</id>
@@ -130,7 +121,6 @@
<name>!env.CUSTOM_MAVEN_REPO</name>
</property>
</activation>
-
<repositories>
<repository>
<id>central</id>
@@ -140,7 +130,6 @@
</repositories>
</profile>
</profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.spark</groupId>
@@ -207,13 +196,11 @@
<version>${spark.version}</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.10.0</version>
</dependency>
-
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
@@ -225,9 +212,7 @@
<version>4.1.27.Final</version>
<scope>provided</scope>
</dependency>
-
</dependencies>
-
<build>
<plugins>
<!-- add gensrc java build src dir -->
@@ -387,5 +372,4 @@
</plugin>
</plugins>
</build>
-
</project>
diff --git a/fe/checkstyle.xml b/fe/checkstyle.xml
index b26f878..7eba155 100644
--- a/fe/checkstyle.xml
+++ b/fe/checkstyle.xml
@@ -17,22 +17,17 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
<!-- See https://checkstyle.org/ for details -->
-
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd";>
<module name="Checker">
-
<module name="Header">
<property name="headerFile" value="checkstyle-apache-header.txt"/>
<property name="fileExtensions" value="java"/>
</module>
-
<module name="SuppressWarningsFilter"/>
<module name="TreeWalker">
<module name="AvoidStarImport"/>
<module name="UnusedImports"/>
</module>
-
</module>
diff --git a/fe/fe-common/pom.xml b/fe/fe-common/pom.xml
index ff0cbe2..36731a8 100644
--- a/fe/fe-common/pom.xml
+++ b/fe/fe-common/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,27 +17,21 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.doris</groupId>
<version>${revision}</version>
<artifactId>fe</artifactId>
<relativePath>../pom.xml</relativePath>
</parent>
-
<artifactId>fe-common</artifactId>
- <version>${revision}</version>
<packaging>jar</packaging>
-
<properties>
<doris.home>${basedir}/../../</doris.home>
<doris.thirdparty>${basedir}/../../thirdparty</doris.thirdparty>
</properties>
-
<profiles>
<profile>
<id>thirdparty</id>
@@ -52,41 +45,34 @@ under the License.
</properties>
</profile>
</profiles>
-
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
-
<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.apache.thrift/libthrift -->
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.jmockit/jmockit -->
<dependency>
<groupId>org.jmockit</groupId>
@@ -99,7 +85,6 @@ under the License.
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.roaringbitmap</groupId>
<artifactId>RoaringBitmap</artifactId>
@@ -110,10 +95,8 @@ under the License.
<scope>test</scope>
</dependency>
</dependencies>
-
<build>
<finalName>doris-fe-common</finalName>
-
<plugins>
<!--thrift-->
<plugin>
@@ -135,7 +118,6 @@ under the License.
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
@@ -173,7 +155,6 @@ under the License.
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index c44fa67..10331db 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,29 +17,23 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.doris</groupId>
<version>${revision}</version>
<artifactId>fe</artifactId>
<relativePath>../pom.xml</relativePath>
</parent>
-
<artifactId>fe-core</artifactId>
- <version>${revision}</version>
<packaging>jar</packaging>
-
<properties>
<doris.home>${basedir}/../../</doris.home>
<fe_ut_parallel>1</fe_ut_parallel>
<doris.thirdparty>${basedir}/../../thirdparty</doris.thirdparty>
<log4j2.version>2.17.1</log4j2.version>
</properties>
-
<profiles>
<profile>
<id>thirdparty</id>
@@ -65,7 +58,6 @@ under the License.
</properties>
</profile>
</profiles>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -83,13 +75,11 @@ under the License.
<artifactId>fe-common</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spark-dpp</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-web</artifactId>
@@ -108,91 +98,76 @@ under the License.
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-ldap</artifactId>
</dependency>
-
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.5.1</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/cglib/cglib -->
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/commons-cli/commons-cli -->
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/commons-lang/commons-lang -->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.commons/commons-pool2 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
</dependency>
-
<!--
https://mvnrepository.com/artifact/commons-validator/commons-validator -->
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
-
<!--
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.codehaus.jackson/jackson-mapper-asl -->
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</dependency>
-
<!--
https://mvnrepository.com/artifact/net.sourceforge.czt.dev/java-cup -->
<dependency>
<groupId>net.sourceforge.czt.dev</groupId>
<artifactId>java-cup</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.javassist/javassist -->
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
-
<!--
https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
<dependency>
<groupId>javax.servlet</groupId>
@@ -200,12 +175,10 @@ under the License.
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.mortbay.jetty/jetty -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -217,71 +190,60 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.mortbay.jetty/jetty-util
-->
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/de.jflex/jflex -->
<dependency>
<groupId>de.jflex</groupId>
<artifactId>jflex</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.jmockit/jmockit -->
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
<scope>test</scope>
</dependency>
-
<!-- https://mvnrepository.com/artifact/joda-time/joda-time -->
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
-
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.json/json -->
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/junit/junit -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j2.version}</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j-impl -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-log4j12 -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -293,201 +255,168 @@ under the License.
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/io.netty/netty-all -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.objenesis/objenesis -->
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
</dependency>
-
<!--
https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/com.squareup/protoparser -->
<dependency>
<groupId>com.squareup</groupId>
<artifactId>protoparser</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.xerial.snappy/snappy-java
-->
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
</dependency>
-
<!-- for k8s client-->
<!-- https://mvnrepository.com/artifact/dk.brics.automaton/automaton
-->
<dependency>
<groupId>dk.brics.automaton</groupId>
<artifactId>automaton</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/com.github.mifmif/generex -->
<dependency>
<groupId>com.github.mifmif</groupId>
<artifactId>generex</artifactId>
</dependency>
-
<!--
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations
-->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
-
<!--
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
-->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
-
<!--
https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml
-->
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
</dependency>
-
<!--
https://mvnrepository.com/artifact/com.fasterxml.jackson.module/jackson-module-jaxb-annotations
-->
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/io.fabric8/kubernetes-client
-->
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/io.fabric8/kubernetes-model -->
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-model</artifactId>
</dependency>
-
<!--
https://mvnrepository.com/artifact/com.squareup.okhttp3/logging-interceptor -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>logging-interceptor</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp-ws
-->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp-ws</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/com.squareup.okio/okio -->
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</dependency>
-
<!--
https://mvnrepository.com/artifact/javax.validation/validation-api -->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/io.fabric8/zjsonpatch -->
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>zjsonpatch</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/com.github.oshi/oshi-core -->
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.jboss.xnio/xnio-nio -->
<dependency>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-nio</artifactId>
</dependency>
-
<!-- support jdk9 -->
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
-
<!-- support jdk9 -->
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>javax.activation</artifactId>
</dependency>
-
<!-- support jdk11 -->
<!-- https://mvnrepository.com/artifact/javax.xml.ws/jaxws-api -->
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.roaringbitmap</groupId>
<artifactId>RoaringBitmap</artifactId>
</dependency>
-
<!-- spark -->
<!--
https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.12 -->
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.12</artifactId>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.spark/spark-launcher_2.12 -->
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-launcher_2.12</artifactId>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.spark/spark-sql_2.12 -->
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_2.12</artifactId>
<scope>provided</scope>
</dependency>
-
<!-- https://mvnrepository.com/artifact/com.alibaba.otter/canal.client
-->
<dependency>
<groupId>com.alibaba.otter</groupId>
@@ -504,7 +433,6 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
<!--
https://mvnrepository.com/artifact/com.alibaba.otter/canal.protocol -->
<dependency>
<groupId>com.alibaba.otter</groupId>
@@ -521,23 +449,19 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>5.1.0.Final</version>
</dependency>
-
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-aws</artifactId>
</dependency>
-
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web
-->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -565,7 +489,6 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jetty</artifactId>
@@ -581,7 +504,6 @@ under the License.
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
</dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
@@ -608,81 +530,66 @@ under the License.
</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>
-
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
<version>2.15.45</version>
</dependency>
-
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.0.3</version>
</dependency>
-
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
-
<dependency>
<groupId>hu.webarticum</groupId>
<artifactId>tree-printer</artifactId>
</dependency>
-
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
</dependency>
-
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
</dependency>
-
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-metastore</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-exec</artifactId>
<classifier>core</classifier>
<scope>provided</scope>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-hdfs
-->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<scope>provided</scope>
</dependency>
-
</dependencies>
-
<build>
<finalName>palo-fe</finalName>
-
<plugins>
<!--jcup-->
<plugin>
@@ -706,7 +613,6 @@ under the License.
<!--<outputDirectory>src/main/java</outputDirectory>-->
</configuration>
</plugin>
-
<!--jflex-->
<plugin>
<groupId>de.jflex</groupId>
@@ -729,7 +635,6 @@ under the License.
</execution>
</executions>
</plugin>
-
<!-- jmockit -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -744,7 +649,6 @@ under the License.
</argLine>
</configuration>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -752,7 +656,6 @@ under the License.
<skip>true</skip>
</configuration>
</plugin>
-
<!-- protobuf -->
<plugin>
<groupId>com.github.os72</groupId>
@@ -809,7 +712,6 @@ under the License.
</execution>
</executions>
</plugin>
-
<!-- add gensrc java build src dir -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -832,7 +734,6 @@ under the License.
</execution>
</executions>
</plugin>
-
<!-- copy all dependency libs to target lib dir -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -855,7 +756,6 @@ under the License.
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
@@ -866,7 +766,6 @@ under the License.
</check>
</configuration>
</plugin>
-
<!-- for FE java code style checking -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -889,7 +788,6 @@ under the License.
</execution>
</executions>
</plugin>
-
<!-- clean fe/target dir before building -->
<plugin>
<artifactId>maven-clean-plugin</artifactId>
@@ -904,9 +802,7 @@ under the License.
</execution>
</executions>
</plugin>
-
</plugins>
-
<pluginManagement>
<plugins>
<!--set for ecplise lifecycle -->
@@ -927,7 +823,7 @@ under the License.
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -940,7 +836,7 @@ under the License.
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -953,7 +849,7 @@ under the License.
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -966,7 +862,7 @@ under the License.
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -979,7 +875,7 @@ under the License.
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -993,7 +889,7 @@ under the License.
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -1007,17 +903,14 @@ under the License.
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
-
</lifecycleMappingMetadata>
</configuration>
</plugin>
-
</plugins>
</pluginManagement>
-
</build>
</project>
diff --git a/fe/fe-core/src/test/resources/log4j2.xml
b/fe/fe-core/src/test/resources/log4j2.xml
index 7a36940..d7496e9 100644
--- a/fe/fe-core/src/test/resources/log4j2.xml
+++ b/fe/fe-core/src/test/resources/log4j2.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,27 +17,24 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<Configuration status="WARN">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{YYYY-MM-dd HH:mm:ss} [%t] %-5p %c{1}:%L
- %msg%n" />
+ <PatternLayout pattern="%d{YYYY-MM-dd HH:mm:ss} [%t] %-5p %c{1}:%L
- %msg%n"/>
</Console>
-
<RollingFile name="RollingFile" filename="log/fe_test.log"
- filepattern="${logPath}/%d{YYYYMMddHHmmss}-fargo.log">
- <PatternLayout pattern="%d{YYYY-MM-dd HH:mm:ss} [%t] %-5p %c{1}:%L
- %msg%n" />
+ filepattern="${logPath}/%d{YYYYMMddHHmmss}-fargo.log">
+ <PatternLayout pattern="%d{YYYY-MM-dd HH:mm:ss} [%t] %-5p %c{1}:%L
- %msg%n"/>
<Policies>
- <SizeBasedTriggeringPolicy size="100 MB" />
+ <SizeBasedTriggeringPolicy size="100 MB"/>
</Policies>
- <DefaultRolloverStrategy max="20" />
+ <DefaultRolloverStrategy max="20"/>
</RollingFile>
-
</Appenders>
<Loggers>
<Root level="info">
- <AppenderRef ref="Console" />
- <AppenderRef ref="RollingFile" />
+ <AppenderRef ref="Console"/>
+ <AppenderRef ref="RollingFile"/>
</Root>
</Loggers>
</Configuration>
diff --git a/fe/pom.xml b/fe/pom.xml
index fcbbec6..b98cf2b 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
@@ -27,7 +25,6 @@ under the License.
<artifactId>apache</artifactId>
<version>23</version>
</parent>
-
<groupId>org.apache.doris</groupId>
<artifactId>fe</artifactId>
<version>${revision}</version>
@@ -51,7 +48,6 @@ under the License.
<system>GitHub</system>
<url>https://github.com/apache/incubator-doris/issues</url>
</issueManagement>
-
<mailingLists>
<mailingList>
<name>Dev Mailing List</name>
@@ -59,7 +55,6 @@ under the License.
<subscribe>dev-subscr...@doris.apache.org</subscribe>
<unsubscribe>dev-unsubscr...@doris.apache.org</unsubscribe>
</mailingList>
-
<mailingList>
<name>Commits Mailing List</name>
<post>commits@doris.apache.org</post>
@@ -67,13 +62,49 @@ under the License.
<unsubscribe>commits-unsubscr...@doris.apache.org</unsubscribe>
</mailingList>
</mailingLists>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>1.2.5</version>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>1.2.5</version>
+ <configuration>
+ <updatePomFile>true</updatePomFile>
+ <flattenMode>bom</flattenMode>
+ </configuration>
+ <executions>
+ <execution>
+ <id>flatten</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>flatten.clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<modules>
<module>fe-common</module>
<module>spark-dpp</module>
<module>fe-core</module>
</modules>
-
<properties>
<doris.home>${basedir}/../</doris.home>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -89,7 +120,6 @@ under the License.
<revision>0.15-SNAPSHOT</revision>
<project.scm.id>github</project.scm.id>
</properties>
-
<profiles>
<!-- for custom internal repository -->
<profile>
@@ -99,14 +129,12 @@ under the License.
<name>env.CUSTOM_MAVEN_REPO</name>
</property>
</activation>
-
<repositories>
<repository>
<id>custom-nexus</id>
<url>${env.CUSTOM_MAVEN_REPO}</url>
</repository>
</repositories>
-
<pluginRepositories>
<pluginRepository>
<id>custom-nexus</id>
@@ -114,7 +142,6 @@ under the License.
</pluginRepository>
</pluginRepositories>
</profile>
-
<!-- for general repository -->
<profile>
<id>general-env</id>
@@ -123,7 +150,6 @@ under the License.
<name>!env.CUSTOM_MAVEN_REPO</name>
</property>
</activation>
-
<repositories>
<repository>
<id>central</id>
@@ -141,7 +167,6 @@ under the License.
<url>https://download.oracle.com/maven</url>
</repository>
</repositories>
-
<pluginRepositories>
<!-- for cup-maven-plugin -->
<pluginRepository>
@@ -151,7 +176,6 @@ under the License.
</pluginRepositories>
</profile>
</profiles>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -159,34 +183,29 @@ under the License.
<artifactId>fe-common</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spark-dpp</artifactId>
<version>${project.version}</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/cglib/cglib -->
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>2.2</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/commons-cli/commons-cli -->
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.4</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/commons-codec/commons-codec -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.9</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/commons-lang/commons-lang
-->
<!-- upgrade commons-lang from 2.4 to 2.6 to fix incompatibility
of with versioning scheme of Java 9 and later -->
<dependency>
@@ -194,70 +213,60 @@ under the License.
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.9</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.commons/commons-pool2 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
<version>2.2</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/commons-validator/commons-validator -->
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
<version>1.4.1</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson
-->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.6</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>29.0-jre</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.12.1</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.codehaus.jackson/jackson-mapper-asl -->
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.13</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/net.sourceforge.czt.dev/java-cup -->
<dependency>
<groupId>net.sourceforge.czt.dev</groupId>
<artifactId>java-cup</artifactId>
<version>0.11-a-czt02-cdh</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.javassist/javassist -->
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.18.2-GA</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
<dependency>
<groupId>javax.servlet</groupId>
@@ -265,34 +274,29 @@ under the License.
<version>3.0.1</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
<version>7.3.7</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.mortbay.jetty/jetty -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>6.1.14</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.mortbay.jetty/jetty-util -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>6.1.14</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/de.jflex/jflex -->
<dependency>
<groupId>de.jflex</groupId>
<artifactId>jflex</artifactId>
<version>1.4.3</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.jmockit/jmockit -->
<dependency>
<groupId>org.jmockit</groupId>
@@ -300,27 +304,23 @@ under the License.
<version>${jmockit.version}</version>
<scope>test</scope>
</dependency>
-
<!-- https://mvnrepository.com/artifact/joda-time/joda-time -->
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.10.1</version>
</dependency>
-
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.json/json -->
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20171018</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/junit/junit -->
<dependency>
<groupId>junit</groupId>
@@ -328,7 +328,6 @@ under the License.
<version>4.12</version>
<scope>test</scope>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.thrift/libthrift -->
<dependency>
<groupId>org.apache.thrift</groupId>
@@ -346,98 +345,84 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j2.version}</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j-impl -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/io.dropwizard.metrics/metrics-core -->
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>4.0.2</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java
-->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.41</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/io.netty/netty-all -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.1.42.Final</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.objenesis/objenesis -->
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>2.1</version>
</dependency>
-
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<version>${grpc.version}</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>${grpc.version}</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${grpc.version}</version>
<scope>provided</scope>
</dependency>
-
<!--
https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/com.squareup/protoparser
-->
<dependency>
<groupId>com.squareup</groupId>
<artifactId>protoparser</artifactId>
<version>3.1.5</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.xerial.snappy/snappy-java -->
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>1.1.7.2</version>
</dependency>
-
<!-- for k8s client-->
<!--
https://mvnrepository.com/artifact/dk.brics.automaton/automaton -->
<dependency>
@@ -445,146 +430,125 @@ under the License.
<artifactId>automaton</artifactId>
<version>1.11-8</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/com.github.mifmif/generex
-->
<dependency>
<groupId>com.github.mifmif</groupId>
<artifactId>generex</artifactId>
<version>1.0.1</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations
-->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.12.1</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
-->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.12.1</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml
-->
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>2.12.1</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/com.fasterxml.jackson.module/jackson-module-jaxb-annotations
-->
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>2.12.1</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/io.fabric8/kubernetes-client -->
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
<version>1.4.27</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/io.fabric8/kubernetes-model -->
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-model</artifactId>
<version>1.0.64</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/com.squareup.okhttp3/logging-interceptor -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>logging-interceptor</artifactId>
<version>4.7.2</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.7.2</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp-ws -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp-ws</artifactId>
<version>3.4.2</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/com.squareup.okio/okio -->
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>2.6.0</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.15</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/javax.validation/validation-api -->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.1.0.Final</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/io.fabric8/zjsonpatch -->
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>zjsonpatch</artifactId>
<version>0.2.3</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
</dependency>
-
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
<version>0.10.1.1</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/com.github.oshi/oshi-core
-->
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>4.0.0</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.jboss.xnio/xnio-nio -->
<dependency>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-nio</artifactId>
<version>3.6.5.Final</version>
</dependency>
-
<!-- support jdk9 -->
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
-
<!-- support jdk9 -->
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>javax.activation</artifactId>
<version>1.2.0</version>
</dependency>
-
<!-- support jdk11 -->
<!-- https://mvnrepository.com/artifact/javax.xml.ws/jaxws-api -->
<dependency>
@@ -592,13 +556,11 @@ under the License.
<artifactId>jaxws-api</artifactId>
<version>2.3.0</version>
</dependency>
-
<dependency>
<groupId>org.roaringbitmap</groupId>
<artifactId>RoaringBitmap</artifactId>
<version>0.8.13</version>
</dependency>
-
<!-- spark -->
<!--
https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.12 -->
<dependency>
@@ -616,14 +578,12 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.spark/spark-launcher_2.12 -->
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-launcher_2.12</artifactId>
<version>2.4.6</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.spark/spark-sql_2.12 -->
<dependency>
<groupId>org.apache.spark</groupId>
@@ -631,7 +591,6 @@ under the License.
<version>2.4.6</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-metastore</artifactId>
@@ -656,7 +615,6 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-exec</artifactId>
@@ -678,7 +636,6 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
@@ -691,7 +648,6 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-aws</artifactId>
@@ -716,7 +672,6 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
@@ -729,56 +684,48 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-column</artifactId>
<version>1.10.1</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-hadoop</artifactId>
<version>1.10.1</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-common</artifactId>
<version>1.10.1</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.2</version>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>2.12.10</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>com.esotericsoftware</groupId>
<artifactId>kryo-shaded</artifactId>
<version>4.0.2</version>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-catalyst_2.12</artifactId>
<version>2.4.6</version>
<scope>provided</scope>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok
-->
<dependency>
<groupId>org.projectlombok</groupId>
@@ -786,7 +733,6 @@ under the License.
<version>1.18.16</version>
<scope>provided</scope>
</dependency>
-
<!-- https://mvnrepository.com/artifact/hu.webarticum/tree-printer
-->
<dependency>
<groupId>hu.webarticum</groupId>
@@ -798,28 +744,23 @@ under the License.
<artifactId>hamcrest</artifactId>
<version>2.1</version>
</dependency>
-
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
</dependency>
-
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.15</version>
</dependency>
-
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>1.11.95</version>
</dependency>
-
</dependencies>
</dependencyManagement>
-
<reporting>
<plugins>
<plugin>
diff --git a/fe/spark-dpp/pom.xml b/fe/spark-dpp/pom.xml
index 300ea4f..65c6b83 100644
--- a/fe/spark-dpp/pom.xml
+++ b/fe/spark-dpp/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,83 +17,68 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.doris</groupId>
<version>${revision}</version>
<artifactId>fe</artifactId>
<relativePath>../pom.xml</relativePath>
</parent>
-
<artifactId>spark-dpp</artifactId>
- <version>${revision}</version>
<packaging>jar</packaging>
-
<properties>
<doris.home>${basedir}/../../</doris.home>
<fe_ut_parallel>1</fe_ut_parallel>
</properties>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>fe-common</artifactId>
<version>${project.version}</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<scope>provided</scope>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<scope>provided</scope>
</dependency>
-
<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.jmockit/jmockit -->
<dependency>
<groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
<scope>test</scope>
</dependency>
-
<!-- https://mvnrepository.com/artifact/joda-time/joda-time -->
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<scope>provided</scope>
</dependency>
-
<!-- https://mvnrepository.com/artifact/junit/junit -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.9</version>
<scope>test</scope>
</dependency>
-
-
<!-- spark -->
<!--
https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.12 -->
<dependency>
@@ -102,72 +86,60 @@ under the License.
<artifactId>spark-core_2.12</artifactId>
<scope>provided</scope>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.spark/spark-sql_2.12 -->
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_2.12</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-column</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-hadoop</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-common</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>com.esotericsoftware</groupId>
<artifactId>kryo-shaded</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-catalyst_2.12</artifactId>
<version>2.4.6</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
</dependencies>
-
<build>
<finalName>spark-dpp-${project.version}</finalName>
-
<plugins>
<!-- jmockit -->
<plugin>
@@ -183,7 +155,6 @@ under the License.
</argLine>
</configuration>
</plugin>
-
<!-- copy all dependency libs to target lib dir -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -206,7 +177,6 @@ under the License.
</execution>
</executions>
</plugin>
-
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
@@ -221,15 +191,16 @@ under the License.
</configuration>
<executions>
<execution>
- <id>make-assembly</id> <!-- this is used for
inheritance merges -->
- <phase>package</phase> <!-- bind to the packaging
phase -->
+ <id>make-assembly</id>
+ <!-- this is used for inheritance merges -->
+ <phase>package</phase>
+ <!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
@@ -240,7 +211,6 @@ under the License.
</check>
</configuration>
</plugin>
-
<!-- for FE java code style checking -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -263,7 +233,6 @@ under the License.
</execution>
</executions>
</plugin>
-
<!-- clean fe/target dir before building -->
<plugin>
<artifactId>maven-clean-plugin</artifactId>
@@ -278,7 +247,6 @@ under the License.
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
@@ -316,7 +284,6 @@ under the License.
</configuration>
</plugin>
</plugins>
-
<pluginManagement>
<plugins>
<!--set for ecplise lifecycle -->
@@ -337,7 +304,7 @@ under the License.
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -350,7 +317,7 @@ under the License.
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -363,7 +330,7 @@ under the License.
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -376,7 +343,7 @@ under the License.
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -389,7 +356,7 @@ under the License.
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -403,7 +370,7 @@ under the License.
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -417,17 +384,14 @@ under the License.
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
-
</lifecycleMappingMetadata>
</configuration>
</plugin>
-
</plugins>
</pluginManagement>
-
</build>
</project>
diff --git a/fe_plugins/auditdemo/pom.xml b/fe_plugins/auditdemo/pom.xml
index ea23076..217093e 100644
--- a/fe_plugins/auditdemo/pom.xml
+++ b/fe_plugins/auditdemo/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,9 +17,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://maven.apache.org/POM/4.0.0";
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.apache.doris</groupId>
@@ -29,46 +26,37 @@ under the License.
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
-
<artifactId>auditdemo</artifactId>
<packaging>jar</packaging>
-
<dependencies>
<dependency>
<groupId>org.apache.doris</groupId>
<artifactId>fe-core</artifactId>
<version>${doris.version}</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j-impl -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/log4j/log4j -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
</dependencies>
-
-
<build>
<finalName>auditdemo</finalName>
-
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -91,5 +79,4 @@ under the License.
</plugin>
</plugins>
</build>
-
</project>
diff --git a/fe_plugins/auditdemo/src/main/assembly/zip.xml
b/fe_plugins/auditdemo/src/main/assembly/zip.xml
index 8ff8aa3..1220c12 100644
--- a/fe_plugins/auditdemo/src/main/assembly/zip.xml
+++ b/fe_plugins/auditdemo/src/main/assembly/zip.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,7 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<assembly>
<id>plugin</id>
<formats>
@@ -31,7 +31,6 @@ under the License.
</includes>
<outputDirectory>/</outputDirectory>
</fileSet>
-
<fileSet>
<directory>src/main/assembly</directory>
<includes>
diff --git a/fe_plugins/auditloader/pom.xml b/fe_plugins/auditloader/pom.xml
index e81ff63..204822b 100644
--- a/fe_plugins/auditloader/pom.xml
+++ b/fe_plugins/auditloader/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,9 +17,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://maven.apache.org/POM/4.0.0";
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.apache.doris</groupId>
@@ -29,10 +26,8 @@ under the License.
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
-
<artifactId>auditloader</artifactId>
<packaging>jar</packaging>
-
<dependencies>
<dependency>
<groupId>org.apache.doris</groupId>
@@ -44,36 +39,29 @@ under the License.
<artifactId>fe-common</artifactId>
<version>${doris.version}</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j-impl -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
-
<!-- https://mvnrepository.com/artifact/log4j/log4j -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
</dependencies>
-
-
<build>
<finalName>auditloader</finalName>
-
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
@@ -96,5 +84,4 @@ under the License.
</plugin>
</plugins>
</build>
-
</project>
diff --git a/fe_plugins/auditloader/src/main/assembly/zip.xml
b/fe_plugins/auditloader/src/main/assembly/zip.xml
index c8a5be0..515e687 100644
--- a/fe_plugins/auditloader/src/main/assembly/zip.xml
+++ b/fe_plugins/auditloader/src/main/assembly/zip.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,7 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<assembly>
<id>plugin</id>
<formats>
@@ -31,7 +31,6 @@ under the License.
</includes>
<outputDirectory>/</outputDirectory>
</fileSet>
-
<fileSet>
<directory>src/main/assembly</directory>
<includes>
diff --git a/fe_plugins/pom.xml b/fe_plugins/pom.xml
index 6aef11c..cbfad64 100644
--- a/fe_plugins/pom.xml
+++ b/fe_plugins/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
@@ -27,7 +25,6 @@ under the License.
<artifactId>apache</artifactId>
<version>23</version>
</parent>
-
<groupId>org.apache.doris</groupId>
<artifactId>fe-plugins</artifactId>
<packaging>pom</packaging>
@@ -51,7 +48,6 @@ under the License.
<system>GitHub</system>
<url>https://github.com/apache/incubator-doris/issues</url>
</issueManagement>
-
<mailingLists>
<mailingList>
<name>Dev Mailing List</name>
@@ -59,7 +55,6 @@ under the License.
<subscribe>dev-subscr...@doris.apache.org</subscribe>
<unsubscribe>dev-unsubscr...@doris.apache.org</unsubscribe>
</mailingList>
-
<mailingList>
<name>Commits Mailing List</name>
<post>commits@doris.apache.org</post>
@@ -71,7 +66,6 @@ under the License.
<module>auditdemo</module>
<module>auditloader</module>
</modules>
-
<properties>
<log4j2.version>2.17.1</log4j2.version>
<doris.version>0.15-SNAPSHOT</doris.version>
@@ -86,14 +80,12 @@ under the License.
<name>env.CUSTOM_MAVEN_REPO</name>
</property>
</activation>
-
<repositories>
<repository>
<id>custom-nexus</id>
<url>${env.CUSTOM_MAVEN_REPO}</url>
</repository>
</repositories>
-
<pluginRepositories>
<pluginRepository>
<id>custom-nexus</id>
@@ -102,7 +94,6 @@ under the License.
</pluginRepositories>
</profile>
</profiles>
-
<dependencyManagement>
<dependencies>
<!--
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
@@ -111,21 +102,18 @@ under the License.
<artifactId>log4j-api</artifactId>
<version>${log4j2.version}</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j-impl -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/log4j/log4j -->
<dependency>
<groupId>log4j</groupId>
@@ -134,7 +122,6 @@ under the License.
</dependency>
</dependencies>
</dependencyManagement>
-
<build>
<plugins>
<plugin>
@@ -148,5 +135,4 @@ under the License.
</plugin>
</plugins>
</build>
-
</project>
diff --git a/fs_brokers/apache_hdfs_broker/conf/hdfs-site.xml
b/fs_brokers/apache_hdfs_broker/conf/hdfs-site.xml
index 8ce34a7..97c7e4b 100644
--- a/fs_brokers/apache_hdfs_broker/conf/hdfs-site.xml
+++ b/fs_brokers/apache_hdfs_broker/conf/hdfs-site.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,9 +17,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<!-- Put site-specific property overrides in this file. -->
-
<configuration>
</configuration>
diff --git a/fs_brokers/apache_hdfs_broker/pom.xml
b/fs_brokers/apache_hdfs_broker/pom.xml
index 591b728..02d9a2e 100644
--- a/fs_brokers/apache_hdfs_broker/pom.xml
+++ b/fs_brokers/apache_hdfs_broker/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,8 +17,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -27,12 +25,10 @@ under the License.
<artifactId>apache</artifactId>
<version>23</version>
</parent>
-
<groupId>org.apache.doris</groupId>
<artifactId>apache-hdfs-broker</artifactId>
<version>0.15-SNAPSHOT</version>
<packaging>jar</packaging>
-
<name>Doris HDFS Broker</name>
<url>https://doris.apache.org/</url>
<licenses>
@@ -52,7 +48,6 @@ under the License.
<system>GitHub</system>
<url>https://github.com/apache/incubator-doris/issues</url>
</issueManagement>
-
<mailingLists>
<mailingList>
<name>Dev Mailing List</name>
@@ -60,7 +55,6 @@ under the License.
<subscribe>dev-subscr...@doris.apache.org</subscribe>
<unsubscribe>dev-unsubscr...@doris.apache.org</unsubscribe>
</mailingList>
-
<mailingList>
<name>Commits Mailing List</name>
<post>commits@doris.apache.org</post>
@@ -76,7 +70,6 @@ under the License.
<log4j2.version>2.17.1</log4j2.version>
<project.scm.id>github</project.scm.id>
</properties>
-
<profiles>
<!-- for custom internal repository -->
<profile>
@@ -86,14 +79,12 @@ under the License.
<name>env.CUSTOM_MAVEN_REPO</name>
</property>
</activation>
-
<repositories>
<repository>
<id>custom-nexus</id>
<url>${env.CUSTOM_MAVEN_REPO}</url>
</repository>
</repositories>
-
<pluginRepositories>
<pluginRepository>
<id>custom-nexus</id>
@@ -101,7 +92,6 @@ under the License.
</pluginRepository>
</pluginRepositories>
</profile>
-
<!-- for general repository -->
<profile>
<id>general-env</id>
@@ -110,7 +100,6 @@ under the License.
<name>!env.CUSTOM_MAVEN_REPO</name>
</property>
</activation>
-
<repositories>
<!-- for java-cup -->
<repository>
@@ -123,7 +112,6 @@ under the License.
<url>http://download.oracle.com/maven</url>
</repository>
</repositories>
-
<pluginRepositories>
<!-- for cup-maven-plugin -->
<pluginRepository>
@@ -133,7 +121,6 @@ under the License.
</pluginRepositories>
</profile>
</profiles>
-
<dependencies>
<!-- https://mvnrepository.com/artifact/commons-cli/commons-cli -->
<dependency>
@@ -141,105 +128,90 @@ under the License.
<artifactId>commons-cli</artifactId>
<version>1.4</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.9</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/commons-collections/commons-collections -->
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.2</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/commons-configuration/commons-configuration
-->
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.6</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/commons-daemon/commons-daemon
-->
<dependency>
<groupId>commons-daemon</groupId>
<artifactId>commons-daemon</artifactId>
<version>1.0.13</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/commons-lang/commons-lang -->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.3.2</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/commons-logging/commons-logging -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.3</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>15.0</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-annotations -->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
<version>2.7.3</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-auth
-->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
<version>2.7.3</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-common -->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>2.7.3</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-hdfs
-->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<version>2.7.3</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.apache.htrace/htrace-core
-->
<dependency>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
<version>3.1.0-incubating</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/junit/junit -->
<dependency>
<groupId>junit</groupId>
@@ -247,42 +219,36 @@ under the License.
<version>4.12</version>
<scope>test</scope>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.apache.thrift/libthrift -->
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<version>0.13.0</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j2.version}</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
</dependency>
-
<!--
https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>2.5.0</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.4</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-log4j12 -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -290,26 +256,21 @@ under the License.
<version>1.7.5</version>
<scope>test</scope>
</dependency>
-
<!-- support jdk9 -->
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws
-->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-aws</artifactId>
<version>2.7.3</version>
</dependency>
-
</dependencies>
-
<build>
<finalName>apache_hdfs_broker</finalName>
-
<plugins>
<plugin>
<artifactId>exec-maven-plugin</artifactId>
@@ -350,7 +311,6 @@ under the License.
</execution>
</executions>
</plugin>
-
<!-- generate thrfit -->
<plugin>
<groupId>org.apache.thrift.tools</groupId>
@@ -373,7 +333,6 @@ under the License.
</execution>
</executions>
</plugin>
-
<!-- copy all dependency libs to target lib dir -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -397,7 +356,6 @@ under the License.
</executions>
</plugin>
</plugins>
-
<pluginManagement>
<plugins>
<!--set for ecplise lifecycle -->
@@ -418,10 +376,9 @@ under the License.
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
-
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.thrift.tools</groupId>
@@ -432,10 +389,9 @@ under the License.
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
-
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.codehaus.mojo</groupId>
@@ -446,10 +402,9 @@ under the License.
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
-
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
@@ -460,10 +415,9 @@ under the License.
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
-
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
@@ -475,10 +429,9 @@ under the License.
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
-
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
@@ -490,17 +443,14 @@ under the License.
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
-
</lifecycleMappingMetadata>
</configuration>
</plugin>
-
</plugins>
</pluginManagement>
-
</build>
</project>
diff --git a/samples/connect/java/client/pom.xml
b/samples/connect/java/client/pom.xml
index 29050b1..8983a34 100644
--- a/samples/connect/java/client/pom.xml
+++ b/samples/connect/java/client/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,21 +17,16 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
-
<groupId>org.apache.doris</groupId>
<artifactId>doris-client</artifactId>
<version>0.0.1</version>
<packaging>jar</packaging>
-
<properties>
<file_encoding>UTF-8</file_encoding>
</properties>
-
<dependencies>
<dependency>
<groupId>mysql</groupId>
@@ -40,7 +34,6 @@ under the License.
<version>5.1.26</version>
</dependency>
</dependencies>
-
<build>
<finalName>client</finalName>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
@@ -65,8 +58,8 @@ under the License.
</goals>
</execution>
</executions>
- <configuration>
-
<outputDirectory>${project.basedir}</outputDirectory>
+ <configuration>
+ <outputDirectory>${project.basedir}</outputDirectory>
<archive>
<manifest>
<mainClass>client.Client</mainClass>
@@ -74,7 +67,7 @@ under the License.
<classpathPrefix>lib</classpathPrefix>
</manifest>
</archive>
- </configuration>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/samples/doris-demo/flink-demo/pom.xml
b/samples/doris-demo/flink-demo/pom.xml
index 5955f62..ea664d9 100644
--- a/samples/doris-demo/flink-demo/pom.xml
+++ b/samples/doris-demo/flink-demo/pom.xml
@@ -17,18 +17,15 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
-
<groupId>org.example</groupId>
<artifactId>flink-demo</artifactId>
<version>1.0-SNAPSHOT</version>
-
<name>flink-demo</name>
<!-- FIXME change it to the project's website -->
<url>http://www.example.com</url>
-
<properties>
<scala.version>2.12.10</scala.version>
<scala.binary.version>2.12</scala.binary.version>
@@ -38,7 +35,6 @@ under the License.
<hadoop.version>2.8.3</hadoop.version>
<scope.mode>compile</scope.mode>
</properties>
-
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
@@ -75,7 +71,6 @@ under the License.
<artifactId>flink-connector-jdbc_2.11</artifactId>
<version>${flink.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-kafka_${scala.binary.version}</artifactId>
@@ -101,13 +96,10 @@ under the License.
<artifactId>flink-shaded-hadoop-2-uber</artifactId>
<version>2.6.5-10.0</version>
</dependency>
-
<dependency>
<groupId>org.apache.doris</groupId>
<artifactId>doris-flink-connector</artifactId>
</dependency>
-
-
<!--After adding the following two dependencies, Flink's log will
appear-->
<dependency>
<groupId>org.slf4j</groupId>
@@ -120,7 +112,6 @@ under the License.
<version>1.7.25</version>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -160,5 +151,4 @@ under the License.
</plugin>
</plugins>
</build>
-
</project>
diff --git a/samples/doris-demo/pom.xml b/samples/doris-demo/pom.xml
index 7595832..3b19663 100644
--- a/samples/doris-demo/pom.xml
+++ b/samples/doris-demo/pom.xml
@@ -17,50 +17,43 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.doris</groupId>
- <artifactId>doris-demo</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
- <modules>
- <module>flink-demo</module>
- <module>spark-demo</module>
- <module>stream-load-demo</module>
- <module>spring-jdbc-demo</module>
- </modules>
-
- <name>doris-demo</name>
- <url>http://www.example.com</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.3.0</version>
- <type>maven-plugin</type>
- </dependency>
-
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.41</version>
- </dependency>
-
- <!--
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.13</version>
- </dependency>
- </dependencies>
-
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>doris-demo</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <modules>
+ <module>flink-demo</module>
+ <module>spark-demo</module>
+ <module>stream-load-demo</module>
+ <module>spring-jdbc-demo</module>
+ </modules>
+ <name>doris-demo</name>
+ <url>http://www.example.com</url>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.3.0</version>
+ <type>maven-plugin</type>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.41</version>
+ </dependency>
+ <!--
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.13</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/samples/doris-demo/spark-demo/pom.xml
b/samples/doris-demo/spark-demo/pom.xml
index 3ad0d72..43cfe9d 100644
--- a/samples/doris-demo/spark-demo/pom.xml
+++ b/samples/doris-demo/spark-demo/pom.xml
@@ -17,8 +17,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<artifactId>doris-demo</artifactId>
@@ -26,9 +25,7 @@ under the License.
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
-
<artifactId>spark-demo</artifactId>
-
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
@@ -36,7 +33,6 @@ under the License.
<scala.version>2.11</scala.version>
<scala-library.version>2.11.12</scala-library.version>
</properties>
-
<dependencies>
<!-- doris spark -->
<dependency>
@@ -44,7 +40,6 @@ under the License.
<artifactId>doris-spark</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
-
<!-- spark -->
<dependency>
<groupId>org.apache.spark</groupId>
@@ -56,40 +51,34 @@ under the License.
<artifactId>spark-sql_${scala.version}</artifactId>
<version>${spark.version}</version>
</dependency>
-
<!-- scala -->
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala-library.version}</version>
</dependency>
-
<!-- mysql connector -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.23</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.20</version>
</dependency>
-
<!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.78</version>
</dependency>
-
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.10.0</version>
</dependency>
-
</dependencies>
</project>
diff --git a/samples/doris-demo/spring-jdbc-demo/pom.xml
b/samples/doris-demo/spring-jdbc-demo/pom.xml
index f14efa4..1d3dfef 100644
--- a/samples/doris-demo/spring-jdbc-demo/pom.xml
+++ b/samples/doris-demo/spring-jdbc-demo/pom.xml
@@ -17,103 +17,84 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.doris</groupId>
- <artifactId>spring-jdbc-demo</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <name>spring-jdbc-demo</name>
- <!-- FIXME change it to the project's website -->
- <url>http://www.example.com</url>
-
- <parent>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.2.0.RELEASE</version>
- <relativePath/> <!-- lookup parent from repository -->
- </parent>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>1.8</java.version>
-
<mybatis.spring.boot.starter.version>1.3.2</mybatis.spring.boot.starter.version>
- <fastjson.version>1.2.70</fastjson.version>
- <druid.version>1.1.14</druid.version>
- <commons.io.version>2.5</commons.io.version>
- </properties>
-
- <dependencies>
- <!-- alibaba druid -->
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>druid-spring-boot-starter</artifactId>
- <version>${druid.version}</version>
- </dependency>
-
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-jdbc</artifactId>
- </dependency>
-
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>8.0.15</version>
- </dependency>
-
- <!-- SpringBoot Web -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
-
-
- <!-- pool -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- </dependency>
-
-
- <!-- SpringBoot mybatis -->
- <dependency>
- <groupId>org.mybatis.spring.boot</groupId>
- <artifactId>mybatis-spring-boot-starter</artifactId>
- <version>${mybatis.spring.boot.starter.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>${fastjson.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- </dependency>
-
- </dependencies>
-
-
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>spring-jdbc-demo</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>spring-jdbc-demo</name>
+ <!-- FIXME change it to the project's website -->
+ <url>http://www.example.com</url>
+ <parent>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>2.2.0.RELEASE</version>
+ <relativePath/>
+ <!-- lookup parent from repository -->
+ </parent>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <java.version>1.8</java.version>
+
<mybatis.spring.boot.starter.version>1.3.2</mybatis.spring.boot.starter.version>
+ <fastjson.version>1.2.70</fastjson.version>
+ <druid.version>1.1.14</druid.version>
+ <commons.io.version>2.5</commons.io.version>
+ </properties>
+ <dependencies>
+ <!-- alibaba druid -->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>druid-spring-boot-starter</artifactId>
+ <version>${druid.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-jdbc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>8.0.15</version>
+ </dependency>
+ <!-- SpringBoot Web -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+ <!-- pool -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ </dependency>
+ <!-- SpringBoot mybatis -->
+ <dependency>
+ <groupId>org.mybatis.spring.boot</groupId>
+ <artifactId>mybatis-spring-boot-starter</artifactId>
+ <version>${mybatis.spring.boot.starter.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>${fastjson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ </dependency>
+ </dependencies>
</project>
diff --git a/samples/doris-demo/spring-jdbc-demo/src/main/resources/logback.xml
b/samples/doris-demo/spring-jdbc-demo/src/main/resources/logback.xml
index e7a4665..e62c930 100644
--- a/samples/doris-demo/spring-jdbc-demo/src/main/resources/logback.xml
+++ b/samples/doris-demo/spring-jdbc-demo/src/main/resources/logback.xml
@@ -18,37 +18,33 @@ specific language governing permissions and limitations
under the License.
-->
<configuration>
-
- <property name="log.path" value="./logs/" />
- <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level
%logger{20} - [%method,%line] - %msg%n" />
- <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- </appender>
-
-
- <appender name="file_info"
class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/sys-info.log</file>
- <rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <property name="log.path" value="./logs/"/>
+ <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level
%logger{20} - [%method,%line] - %msg%n"/>
+ <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>${log.pattern}</pattern>
+ </encoder>
+ </appender>
+ <appender name="file_info"
class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.path}/sys-info.log</file>
+ <rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+
<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <maxHistory>60</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${log.pattern}</pattern>
+ </encoder>
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>INFO</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
- </appender>
-
- <appender name="file_error"
class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/sys-error.log</file>
+ </appender>
+ <appender name="file_error"
class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.path}/sys-error.log</file>
<rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
- <maxHistory>60</maxHistory>
+ <maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
@@ -59,9 +55,8 @@ under the License.
<onMismatch>DENY</onMismatch>
</filter>
</appender>
-
<appender name="sys-user"
class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/sys-user.log</file>
+ <file>${log.path}/sys-user.log</file>
<rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
<maxHistory>60</maxHistory>
@@ -70,18 +65,15 @@ under the License.
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
-
- <logger name="com.apache.doris.demo" level="info" />
- <logger name="org.springframework" level="warn" />
+ <logger name="com.apache.doris.demo" level="info"/>
+ <logger name="org.springframework" level="warn"/>
<root level="info">
- <appender-ref ref="console" />
+ <appender-ref ref="console"/>
</root>
-
<root level="info">
- <appender-ref ref="file_info" />
- <appender-ref ref="file_error" />
+ <appender-ref ref="file_info"/>
+ <appender-ref ref="file_error"/>
</root>
-
<logger name="sys-user" level="info">
<appender-ref ref="sys-user"/>
</logger>
diff --git
a/samples/doris-demo/spring-jdbc-demo/src/main/resources/mybatis/DemoMapper.xml
b/samples/doris-demo/spring-jdbc-demo/src/main/resources/mybatis/DemoMapper.xml
index bcd3897..37a9fc6 100644
---
a/samples/doris-demo/spring-jdbc-demo/src/main/resources/mybatis/DemoMapper.xml
+++
b/samples/doris-demo/spring-jdbc-demo/src/main/resources/mybatis/DemoMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,11 +17,10 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"; >
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd";>
<mapper namespace="org.apache.doris.demo.spring.mapper.DemoMapper">
-
<select id="selectSkuList" parameterType="java.util.Map"
resultType="java.util.Map">
- select id,number,price,skuname,skudesc from doris_test_sink
+ select id,number,price,skuname,skudesc from doris_test_sink
<where>
<if test="skuId !='' and skuId != null">
id=#{skuId}
diff --git
a/samples/doris-demo/spring-jdbc-demo/src/main/resources/mybatis/mybatis-config.xml
b/samples/doris-demo/spring-jdbc-demo/src/main/resources/mybatis/mybatis-config.xml
index c268992..4fa684e 100644
---
a/samples/doris-demo/spring-jdbc-demo/src/main/resources/mybatis/mybatis-config.xml
+++
b/samples/doris-demo/spring-jdbc-demo/src/main/resources/mybatis/mybatis-config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,16 +17,12 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE configuration
-PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-config.dtd";>
+<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-config.dtd";>
<configuration>
-
- <settings>
- <setting name="cacheEnabled" value="true" />
- <setting name="useGeneratedKeys" value="true" />
- <setting name="defaultExecutorType" value="REUSE" />
- <setting name="logImpl" value="SLF4J" />
- </settings>
-
+ <settings>
+ <setting name="cacheEnabled" value="true"/>
+ <setting name="useGeneratedKeys" value="true"/>
+ <setting name="defaultExecutorType" value="REUSE"/>
+ <setting name="logImpl" value="SLF4J"/>
+ </settings>
</configuration>
diff --git a/samples/doris-demo/stream-load-demo/pom.xml
b/samples/doris-demo/stream-load-demo/pom.xml
index c1421d5..3800c75 100644
--- a/samples/doris-demo/stream-load-demo/pom.xml
+++ b/samples/doris-demo/stream-load-demo/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<artifactId>doris-demo</artifactId>
@@ -25,18 +25,14 @@ under the License.
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
-
<artifactId>stream-load-demo</artifactId>
-
<name>stream-load-demo</name>
<!-- FIXME change it to the project's website -->
<url>http://www.example.com</url>
-
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
-
<build>
<plugins>
<plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
