This is an automated email from the ASF dual-hosted git repository. stariy95 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne-website.git
commit 5ea26ae395967b5fd22160466e7f8bbc40b93352 Author: Nikita Timofeev <[email protected]> AuthorDate: Fri May 22 14:26:05 2026 +0400 Fix documentation build scripts --- build-asciidocs.sh | 4 +--- build-docs.sh | 14 +++++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/build-asciidocs.sh b/build-asciidocs.sh index 0d5f8c218..5dc3fda46 100755 --- a/build-asciidocs.sh +++ b/build-asciidocs.sh @@ -97,9 +97,7 @@ cd "$CAYENNE_TMP_DIR" # build it echo "Running Maven build... it can take a while..." mvn package -Passembly -q -DskipTests -Dcayenne.version=${VERSION} -pl !modeler,!modeler/cayenne-modeler,\ -!modeler/cayenne-modeler-generic,!modeler/cayenne-modeler-generic-ext,\ -!modeler/cayenne-modeler-mac,!modeler/cayenne-modeler-mac-ext,\ -!modeler/cayenne-modeler-win,!modeler/cayenne-modeler-win-ext,\ +!modeler/cayenne-modeler-generic,!modeler/cayenne-modeler-mac,!modeler/cayenne-modeler-win,\ !modeler/cayenne-wocompat,!assembly,!cayenne-gradle-plugin,!docs/doc\ > /dev/null 2>&1 echo "Maven build complete" diff --git a/build-docs.sh b/build-docs.sh index 1580f3d0f..4ca2992d6 100755 --- a/build-docs.sh +++ b/build-docs.sh @@ -96,17 +96,21 @@ cd "$CAYENNE_TMP_DIR" || exit 3 # build it echo "Running Maven build... it can take a while..." -mvn package -Passembly -q -DskipTests -Dcayenne.version=${VERSION} -pl !modeler,!modeler/cayenne-modeler,\ -!modeler/cayenne-modeler-generic,!modeler/cayenne-modeler-generic-ext,\ -!modeler/cayenne-modeler-mac,!modeler/cayenne-modeler-mac-ext,\ -!modeler/cayenne-modeler-win,!modeler/cayenne-modeler-win-ext,\ +mvn package -Passembly -DskipTests -Dcayenne.version=${VERSION} -pl !modeler,!modeler/cayenne-modeler,\ +!modeler/cayenne-modeler-generic,!modeler/cayenne-modeler-mac,!modeler/cayenne-modeler-win,\ !modeler/cayenne-wocompat,!assembly\ > /dev/null 2>&1 echo "Maven build complete" # copy JavaDoc echo "Syncing JavaDoc to \"docs/$MAJOR_VERSION/api/\"" -rsync -a --delete "./docs/doc/target/site/apidocs/doc/api/" "$JAVA_DOC_DIR/api/" +MAJOR_NUM="${VERSION%%.*}" +if [ "$MAJOR_NUM" -ge 5 ]; then + APIDOC_SRC="./docs/doc/target/site/apidocs/" +else + APIDOC_SRC="./docs/doc/target/site/apidocs/doc/api/" +fi +rsync -a --delete "$APIDOC_SRC" "$JAVA_DOC_DIR/api/" # copy everything from ./docs/asciidoc/**/target/site/** directories cd "$CAYENNE_TMP_DIR/docs/asciidoc/" || exit 4
