You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by sh...@apache.org on 2022/07/07 23:54:35 UTC
[bookkeeper] branch master updated: Remove gradle usage from Javadoc gen script (#3386)
This is an automated email from the ASF dual-hosted git repository.
shoothzj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 65ffc4df75 Remove gradle usage from Javadoc gen script (#3386)
65ffc4df75 is described below
commit 65ffc4df75433c0ce7db0862447ae5a18c54fbc1
Author: Nicolò Boschi <bo...@gmail.com>
AuthorDate: Fri Jul 8 01:54:28 2022 +0200
Remove gradle usage from Javadoc gen script (#3386)
### Motivation
`javadoc-gen.sh` still uses Gradle for master branch.
### Changes
- Remove gradle and always use maven
Failure check: https://github.com/apache/bookkeeper/runs/7211295355?check_suite_focus=true
---
site3/website/scripts/javadoc-gen.sh | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/site3/website/scripts/javadoc-gen.sh b/site3/website/scripts/javadoc-gen.sh
index d516acd070..6017e2b57d 100755
--- a/site3/website/scripts/javadoc-gen.sh
+++ b/site3/website/scripts/javadoc-gen.sh
@@ -6,36 +6,25 @@ function build_javadoc() {
echo "Building the javadoc for version ${version}."
if [ "$version" == "latest" ]; then
- javadoc_gen_dir="${ROOT_DIR}/build/docs/javadoc"
+ javadoc_gen_dir="${ROOT_DIR}/target/site/apidocs"
mkdir -p ${ROOT_DIR}/site3/website/build/docs/latest
mkdir -p ${ROOT_DIR}/site3/website/build/docs/latest/api
# keep url compatibility
javadoc_dest_dir="${ROOT_DIR}/site3/website/build/docs/latest/api/javadoc"
- use_gradle=true
cd $ROOT_DIR
else
rm -rf /tmp/bookkeeper-${version}
git clone https://github.com/apache/bookkeeper -b "release-${version}" /tmp/bookkeeper-${version}
cd /tmp/bookkeeper-${version}
- if [[ -f "pom.xml" ]]; then
- use_gradle=false
- javadoc_gen_dir="/tmp/bookkeeper-${version}/target/site/apidocs"
- else
- use_gradle=true
- javadoc_gen_dir="/tmp/bookkeeper-${version}/build/docs/javadoc"
- fi
+ javadoc_gen_dir="/tmp/bookkeeper-${version}/target/site/apidocs"
# keep url compatibility
javadoc_dest_dir="${ROOT_DIR}/site3/website/build/docs/${version}/api/javadoc"
fi
rm -rf $javadoc_dest_dir
- if [[ "$use_gradle" == "true" ]]; then
- ./gradlew generateApiJavadoc
- else
- mvn clean -B -nsu -am -pl bookkeeper-common,bookkeeper-server,:bookkeeper-stats-api,:bookkeeper-stats-providers,:codahale-metrics-provider,:prometheus-metrics-provider install javadoc:aggregate -DskipTests -Pdelombok
- fi
+ mvn clean -B -nsu -am -pl bookkeeper-common,bookkeeper-server,:bookkeeper-stats-api,:bookkeeper-stats-providers,:codahale-metrics-provider,:prometheus-metrics-provider install javadoc:aggregate -DskipTests -Pdelombok
mv $javadoc_gen_dir $javadoc_dest_dir