You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@yetus.apache.org by aa...@apache.org on 2020/06/25 01:45:35 UTC
[yetus] branch master updated: YETUS-972. Make javadoc phase and
goal configurable in maven.sh (#112)
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yetus.git
The following commit(s) were added to refs/heads/master by this push:
new f70b1e9 YETUS-972. Make javadoc phase and goal configurable in maven.sh (#112)
f70b1e9 is described below
commit f70b1e9e528041aee8feee35060d711bffcd4d27
Author: Akira Ajisaka <aa...@apache.org>
AuthorDate: Thu Jun 25 10:45:29 2020 +0900
YETUS-972. Make javadoc phase and goal configurable in maven.sh (#112)
Signed-off-by: Sean Busbey <bu...@apache.org>
---
precommit/src/main/shell/test-patch.d/maven.sh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/precommit/src/main/shell/test-patch.d/maven.sh b/precommit/src/main/shell/test-patch.d/maven.sh
index 9e8f735..77a69e8 100755
--- a/precommit/src/main/shell/test-patch.d/maven.sh
+++ b/precommit/src/main/shell/test-patch.d/maven.sh
@@ -26,6 +26,7 @@ MAVEN_CUSTOM_REPOS=false
MAVEN_CUSTOM_REPOS_DIR="@@@WORKSPACE@@@/yetus-m2"
MAVEN_DEPENDENCY_ORDER=true
MAVEN_FOUND_ROOT_POM=false
+MAVEN_JAVADOC_GOALS=("javadoc:javadoc")
add_test_type mvnsite
add_build_tool maven
@@ -80,6 +81,7 @@ function maven_usage
yetus_add_option "--mvn-custom-repos" "Use per-project maven repos"
yetus_add_option "--mvn-custom-repos-dir=dir" "Location of repos, default is '${MAVEN_CUSTOM_REPOS_DIR}'"
yetus_add_option "--mvn-deps-order=<bool>" "Disable maven's auto-dependency module ordering (Default: '${MAVEN_DEPENDENCY_ORDER}')"
+ yetus_add_option "--mvn-javadoc-goals=<list>" "The comma-separated javadoc goals (Default: 'javadoc:javadoc')"
yetus_add_option "--mvn-settings=file" "File to use for settings.xml"
}
@@ -109,6 +111,10 @@ function maven_parse_args
delete_parameter "${i}"
MAVEN_DEPENDENCY_ORDER=${i#*=}
;;
+ --mvn-javadoc-goals=*)
+ delete_parameter "${i}"
+ yetus_comma_to_array MAVEN_JAVADOC_GOALS "${i#*=}"
+ ;;
--mvn-settings=*)
delete_parameter "${i}"
MAVEN_SETTINGS=${i#*=}
@@ -335,7 +341,7 @@ function maven_modules_worker
modules_workers "${repostatus}" distclean clean -DskipTests=true
;;
javadoc)
- modules_workers "${repostatus}" javadoc clean javadoc:javadoc -DskipTests=true
+ modules_workers "${repostatus}" javadoc clean "${MAVEN_JAVADOC_GOALS[@]}" -DskipTests=true
;;
scaladoc)
modules_workers "${repostatus}" scaladoc clean scala:doc -DskipTests=true