diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index cd00f0d973..261d6c4519 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -58,15 +58,23 @@ jobs: - name: Build spark connector v2 run: | thrift --version - cd extension/spark-doris-connector/ && /bin/bash build.sh 2 + cd extension/spark-doris-connector/ && /bin/bash build.sh 2.3.4 2.11 - name: Build spark connector v3 run: | - cd extension/spark-doris-connector/ && /bin/bash build.sh 3 + cd extension/spark-doris-connector/ && /bin/bash build.sh 3.1.2 2.12 - - name: Build flink connector + - name: Build flink connector 1.11 run: | - cd extension/flink-doris-connector/ && /bin/bash build.sh + cd extension/flink-doris-connector/ && /bin/bash build.sh 1.11.6 2.12 + + - name: Build flink connector 1.12 + run: | + cd extension/flink-doris-connector/ && /bin/bash build.sh 1.12.7 2.12 + + - name: Build flink connector 1.13 + run: | + cd extension/flink-doris-connector/ && /bin/bash build.sh 1.13.5 2.12 - name: Build docs run: | diff --git a/docs/.vuepress/sidebar/en.js b/docs/.vuepress/sidebar/en.js index ef46dd452f..67fb94b558 100644 --- a/docs/.vuepress/sidebar/en.js +++ b/docs/.vuepress/sidebar/en.js @@ -683,6 +683,7 @@ module.exports = [ "subscribe-mail-list", "feedback", "how-to-contribute", + "how-to-deploy-to-maven", "committer-guide", "commit-format-specification", "pull-request", diff --git a/docs/.vuepress/sidebar/zh-CN.js b/docs/.vuepress/sidebar/zh-CN.js index 0677234f6f..cad1f6bb0f 100644 --- a/docs/.vuepress/sidebar/zh-CN.js +++ b/docs/.vuepress/sidebar/zh-CN.js @@ -687,6 +687,7 @@ module.exports = [ "subscribe-mail-list", "feedback", "how-to-contribute", + "how-to-deploy-to-maven", "committer-guide", "commit-format-specification", "pull-request", diff --git a/docs/en/community/how-to-deploy-to-maven.md b/docs/en/community/how-to-deploy-to-maven.md new file mode 100644 index 0000000000..18f538f73b --- /dev/null +++ b/docs/en/community/how-to-deploy-to-maven.md @@ -0,0 +1,107 @@ +--- +{ +"title": "How to deploy to Maven Central Repository", +"language": "en" +} +--- + + + +## Prepare + +### 0. Requirements + +1. apache account ID +2. apache password +3. gpg key + +### 1. Prepare the local maven environment + +1. Generate the master password: `mvn --encrypt-master-password ` This password is only used to encrypt other subsequent passwords, and the output is similar to `{VSb+6+76djkH/43...}` and then create` ~/.m2/settings-security.xml` file, the content is + + ``` + + {VSb+6+76djkH/43...} + + ``` + +2. Encrypt apache password: `mvn --encrypt-password ` This password is the password of the apache account. The output is similar to the above `{GRKbCylpwysHfV...}` and added in `~/.m2/settings.xml` + ``` + + + + apache.snapshots.https + yangzhg + {GRKbCylpwysHfV...} + + + + apache.releases.https + yangzhg + {GRKbCylpwysHfV...} + + + ``` + +3. Optional, (you can also pass -Darguments="-Dgpg.passphrase=xxxx" during deployment), add the following content in `~/.m2/settings.xml`, if the profiles tag already exists, this is only required Just add profile to profiles, activeProfiles is the same as above, xxxx is the passphrase of the gpg key + ``` + + + gpg + + gpg + xxxx + + + + + gpg + + ``` +### Publish to SNAPSHOT +### 1. Deploy flink connector + +Switch to the flink connector directory, let’s take flink version 1.11.6 and scalar 2.12 as examples + + ``` + cd incubator-doris/extension/flink-doris-connector + 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 + ``` + + + +### 2. Deploy Spark connector + +Switch to the spark connector directory, let’s take spark version 2.3.4 and scalar 2.11 as examples + + ``` + cd incubator-doris/extension/spark-doris-connector + 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 + ``` diff --git a/docs/en/extending-doris/flink-doris-connector.md b/docs/en/extending-doris/flink-doris-connector.md index 91744ac5a0..4e4b0fede4 100644 --- a/docs/en/extending-doris/flink-doris-connector.md +++ b/docs/en/extending-doris/flink-doris-connector.md @@ -34,8 +34,9 @@ Flink Doris Connector can support read and write data stored in Doris through Fl | Connector | Flink | Doris | Java | Scala | | --------- | ----- | ------ | ---- | ----- | -| 1.0.0 | 1.11.2 | 0.13+ | 8 | 2.12 | -| 1.0.0 | 1.13.x | 0.13.+ | 8 | 2.12 | +| 1.11.6-2.12-xx | 1.11.x | 0.13+ | 8 | 2.12 | +| 1.12.7-2.12-xx | 1.12.x | 0.13.+ | 8 | 2.12 | +| 1.13.5-2.12-xx | 1.13.x | 0.13.+ | 8 | 2.12 | **For Flink 1.13.x version adaptation issues** @@ -63,7 +64,7 @@ Execute following command in dir `extension/flink-doris-connector/`: 2. It is recommended to compile under the docker compile environment `apache/incubator-doris:build-env-1.2` of doris, because the JDK version below 1.3 is 11, there will be compilation problems. ```bash -sh build.sh +sh build.sh 1.11.6 2.12 # flink 1.11.6 scala 2.12 ``` After successful compilation, the file `doris-flink-1.0.0-SNAPSHOT.jar` will be generated in the `output/` directory. Copy this file to `ClassPath` in `Flink` to use `Flink-Doris-Connector`. For example, `Flink` running in `Local` mode, put this file in the `jars/` folder. `Flink` running in `Yarn` cluster mode, put this file in the pre-deployment package. @@ -78,6 +79,21 @@ conf/fe.conf ``` enable_http_server_v2 = true ``` +## Using Maven + +Add Dependency + +``` + + org.apache.doris + doris-flink-connector + 1.11.6-2.12-SNAPSHOT + +``` + +**Remarks** + +`1.11.6 ` can be substitute with `1.12.7` or `1.13.5` base on flink version you are using ## How to use diff --git a/docs/en/extending-doris/spark-doris-connector.md b/docs/en/extending-doris/spark-doris-connector.md index c875882016..60a8f4259b 100644 --- a/docs/en/extending-doris/spark-doris-connector.md +++ b/docs/en/extending-doris/spark-doris-connector.md @@ -35,10 +35,11 @@ Spark Doris Connector can support reading data stored in Doris and writing data ## Version Compatibility -| Connector | Spark | Doris | Java | Scala | -| --------- | ----- | ------ | ---- | ----- | -| 1.0.0 | 2.x | 0.12+ | 8 | 2.11 | -| 1.0.0 | 3.x | 0.12.+ | 8 | 2.12 | +| Connector | Spark | Doris | Java | Scala | +|---------------| ----- | ------ | ---- | ----- | +| 2.3.4-2.11.xx | 2.x | 0.12+ | 8 | 2.11 | +| 3.1.2-2.12.xx | 3.x | 0.12.+ | 8 | 2.12 | + ## Build and Install @@ -51,12 +52,28 @@ Execute following command in dir `extension/spark-doris-connector/`: 2. It is recommended to compile under the docker compile environment `apache/incubator-doris:build-env-1.2` of doris, because the JDK version below 1.3 is 11, there will be compilation problems. ```bash -sh build.sh 3 ## spark 3.x version, the default is 3.1.2 -sh build.sh 2 ## soark 2.x version, the default is 2.3.4 +sh build.sh 2.3.4 2.11 ## spark 2.3.4 version, and scala 2.11 +sh build.sh 3.1.2 2.12 ## spark 3.1.2 version, and scala 2.12 ``` After successful compilation, the file `doris-spark-1.0.0-SNAPSHOT.jar` will be generated in the `output/` directory. Copy this file to `ClassPath` in `Spark` to use `Spark-Doris-Connector`. For example, `Spark` running in `Local` mode, put this file in the `jars/` folder. `Spark` running in `Yarn` cluster mode, put this file in the pre-deployment package. +## Using Maven + +Add dependency +``` + + org.apache.doris + doris-spark-connector + 2.3.4-2.11-SNAPSHOT + +``` + +**Remark** + +`2.3.4-2.11` can be repacled with `3.1.2-2.12` base on you spark and scala version + + ## Example ### Read diff --git a/docs/zh-CN/community/how-to-deploy-to-maven.md b/docs/zh-CN/community/how-to-deploy-to-maven.md new file mode 100644 index 0000000000..dd9c34af33 --- /dev/null +++ b/docs/zh-CN/community/how-to-deploy-to-maven.md @@ -0,0 +1,109 @@ +--- +{ +"title": "如何部署到Maven 仓库", +"language": "zh-CN" +} +--- + + + +## 准备 + +### 0. Requirements + +1. apache 账号ID +2. apache 账号密码 +3. gpg key + +### 1. 准备本地maven 环境 + +1. 生成主密码: `mvn --encrypt-master-password ` 这个密码仅用作加密后续的其他密码使用, 输出类似 `{VSb+6+76djkH/43...}` 之后创建 `~/.m2/settings-security.xml` 文件,内容是 + + ``` + + {VSb+6+76djkH/43...} + + ``` + +2. 加密 apache 密码: `mvn --encrypt-password ` 这个密码是apache 账号的密码 输出和上面类似`{GRKbCylpwysHfV...}` 在`~/.m2/settings.xml` 中加入 + + ``` + + + + apache.snapshots.https + yangzhg + {GRKbCylpwysHfV...} + + + + apache.releases.https + yangzhg + {GRKbCylpwysHfV...} + + + ``` + +3. 可选,(也可以在部署时传递-Darguments="-Dgpg.passphrase=xxxx"),在`~/.m2/settings.xml` 中加入如下内容,如果已经存在profiles 标签, 这只需要将profile 加入profiles 中即可,activeProfiles 同上, xxxx 是gpg 密钥的passphrase + + ``` + + + gpg + + gpg + xxxx + + + + + gpg + + ``` +### 发布到SNAPSHOT +### 1. 部署 flink connector + +切换到 flink connector 目录, 我们以 flink 版本 1.11.6, scalar 2.12 为例 + + ``` + cd incubator-doris/extension/flink-doris-connector + 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 + ``` + + + +### 2. 部署 Spark connector + +切换到 spark connector 目录, 我们以 spark 版本 2.3.4, scalar 2.11 为例 + + ``` + cd incubator-doris/extension/spark-doris-connector + 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 + ``` diff --git a/docs/zh-CN/extending-doris/flink-doris-connector.md b/docs/zh-CN/extending-doris/flink-doris-connector.md index d5a2123d05..0238788cca 100644 --- a/docs/zh-CN/extending-doris/flink-doris-connector.md +++ b/docs/zh-CN/extending-doris/flink-doris-connector.md @@ -36,8 +36,9 @@ Flink Doris Connector 可以支持通过 Flink 读写 Doris 中存储的数据 | Connector | Flink | Doris | Java | Scala | | --------- | ----- | ------ | ---- | ----- | -| 1.0.0 | 1.11.x , 1.12.x | 0.13+ | 8 | 2.12 | -| 1.0.0 | 1.13.x | 0.13.+ | 8 | 2.12 | +| 1.11.6-2.12-xx | 1.11.x | 0.13+ | 8 | 2.12 | +| 1.12.7-2.12-xx | 1.12.x | 0.13.+ | 8 | 2.12 | +| 1.13.5-2.12-xx | 1.13.x | 0.13.+ | 8 | 2.12 | **针对Flink 1.13.x版本适配问题** @@ -65,10 +66,10 @@ Flink Doris Connector 可以支持通过 Flink 读写 Doris 中存储的数据 2. 建议在 doris 的 docker 编译环境 `apache/incubator-doris:build-env-1.2` 下进行编译,因为 1.3 下面的JDK 版本是 11,会存在编译问题。 ```bash -sh build.sh +sh build.sh 1.11.6 2.12 # flink 1.11.6 scala 2.12 ``` -编译成功后,会在 `output/` 目录下生成文件 `doris-flink-1.0.0-SNAPSHOT.jar` 。将此文件复制到 `Flink` 的 `ClassPath` 中即可使用 `Flink-Doris-Connector` 。例如, `Local` 模式运行的 `Flink` ,将此文件放入 `jars/` 文件夹下。 `Yarn` 集群模式运行的 `Flink` ,则将此文件放入预部署包中。: +编译成功后,会在 `output/` 目录下生成文件 `doris-flink-1.0.0-SNAPSHOT.jar` 。将此文件复制到 `Flink` 的 `ClassPath` 中即可使用 `Flink-Doris-Connector` 。例如, `Local` 模式运行的 `Flink` ,将此文件放入 `jars/` 文件夹下。 `Yarn` 集群模式运行的 `Flink` ,则将此文件放入预部署包中。 **备注** @@ -81,6 +82,24 @@ conf/fe.conf enable_http_server_v2 = true ``` +## 使用Maven 管理 + +添加 maven 依赖 + +``` + + org.apache.doris + doris-flink-connector + 1.11.6-2.12-SNAPSHOT + +``` + +**备注** + +`1.11.6 ` 可以根据flink 版本替换成替换成 `1.12.7` 或者 `1.13.5` + + + ## 使用方法 Flink读写Doris数据主要有三种方式 @@ -322,3 +341,4 @@ outputFormat.close(); | DECIMALV2 | DECIMAL | | TIME | DOUBLE | | HLL | Unsupported datatype | + diff --git a/docs/zh-CN/extending-doris/spark-doris-connector.md b/docs/zh-CN/extending-doris/spark-doris-connector.md index cdb6ed824f..d6a422b3b3 100644 --- a/docs/zh-CN/extending-doris/spark-doris-connector.md +++ b/docs/zh-CN/extending-doris/spark-doris-connector.md @@ -35,10 +35,10 @@ Spark Doris Connector 可以支持通过 Spark 读取 Doris 中存储的数据 ## 版本兼容 -| Connector | Spark | Doris | Java | Scala | -| --------- | ----- | ------ | ---- | ----- | -| 1.0.0 | 2.x | 0.12+ | 8 | 2.11 | -| 1.0.0 | 3.x | 0.12.+ | 8 | 2.12 | +| Connector | Spark | Doris | Java | Scala | +|---------------| ----- | ------ | ---- | ----- | +| 2.3.4-2.11.xx | 2.x | 0.12+ | 8 | 2.11 | +| 3.1.2-2.12.xx | 3.x | 0.12.+ | 8 | 2.12 | ## 编译与安装 @@ -51,12 +51,28 @@ Spark Doris Connector 可以支持通过 Spark 读取 Doris 中存储的数据 2. 建议在 doris 的 docker 编译环境 `apache/incubator-doris:build-env-1.2` 下进行编译,因为 1.3 下面的JDK 版本是 11,会存在编译问题。 ```bash -sh build.sh 3 ## spark 3.x版本,默认是3.1.2 -sh build.sh 2 ## spark 2.x版本,默认是2.3.4 +sh build.sh 2.3.4 2.11 ## spark 2.3.4, scala 2.11 +sh build.sh 3.1.2 2.12 ## spark 3.1.2, scala 2.12 + ``` 编译成功后,会在 `output/` 目录下生成文件 `doris-spark-1.0.0-SNAPSHOT.jar`。将此文件复制到 `Spark` 的 `ClassPath` 中即可使用 `Spark-Doris-Connector`。例如,`Local` 模式运行的 `Spark`,将此文件放入 `jars/` 文件夹下。`Yarn`集群模式运行的`Spark`,则将此文件放入预部署包中。 +## 使用Maven管理 + +添加依赖 +``` + + org.apache.doris + doris-spark-connector + 2.3.4-2.11-SNAPSHOT + +``` + +**注意** + +`2.3.4-2.11` 可以根据spark和scala 版本替换成 `3.1.2-2.12` + ## 使用示例 ### 读取 diff --git a/extension/flink-doris-connector/build.sh b/extension/flink-doris-connector/build.sh index e66a654576..d363dae24a 100644 --- a/extension/flink-doris-connector/build.sh +++ b/extension/flink-doris-connector/build.sh @@ -25,23 +25,49 @@ set -eo pipefail -ROOT=`dirname "$0"` -ROOT=`cd "$ROOT"; pwd` +usage() { + echo " + Usage: + $0 flink_version scala_version + e.g.: + $0 1.11.6 2.12 + $0 1.12.7 2.12 + $0 1.13.5 2.12 + " + exit 1 +} + +if [ $# -ne 2 ]; then + usage +fi + +ROOT=$(dirname "$0") +ROOT=$( + cd "$ROOT" + pwd +) export DORIS_HOME=${ROOT}/../../ -. ${DORIS_HOME}/env.sh +. "${DORIS_HOME}"/env.sh # include custom environment variables if [[ -f ${DORIS_HOME}/custom_env.sh ]]; then - . ${DORIS_HOME}/custom_env.sh + . "${DORIS_HOME}"/custom_env.sh fi # check maven MVN_CMD=mvn -if [[ ! -z ${CUSTOM_MVN} ]]; then +if [[ -n ${CUSTOM_MVN} ]]; then MVN_CMD=${CUSTOM_MVN} fi + +if [ -z "$1" ]; then + export FLINK_VERSION="$1" +fi +if [ -z "$2" ]; then + export SCALA_VERSION="$2" +fi if ! ${MVN_CMD} --version; then echo "Error: mvn is not found" exit 1 @@ -50,7 +76,6 @@ export MVN_CMD rm -rf output/ ${MVN_CMD} clean package - mkdir -p output/ cp target/doris-flink-*.jar ./output/ @@ -59,4 +84,3 @@ echo "Successfully build Flink-Doris-Connector" echo "*****************************************" exit 0 - diff --git a/extension/flink-doris-connector/pom.xml b/extension/flink-doris-connector/pom.xml index 3baae4b450..a819733eab 100644 --- a/extension/flink-doris-connector/pom.xml +++ b/extension/flink-doris-connector/pom.xml @@ -19,18 +19,18 @@ specific language governing permissions and limitations under the License. --> - 4.0.0 org.apache apache - 18 + 23 org.apache.doris doris-flink-connector - flink-${flink.version}-${scala.version}-SNAPSHOT + ${flink.version}-${scala.version}-1.0.0-SNAPSHOT Doris Flink Connector https://doris.apache.org/ @@ -67,8 +67,8 @@ under the License. - 2.12 - 1.11.2 + ${env.SCALA_VERSION} + ${env.FLINK_VERSION} 0.13.0 5.0.0 3.8.1 @@ -113,6 +113,30 @@ under the License. + + fink-version + + true + + !env.FLINK_VERSION + + + + 1.11.6 + + + + scala-version + + true + + !env.SCALA_VERSION + + + + 2.12 + + @@ -391,9 +415,9 @@ under the License. maven-javadoc-plugin ${maven-javadoc-plugin.version} + true 8 false - true diff --git a/extension/spark-doris-connector/build.sh b/extension/spark-doris-connector/build.sh index 9fe907c502..d747ba358e 100755 --- a/extension/spark-doris-connector/build.sh +++ b/extension/spark-doris-connector/build.sh @@ -25,23 +25,38 @@ set -eo pipefail -ROOT=`dirname "$0"` -ROOT=`cd "$ROOT"; pwd` +usage() { + echo " + Usage: + $0 spark_version scala_version + e.g.: + $0 2.3.4 2.11 + $0 3.1.2 2.12 + " + exit 1 +} + +if [ $# -ne 2 ]; then + usage +fi + +ROOT=$(dirname "$0") +ROOT=$(cd "$ROOT"; pwd) export DORIS_HOME=${ROOT}/../../ export PATH=${DORIS_THIRDPARTY}/installed/bin:$PATH -. ${DORIS_HOME}/env.sh +. "${DORIS_HOME}"/env.sh # include custom environment variables if [[ -f ${DORIS_HOME}/custom_env.sh ]]; then - . ${DORIS_HOME}/custom_env.sh + . "${DORIS_HOME}"/custom_env.sh fi # check maven MVN_CMD=mvn -if [[ ! -z ${CUSTOM_MVN} ]]; then +if [[ -n ${CUSTOM_MVN} ]]; then MVN_CMD=${CUSTOM_MVN} fi if ! ${MVN_CMD} --version; then @@ -50,29 +65,15 @@ if ! ${MVN_CMD} --version; then fi export MVN_CMD -usage() { - echo " - Eg. - $0 2 build with spark 2.x - $0 3 build with spark 3.x - " - exit 1 -} - -if [ $# == 0 ]; then - usage -fi - rm -rf output/ -if [ "$1"x == "3x" ] -then - ${MVN_CMD} clean package -f pom_3.0.xml +if [ -z "$1" ]; then + export SPARK_VERSION="$1" fi -if [ "$1"x == "2x" ] -then - ${MVN_CMD} clean package +if [ -z "$2" ]; then + export SCALA_VERSION="$2" fi +${MVN_CMD} clean package mkdir -p output/ cp target/doris-spark-*.jar ./output/ diff --git a/extension/spark-doris-connector/pom.xml b/extension/spark-doris-connector/pom.xml index b62f1930f8..a4f2e9c989 100644 --- a/extension/spark-doris-connector/pom.xml +++ b/extension/spark-doris-connector/pom.xml @@ -19,18 +19,18 @@ under the License. --> - 4.0.0 org.apache apache - 18 + 23 org.apache.doris doris-spark-connector - ${spark.version}-${scala.version}-SNAPSHOT + ${spark.version}-${scala.version}-1.0.0-SNAPSHOT Doris Spark Connector https://doris.apache.org/ @@ -68,8 +68,8 @@ - 2.11 - 2.3.4 + ${env.SCALA_VERSION} + ${env.SPARK_VERSION} 0.13.0 5.0.0 3.8.1 @@ -103,7 +103,30 @@ - + + spark-version + + true + + !env.SPARK_VERSION + + + + 2.3.4 + + + + scala-version + + true + + !env.SCALA_VERSION + + + + 2.11 + + general-env @@ -338,9 +361,9 @@ maven-javadoc-plugin ${maven-javadoc-plugin.version} + true 8 false - true diff --git a/extension/spark-doris-connector/pom_3.0.xml b/extension/spark-doris-connector/pom_3.0.xml deleted file mode 100644 index 3de08730e5..0000000000 --- a/extension/spark-doris-connector/pom_3.0.xml +++ /dev/null @@ -1,372 +0,0 @@ - - - - - - 4.0.0 - - org.apache - apache - 18 - - org.apache - 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 - 3.1.2 - 0.13.0 - 5.0.0 - 3.8.1 - 3.3.0 - 3.2.1 - UTF-8 - ${env.DORIS_THIRDPARTY} - - - - - - custom-env - - - env.CUSTOM_MAVEN_REPO - - - - - - custom-nexus - ${env.CUSTOM_MAVEN_REPO} - - - - - - custom-nexus - ${env.CUSTOM_MAVEN_REPO} - - - - - - - general-env - - - !env.CUSTOM_MAVEN_REPO - - - - - - central - central maven repo https - https://repo.maven.apache.org/maven2 - - - - - - - - org.apache.spark - spark-core_${scala.version} - ${spark.version} - provided - - - org.apache.spark - spark-sql_${scala.version} - ${spark.version} - provided - - - org.apache.thrift - libthrift - ${libthrift.version} - - - org.apache.arrow - arrow-vector - ${arrow.version} - - - org.apache.arrow - arrow-memory-netty - ${arrow.version} - runtime - - - - org.hamcrest - hamcrest-core - 1.3 - test - - - org.mockito - mockito-scala_${scala.version} - 1.4.7 - - - hamcrest-core - org.hamcrest - - - test - - - junit - junit - 4.11 - - - hamcrest-core - org.hamcrest - - - test - - - com.fasterxml.jackson.core - jackson-databind - 2.10.0 - - - - com.fasterxml.jackson.core - jackson-core - 2.10.0 - - - io.netty - netty-all - 4.1.27.Final - provided - - - junit - junit - 4.12 - test - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.2.0 - - - add-source - generate-sources - - add-source - - - - - ${project.build.directory}/generated-sources/thrift/ - - - - - - - org.apache.thrift.tools - maven-thrift-plugin - 0.1.11 - - ${doris.thirdparty}/installed/bin/thrift - java:fullcamel - - - - thrift-sources - generate-sources - - compile - - - - - - net.alchim31.maven - scala-maven-plugin - 3.2.1 - - - scala-compile-first - process-resources - - compile - - - - scala-test-compile - process-test-resources - - testCompile - - - - - - -feature - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - - - com.google.code.findbugs:* - org.slf4j:* - - - - - org.apache.arrow - org.apache.doris.shaded.org.apache.arrow - - - io.netty - org.apache.doris.shaded.io.netty - - - com.fasterxml.jackson - org.apache.doris.shaded.com.fasterxml.jackson - - - org.apache.commons.codec - org.apache.doris.shaded.org.apache.commons.codec - - - com.google.flatbuffers - org.apache.doris.shaded.com.google.flatbuffers - - - org.apache.thrift - org.apache.doris.shaded.org.apache.thrift - - - - - - package - - shade - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 8 - 8 - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - 8 - false - true - - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - - true - - - - compile - - jar - - - - - - - - diff --git a/fe/fe-common/pom.xml b/fe/fe-common/pom.xml index 847afecd06..06b4324962 100644 --- a/fe/fe-common/pom.xml +++ b/fe/fe-common/pom.xml @@ -19,8 +19,8 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 @@ -164,6 +164,13 @@ under the License. + + org.apache.maven.plugins + maven-javadoc-plugin + + true + + org.apache.maven.plugins diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml index 4905a7aed6..29d30ec33b 100644 --- a/fe/fe-core/pom.xml +++ b/fe/fe-core/pom.xml @@ -19,7 +19,7 @@ specific language governing permissions and limitations under the License. --> - 4.0.0 @@ -665,7 +665,7 @@ under the License. core provided - + org.apache.hadoop @@ -739,6 +739,13 @@ under the License. + + org.apache.maven.plugins + maven-javadoc-plugin + + true + + diff --git a/fe/pom.xml b/fe/pom.xml index 258516e19b..3c572d57eb 100644 --- a/fe/pom.xml +++ b/fe/pom.xml @@ -19,13 +19,13 @@ specific language governing permissions and limitations under the License. --> - 4.0.0 org.apache apache - 18 + 23 org.apache.doris diff --git a/fe/spark-dpp/pom.xml b/fe/spark-dpp/pom.xml index 0da408cf08..300ea4f964 100644 --- a/fe/spark-dpp/pom.xml +++ b/fe/spark-dpp/pom.xml @@ -19,8 +19,8 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 @@ -103,7 +103,7 @@ under the License. provided - + org.apache.spark spark-sql_2.12 @@ -308,7 +308,13 @@ under the License. - + + org.apache.maven.plugins + maven-javadoc-plugin + + true + + diff --git a/fe_plugins/auditdemo/pom.xml b/fe_plugins/auditdemo/pom.xml index f09b78d71a..ea23076ead 100644 --- a/fe_plugins/auditdemo/pom.xml +++ b/fe_plugins/auditdemo/pom.xml @@ -36,7 +36,7 @@ under the License. org.apache.doris - fe + fe-core ${doris.version} diff --git a/fe_plugins/auditloader/pom.xml b/fe_plugins/auditloader/pom.xml index 2b37af9a61..e81ff6358c 100644 --- a/fe_plugins/auditloader/pom.xml +++ b/fe_plugins/auditloader/pom.xml @@ -36,7 +36,7 @@ under the License. org.apache.doris - fe + fe-core ${doris.version} diff --git a/fe_plugins/pom.xml b/fe_plugins/pom.xml index 9c7a5d4028..a7413560f2 100644 --- a/fe_plugins/pom.xml +++ b/fe_plugins/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache apache - 18 + 23 org.apache.doris @@ -73,9 +73,8 @@ under the License. - ${env.DORIS_HOME} 2.17.1 - >0.15-SNAPSHOT + 0.15-SNAPSHOT @@ -105,20 +104,6 @@ under the License. - - org.apache.doris - fe - 0.15-SNAPSHOT - system - ${doris.home}/fe/fe-core/target/palo-fe.jar - - - org.apache.doris - fe-common - system - ${doris.home}/fe/fe-common/target/doris-fe-common.jar - - org.apache.logging.log4j diff --git a/fs_brokers/apache_hdfs_broker/pom.xml b/fs_brokers/apache_hdfs_broker/pom.xml index f4d0bc50b5..d626b0512f 100644 --- a/fs_brokers/apache_hdfs_broker/pom.xml +++ b/fs_brokers/apache_hdfs_broker/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache apache - 18 + 23 org.apache.doris diff --git a/samples/connect/java/client/pom.xml b/samples/connect/java/client/pom.xml index 58a94c55e4..29050b1dc2 100644 --- a/samples/connect/java/client/pom.xml +++ b/samples/connect/java/client/pom.xml @@ -24,7 +24,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-client 0.0.1 jar