diff --git a/.gitignore b/.gitignore index 5029d87c18..733aef30b3 100644 --- a/.gitignore +++ b/.gitignore @@ -18,18 +18,17 @@ thirdparty/installed .DS_Store *.iml core.* -extension/spark-doris-connector/.classpath -extension/spark-doris-connector/target -extension/flink-doris-connector/.classpath -extension/flink-doris-connector/target +extension/**/.classpath +extension/**/target + fe/log custom_env.sh ut_dir log/ -fe_plugins/*/target +fe_plugins/**/target fe_plugins/output fe/mocked -fe/*/target +fe/**/target dependency-reduced-pom.xml fe_plugins/**/.classpath fe_plugins/**/.factorypath diff --git a/build.sh b/build.sh index 72faec4ff5..a5ccaae5e8 100755 --- a/build.sh +++ b/build.sh @@ -42,12 +42,6 @@ export DORIS_HOME=${ROOT} . ${DORIS_HOME}/env.sh -# build thirdparty libraries if necessary -if [[ ! -f ${DORIS_THIRDPARTY}/installed/lib/libs2.a ]]; then - echo "Thirdparty libraries need to be build ..." - ${DORIS_THIRDPARTY}/build-thirdparty.sh -fi - # Check args usage() { echo " diff --git a/extension/flink-doris-connector/pom.xml b/extension/flink-doris-connector/pom.xml index 967d51d004..3baae4b450 100644 --- a/extension/flink-doris-connector/pom.xml +++ b/extension/flink-doris-connector/pom.xml @@ -23,11 +23,49 @@ under the License. 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"> 4.0.0 + + org.apache + apache + 18 + + org.apache.doris + doris-flink-connector + flink-${flink.version}-${scala.version}-SNAPSHOT + Doris Flink Connector + https://doris.apache.org/ + + + Apache 2.0 License + https://www.apache.org/licenses/LICENSE-2.0.html + repo + + + + scm:git:git@github.com:apache/incubator-doris.git + scm:git:git@github.com:apache/incubator-doris.git + scm:git:git@github.com:apache/incubator-doris.git + HEAD + + + GitHub + https://github.com/apache/incubator-doris/issues + - org.apache - doris-flink - 1.0.0-flink-${flink.version}_${scala.version} + + + Dev Mailing List + dev@doris.apache.org + dev-subscribe@doris.apache.org + dev-unsubscribe@doris.apache.org + + + Commits Mailing List + commits@doris.apache.org + commits-subscribe@doris.apache.org + commits-unsubscribe@doris.apache.org + + 2.12 1.11.2 @@ -306,13 +344,15 @@ under the License. + org.apache.maven.plugins maven-compiler-plugin diff --git a/extension/spark-doris-connector/pom.xml b/extension/spark-doris-connector/pom.xml index a030d928a7..b62f1930f8 100644 --- a/extension/spark-doris-connector/pom.xml +++ b/extension/spark-doris-connector/pom.xml @@ -23,10 +23,49 @@ 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"> 4.0.0 + + org.apache + apache + 18 + + org.apache.doris + doris-spark-connector + ${spark.version}-${scala.version}-SNAPSHOT + Doris Spark Connector + https://doris.apache.org/ + + + Apache 2.0 License + https://www.apache.org/licenses/LICENSE-2.0.html + repo + + + + scm:git:git@github.com:apache/incubator-doris.git + scm:git:git@github.com:apache/incubator-doris.git + scm:git:git@github.com:apache/incubator-doris.git + HEAD + + + GitHub + https://github.com/apache/incubator-doris/issues + - org.apache - doris-spark - 1.0.0-spark-${spark.version}_${scala.version} + + + Dev Mailing List + dev@doris.apache.org + dev-subscribe@doris.apache.org + dev-unsubscribe@doris.apache.org + + + + Commits Mailing List + commits@doris.apache.org + commits-subscribe@doris.apache.org + commits-unsubscribe@doris.apache.org + + 2.11 @@ -285,37 +324,6 @@ - - org.jacoco - jacoco-maven-plugin - 0.7.8 - - - **/thrift/** - - - - - prepare-agent - - prepare-agent - - - - check - - check - - - - report - test - - report - - - - org.apache.maven.plugins maven-compiler-plugin diff --git a/extension/spark-doris-connector/pom_3.0.xml b/extension/spark-doris-connector/pom_3.0.xml index e2aaded27a..3de08730e5 100644 --- a/extension/spark-doris-connector/pom_3.0.xml +++ b/extension/spark-doris-connector/pom_3.0.xml @@ -23,10 +23,49 @@ 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"> 4.0.0 - + + org.apache + apache + 18 + org.apache - doris-spark - 1.0.0-spark-${spark.version}_${scala.version} + doris-spark-connector + ${spark.version}-${scala.version}-SNAPSHOT + Doris Spark Connector + https://doris.apache.org/ + + + Apache 2.0 License + https://www.apache.org/licenses/LICENSE-2.0.html + repo + + + + scm:git:git@github.com:apache/incubator-doris.git + scm:git:git@github.com:apache/incubator-doris.git + scm:git:git@github.com:apache/incubator-doris.git + HEAD + + + GitHub + https://github.com/apache/incubator-doris/issues + + + + + Dev Mailing List + dev@doris.apache.org + dev-subscribe@doris.apache.org + dev-unsubscribe@doris.apache.org + + + + Commits Mailing List + commits@doris.apache.org + commits-subscribe@doris.apache.org + commits-unsubscribe@doris.apache.org + + 2.12 @@ -284,37 +323,6 @@ - - org.jacoco - jacoco-maven-plugin - 0.7.8 - - - **/thrift/** - - - - - prepare-agent - - prepare-agent - - - - check - - check - - - - report - test - - report - - - - org.apache.maven.plugins maven-compiler-plugin diff --git a/fe/fe-common/pom.xml b/fe/fe-common/pom.xml index 1adc8442a9..847afecd06 100644 --- a/fe/fe-common/pom.xml +++ b/fe/fe-common/pom.xml @@ -24,14 +24,14 @@ under the License. 4.0.0 - org.apache - doris-fe - 3.4.0 + org.apache.doris + ${revision} + fe ../pom.xml - doris-fe-common - 1.0.0 + fe-common + ${revision} jar @@ -94,6 +94,11 @@ under the License. org.roaringbitmap RoaringBitmap + + org.hamcrest + hamcrest + test + diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml index 1107039242..698592a03f 100644 --- a/fe/fe-core/pom.xml +++ b/fe/fe-core/pom.xml @@ -24,14 +24,14 @@ under the License. 4.0.0 - org.apache - doris-fe - 3.4.0 + org.apache.doris + ${revision} + fe ../pom.xml fe-core - 3.4.0 + ${revision} jar @@ -66,10 +66,28 @@ under the License. + + + + org.springframework.boot + spring-boot-dependencies + 2.6.2 + pom + import + + + - org.apache - doris-fe-common + ${project.groupId} + fe-common + ${project.version} + + + + ${project.groupId} + spark-dpp + ${project.version} @@ -89,7 +107,6 @@ under the License. org.springframework.boot spring-boot-starter-data-ldap - 2.3.3.RELEASE @@ -98,11 +115,6 @@ under the License. 1.5.1 - - org.apache - spark-dpp - - cglib @@ -274,6 +286,7 @@ under the License. org.slf4j slf4j-log4j12 + 1.7.9 diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJobInfo.java b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJobInfo.java index 4c7f6f52a8..ce5cf516d6 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJobInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJobInfo.java @@ -40,6 +40,7 @@ import org.apache.doris.persist.gson.GsonUtils; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -61,7 +62,6 @@ import java.util.Set; import com.google.gson.Gson; import com.google.gson.annotations.SerializedName; -import org.glassfish.jersey.internal.guava.Sets; /* * This is a memory structure mapping the job info file in repository. diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/profile/MultiProfileTreeBuilder.java b/fe/fe-core/src/main/java/org/apache/doris/common/profile/MultiProfileTreeBuilder.java index c6d23e3fcb..fb4a16be88 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/profile/MultiProfileTreeBuilder.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/profile/MultiProfileTreeBuilder.java @@ -25,9 +25,9 @@ import org.apache.doris.common.util.RuntimeProfile; import com.clearspring.analytics.util.Lists; import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import org.apache.commons.lang3.tuple.Triple; -import org.glassfish.jersey.internal.guava.Sets; import java.util.List; import java.util.Map; diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/CommonUserProperties.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/CommonUserProperties.java index 6064a47f99..2b88909cd3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/CommonUserProperties.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/CommonUserProperties.java @@ -22,10 +22,9 @@ import org.apache.doris.common.io.Writable; import org.apache.doris.persist.gson.GsonUtils; import org.apache.doris.resource.Tag; +import com.google.common.collect.Sets; import com.google.gson.annotations.SerializedName; -import org.glassfish.jersey.internal.guava.Sets; - import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java index b429c72f0f..24c8bb6272 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java @@ -70,10 +70,10 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.glassfish.jersey.internal.guava.Sets; import java.util.ArrayList; import java.util.Collection; diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java index c519332e2e..ae0cb5d6ed 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java @@ -115,12 +115,12 @@ import org.apache.doris.transaction.TransactionStatus; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import com.google.protobuf.ByteString; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; -import org.glassfish.jersey.internal.guava.Sets; import java.io.IOException; import java.io.StringReader; diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/StmtExecutorTest.java b/fe/fe-core/src/test/java/org/apache/doris/qe/StmtExecutorTest.java index 506b08ca9d..64a041bc4e 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/qe/StmtExecutorTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/qe/StmtExecutorTest.java @@ -44,8 +44,8 @@ import org.apache.doris.thrift.TQueryOptions; import org.apache.doris.thrift.TUniqueId; import com.google.common.collect.Lists; +import com.google.common.collect.Sets; -import org.glassfish.jersey.internal.guava.Sets; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; diff --git a/fe/pom.xml b/fe/pom.xml index c5b6afa6b2..9c43360157 100644 --- a/fe/pom.xml +++ b/fe/pom.xml @@ -20,13 +20,53 @@ under the License. --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.apache + apache + 18 + - org.apache - doris-fe - 3.4.0 + org.apache.doris + fe + ${revision} pom + Doris FE Project Parent POM + https://doris.apache.org/ + + + Apache 2.0 License + https://www.apache.org/licenses/LICENSE-2.0.html + repo + + + + scm:git:git@github.com:apache/incubator-doris.git + scm:git:git@github.com:apache/incubator-doris.git + scm:git:git@github.com:apache/incubator-doris.git + HEAD + + + GitHub + https://github.com/apache/incubator-doris/issues + + + + + Dev Mailing List + dev@doris.apache.org + dev-subscribe@doris.apache.org + dev-unsubscribe@doris.apache.org + + + + Commits Mailing List + commits@doris.apache.org + commits-subscribe@doris.apache.org + commits-unsubscribe@doris.apache.org + + fe-common @@ -34,15 +74,6 @@ under the License. fe-core - doris-fe - https://github.com/apache/incubator-doris - - - org.springframework.boot - spring-boot-starter-parent - 2.2.13.RELEASE - - ${basedir}/../ UTF-8 @@ -55,6 +86,7 @@ under the License. 2.8.0 1.49 2.17.0 + 0.15-SNAPSHOT @@ -110,10 +142,6 @@ under the License. - - spring-plugins - https://repo.spring.io/plugins-release/ - cloudera-public @@ -126,15 +154,15 @@ under the License. - org.apache - doris-fe-common - 1.0.0 + ${project.groupId} + fe-common + ${project.version} - org.apache + ${project.groupId} spark-dpp - 1.0.0 + ${project.version} @@ -749,6 +777,11 @@ under the License. tree-printer 1.2 + + org.hamcrest + hamcrest + 2.1 + diff --git a/fe/spark-dpp/pom.xml b/fe/spark-dpp/pom.xml index b3396fffd6..0da408cf08 100644 --- a/fe/spark-dpp/pom.xml +++ b/fe/spark-dpp/pom.xml @@ -24,14 +24,14 @@ under the License. 4.0.0 - org.apache - doris-fe - 3.4.0 + org.apache.doris + ${revision} + fe ../pom.xml spark-dpp - 1.0.0 + ${revision} jar @@ -41,8 +41,9 @@ under the License. - org.apache - doris-fe-common + ${project.groupId} + fe-common + ${project.version} @@ -89,6 +90,7 @@ under the License. org.slf4j slf4j-log4j12 + 1.7.9 test @@ -164,7 +166,7 @@ under the License. - spark-dpp-${version} + spark-dpp-${project.version} diff --git a/fe_plugins/auditdemo/pom.xml b/fe_plugins/auditdemo/pom.xml index e9ff9b51e8..f09b78d71a 100644 --- a/fe_plugins/auditdemo/pom.xml +++ b/fe_plugins/auditdemo/pom.xml @@ -23,9 +23,10 @@ under the License. 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"> - org.apache - doris-fe-plugins + org.apache.doris + fe-plugins 1.0-SNAPSHOT + ../pom.xml 4.0.0 @@ -34,8 +35,9 @@ under the License. - org.apache - doris-fe + org.apache.doris + fe + ${doris.version} diff --git a/fe_plugins/auditloader/pom.xml b/fe_plugins/auditloader/pom.xml index 5d64673a35..2b37af9a61 100644 --- a/fe_plugins/auditloader/pom.xml +++ b/fe_plugins/auditloader/pom.xml @@ -23,9 +23,10 @@ under the License. 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"> - org.apache - doris-fe-plugins + org.apache.doris + fe-plugins 1.0-SNAPSHOT + ../pom.xml 4.0.0 @@ -34,12 +35,14 @@ under the License. - org.apache - doris-fe + org.apache.doris + fe + ${doris.version} - org.apache - doris-fe-common + org.apache.doris + fe-common + ${doris.version} diff --git a/fe_plugins/pom.xml b/fe_plugins/pom.xml index 05d79638ef..f102f7f506 100644 --- a/fe_plugins/pom.xml +++ b/fe_plugins/pom.xml @@ -22,11 +22,51 @@ under the License. 4.0.0 + + org.apache + apache + 18 + - org.apache - doris-fe-plugins + org.apache.doris + fe-plugins pom 1.0-SNAPSHOT + Doris Plugin Parent POM + https://doris.apache.org/ + + + Apache 2.0 License + https://www.apache.org/licenses/LICENSE-2.0.html + repo + + + + scm:git:git@github.com:apache/incubator-doris.git + scm:git:git@github.com:apache/incubator-doris.git + scm:git:git@github.com:apache/incubator-doris.git + HEAD + + + GitHub + https://github.com/apache/incubator-doris/issues + + + + + Dev Mailing List + dev@doris.apache.org + dev-subscribe@doris.apache.org + dev-unsubscribe@doris.apache.org + + + + Commits Mailing List + commits@doris.apache.org + commits-subscribe@doris.apache.org + commits-unsubscribe@doris.apache.org + + auditdemo auditloader @@ -35,6 +75,7 @@ under the License. ${env.DORIS_HOME} 2.17.0 + >0.15-SNAPSHOT @@ -65,16 +106,15 @@ under the License. - org.apache - doris-fe - 3.4.0 + org.apache.doris + fe + 0.15-SNAPSHOT system ${doris.home}/fe/fe-core/target/palo-fe.jar - org.apache - doris-fe-common - 1.0.0 + org.apache.doris + fe-common system ${doris.home}/fe/fe-common/target/doris-fe-common.jar diff --git a/fs_brokers/apache_hdfs_broker/pom.xml b/fs_brokers/apache_hdfs_broker/pom.xml index 02460c2570..1bb2c78c71 100644 --- a/fs_brokers/apache_hdfs_broker/pom.xml +++ b/fs_brokers/apache_hdfs_broker/pom.xml @@ -20,17 +20,54 @@ under the License. --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.apache + apache + 18 + - org.apache - doris-apache-hdfs-broker - 3.4.0 + org.apache.doris + apache-hdfs-broker + 0.15-SNAPSHOT jar - doris-apache-hdfs-broker - https://github.com/apache/incubator-doris + Doris HDFS Broker + https://doris.apache.org/ + + + Apache 2.0 License + https://www.apache.org/licenses/LICENSE-2.0.html + repo + + + + scm:git:git@github.com:apache/incubator-doris.git + scm:git:git@github.com:apache/incubator-doris.git + scm:git:git@github.com:apache/incubator-doris.git + HEAD + + + GitHub + https://github.com/apache/incubator-doris/issues + + + + Dev Mailing List + dev@doris.apache.org + dev-subscribe@doris.apache.org + dev-unsubscribe@doris.apache.org + + + + Commits Mailing List + commits@doris.apache.org + commits-subscribe@doris.apache.org + commits-unsubscribe@doris.apache.org + + ${basedir}/../../ UTF-8 diff --git a/samples/doris-demo/flink-demo/pom.xml b/samples/doris-demo/flink-demo/pom.xml index efe2b4cd14..5955f62de2 100644 --- a/samples/doris-demo/flink-demo/pom.xml +++ b/samples/doris-demo/flink-demo/pom.xml @@ -103,9 +103,8 @@ under the License. - org.apache - doris-flink - 1.0.0 + org.apache.doris + doris-flink-connector diff --git a/samples/doris-demo/pom.xml b/samples/doris-demo/pom.xml index b62b746063..759583246b 100644 --- a/samples/doris-demo/pom.xml +++ b/samples/doris-demo/pom.xml @@ -21,7 +21,7 @@ under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache + org.apache.doris doris-demo pom 1.0-SNAPSHOT diff --git a/samples/doris-demo/spark-demo/pom.xml b/samples/doris-demo/spark-demo/pom.xml index bd43cfe451..3ad0d72b66 100644 --- a/samples/doris-demo/spark-demo/pom.xml +++ b/samples/doris-demo/spark-demo/pom.xml @@ -22,7 +22,7 @@ under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> doris-demo - org.apache + org.apache.doris 1.0-SNAPSHOT 4.0.0 @@ -40,7 +40,7 @@ under the License. - org.apache + org.apache.doris doris-spark 1.0.0-SNAPSHOT diff --git a/samples/doris-demo/spring-jdbc-demo/pom.xml b/samples/doris-demo/spring-jdbc-demo/pom.xml index 5134c7ed08..f14efa4ee4 100644 --- a/samples/doris-demo/spring-jdbc-demo/pom.xml +++ b/samples/doris-demo/spring-jdbc-demo/pom.xml @@ -21,7 +21,7 @@ under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache + org.apache.doris spring-jdbc-demo 1.0-SNAPSHOT diff --git a/samples/doris-demo/stream-load-demo/pom.xml b/samples/doris-demo/stream-load-demo/pom.xml index a296036602..c1421d5d53 100644 --- a/samples/doris-demo/stream-load-demo/pom.xml +++ b/samples/doris-demo/stream-load-demo/pom.xml @@ -21,7 +21,7 @@ under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> doris-demo - org.apache + org.apache.doris 1.0-SNAPSHOT 4.0.0