This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new c0c9e709a85 [Fix][Enhancement] When build fe, support user custom
defined privite settings.xml (#30169)
c0c9e709a85 is described below
commit c0c9e709a853e76baeac9b9015474bb9dd3588fd
Author: Guangming Lu <71873108+luguangm...@users.noreply.github.com>
AuthorDate: Tue Jan 23 13:28:36 2024 +0800
[Fix][Enhancement] When build fe, support user custom defined privite
settings.xml (#30169)
---
build.sh | 13 +++++++++++--
docs/en/community/developer-guide/be-vscode-dev.md | 5 +++++
docs/zh-CN/community/developer-guide/be-vscode-dev.md | 5 +++++
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/build.sh b/build.sh
index 15f22b03a72..ca7f21e1c4d 100755
--- a/build.sh
+++ b/build.sh
@@ -586,9 +586,18 @@ if [[ "${FE_MODULES}" != '' ]]; then
clean_fe
fi
if [[ "${DISABLE_JAVA_CHECK_STYLE}" = "ON" ]]; then
- "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}} -Dskip.doc=true
-DskipTests -Dcheckstyle.skip=true
+ # Allowed user customer set env param USER_SETTINGS_MVN_REPO means
settings.xml file path
+ if [[ -n ${USER_SETTINGS_MVN_REPO} && -f ${USER_SETTINGS_MVN_REPO} ]];
then
+ "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}}
-Dskip.doc=true -DskipTests -Dcheckstyle.skip=true ${MVN_OPT:+${MVN_OPT}} -gs
"${USER_SETTINGS_MVN_REPO}"
+ else
+ "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}}
-Dskip.doc=true -DskipTests -Dcheckstyle.skip=true ${MVN_OPT:+${MVN_OPT}}
+ fi
else
- "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}} -Dskip.doc=true
-DskipTests
+ if [[ -n ${USER_SETTINGS_MVN_REPO} && -f ${USER_SETTINGS_MVN_REPO} ]];
then
+ "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}}
-Dskip.doc=true -DskipTests ${MVN_OPT:+${MVN_OPT}} -gs
"${USER_SETTINGS_MVN_REPO}"
+ else
+ "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}}
-Dskip.doc=true -DskipTests ${MVN_OPT:+${MVN_OPT}}
+ fi
fi
cd "${DORIS_HOME}"
fi
diff --git a/docs/en/community/developer-guide/be-vscode-dev.md
b/docs/en/community/developer-guide/be-vscode-dev.md
index 21a3e689cbd..e7964e2a3f7 100644
--- a/docs/en/community/developer-guide/be-vscode-dev.md
+++ b/docs/en/community/developer-guide/be-vscode-dev.md
@@ -93,6 +93,11 @@ Note: This compilation has the following instructions:
If nothing happens, the compilation should be successful, and the final
deployment file will be output to the /home/workspace/doris/output/ directory.
If you still encounter other problems, you can refer to the doris installation
document http://doris.apache.org.
+Note: If you want to specify the private maven repository address separately
when compiling fe, you can set the environment variable USER_SETTINGS_MVN_REPO
to specify the file path to settings.xml.
+Example:
+```
+ export USER_SETTINGS_MVN_REPO="/xxx/xxx/settings.xml"
+```
## Deployment and debugging(GDB)
1. Authorize be compilation result files
diff --git a/docs/zh-CN/community/developer-guide/be-vscode-dev.md
b/docs/zh-CN/community/developer-guide/be-vscode-dev.md
index eecc2437261..9244ac61ac2 100644
--- a/docs/zh-CN/community/developer-guide/be-vscode-dev.md
+++ b/docs/zh-CN/community/developer-guide/be-vscode-dev.md
@@ -92,6 +92,11 @@ cd /home/workspace/doris
如果不出意外，应该会编译成功，最终的部署文件将产出到 /home/workspace/doris/output/ 目录下。如果还遇到其他问题，可以参照
doris 的安装文档 http://doris.apache.org。
+注意：如果编译fe时希望单独指定私有的maven仓地址，可以设置环境变量USER_SETTINGS_MVN_REPO指定settings.xml的文件路径。
+举例：
+```
+ export USER_SETTINGS_MVN_REPO="/xxx/xxx/settings.xml"
+```
## 部署调试(GDB)
1. 给 be 编译结果文件授权
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
