This is an automated email from the ASF dual-hosted git repository. shuber pushed a commit to branch unomi-1.5.x in repository https://gitbox.apache.org/repos/asf/unomi.git
commit 98b7f194202030e8908e67415c7f8d44cc0bc5db Author: Serge Huber <[email protected]> AuthorDate: Fri May 15 10:03:03 2020 +0200 Fix online documentation generation (cherry picked from commit d64ca735487a278a98f115ec3c3c80238829984d) --- generate-site-and-upload.sh | 12 ++++++------ generate-site.sh | 10 +++++----- manual/pom.xml | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/generate-site-and-upload.sh b/generate-site-and-upload.sh index 800a220..77c6b3a 100755 --- a/generate-site-and-upload.sh +++ b/generate-site-and-upload.sh @@ -25,11 +25,11 @@ fi echo Generating manual... mvn clean cd manual -mvn -Ddoc.archive=true -Ddoc.source=src/archives/1.1/asciidoc -Ddoc.output.pdf=target/generated-docs/1_1_x/pdf -Ddoc.output.html=target/generated-docs/1_1_x/html -Ddoc.version=1.1 -P sign verify -mvn -Ddoc.archive=true -Ddoc.source=src/archives/1.2/asciidoc -Ddoc.output.pdf=target/generated-docs/1_2_x/pdf -Ddoc.output.html=target/generated-docs/1_2_x/html -Ddoc.version=1.2 -P sign verify -mvn -Ddoc.archive=true -Ddoc.source=src/archives/1.3/asciidoc -Ddoc.output.pdf=target/generated-docs/1_3_x/pdf -Ddoc.output.html=target/generated-docs/1_3_x/html -Ddoc.version=1.3 -P sign verify -mvn -Ddoc.archive=true -Ddoc.source=src/archives/1.4/asciidoc -Ddoc.output.pdf=target/generated-docs/1_4_x/pdf -Ddoc.output.html=target/generated-docs/1_4_x/html -Ddoc.version=1.4 -P sign verify -mvn -Ddoc.archive=true -Ddoc.source=src/archives/1.5/asciidoc -Ddoc.output.pdf=target/generated-docs/1_5_x/pdf -Ddoc.output.html=target/generated-docs/1_4_x/html -Ddoc.version=1.5 -P sign verify +mvn -Ddoc.archive=true -Ddoc.source=src/archives/1.1/asciidoc -Ddoc.output.pdf=target/generated-docs/pdf/1_1_x -Ddoc.output.html=target/generated-docs/html/1_1_x -Ddoc.version=1_1_x -P sign verify +mvn -Ddoc.archive=true -Ddoc.source=src/archives/1.2/asciidoc -Ddoc.output.pdf=target/generated-docs/pdf/1_2_x -Ddoc.output.html=target/generated-docs/html/1_2_x -Ddoc.version=1_2_x -P sign verify +mvn -Ddoc.archive=true -Ddoc.source=src/archives/1.3/asciidoc -Ddoc.output.pdf=target/generated-docs/pdf/1_3_x -Ddoc.output.html=target/generated-docs/html/1_3_x -Ddoc.version=1_3_x -P sign verify +mvn -Ddoc.archive=true -Ddoc.source=src/archives/1.4/asciidoc -Ddoc.output.pdf=target/generated-docs/pdf/1_4_x -Ddoc.output.html=target/generated-docs/html/1_4_x -Ddoc.version=1_4_x -P sign verify +mvn -Ddoc.archive=true -Ddoc.source=src/archives/1.5/asciidoc -Ddoc.output.pdf=target/generated-docs/pdf/1_5_x -Ddoc.output.html=target/generated-docs/html/1_4_x -Ddoc.version=1_5_x -P sign verify mvn -P sign install cd .. echo Generating Javadoc... @@ -45,5 +45,5 @@ cp -Rf manual/target/generated-docs/html/* target/staging/manual echo Committing documentation to Apache SVN... mvn scm-publish:publish-scm -Dscmpublish.pubScmUrl=scm:svn:https://svn.apache.org/repos/asf/unomi/website/manual -Dscmpublish.content=target/staging/manual -Dusername=$1 -Dpassword=$2 mvn scm-publish:publish-scm -Dscmpublish.pubScmUrl=scm:svn:https://svn.apache.org/repos/asf/unomi/website/unomi-api -Dscmpublish.content=target/staging/unomi-api -Dusername=$1 -Dpassword=$2 -mvn scm-publish:publish-scm -Dscmpublish.pubScmUrl=scm:svn:https://svn.apache.org/repos/asf/unomi/website/rest-api-doc -Dscmpublish.content=target/staging/rest-api-doc -Dusername=$1 -Dpassword=$2 +# mvn scm-publish:publish-scm -Dscmpublish.pubScmUrl=scm:svn:https://svn.apache.org/repos/asf/unomi/website/rest-api-doc -Dscmpublish.content=target/staging/rest-api-doc -Dusername=$1 -Dpassword=$2 echo Documentation generation and upload completed. \ No newline at end of file diff --git a/generate-site.sh b/generate-site.sh index 4fa7a05..5dbf9b1 100755 --- a/generate-site.sh +++ b/generate-site.sh @@ -20,11 +20,11 @@ echo Generating manual... mvn clean cd manual -mvn -Ddoc.archive=true -Ddoc.source=src/archives/1.1/asciidoc -Ddoc.output.pdf=target/generated-docs/1_1_x/pdf -Ddoc.output.html=target/generated-docs/1_1_x/html -Ddoc.version=1.1 -P sign verify -mvn -Ddoc.archive=true -Ddoc.source=src/archives/1.2/asciidoc -Ddoc.output.pdf=target/generated-docs/1_2_x/pdf -Ddoc.output.html=target/generated-docs/1_2_x/html -Ddoc.version=1.2 -P sign verify -mvn -Ddoc.archive=true -Ddoc.source=src/archives/1.3/asciidoc -Ddoc.output.pdf=target/generated-docs/1_3_x/pdf -Ddoc.output.html=target/generated-docs/1_3_x/html -Ddoc.version=1.3 -P sign verify -mvn -Ddoc.archive=true -Ddoc.source=src/archives/1.4/asciidoc -Ddoc.output.pdf=target/generated-docs/1_4_x/pdf -Ddoc.output.html=target/generated-docs/1_4_x/html -Ddoc.version=1.4 -P sign verify -mvn -Ddoc.archive=true -Ddoc.source=src/archives/1.5/asciidoc -Ddoc.output.pdf=target/generated-docs/1_5_x/pdf -Ddoc.output.html=target/generated-docs/1_4_x/html -Ddoc.version=1.5 -P sign verify +mvn -Ddoc.archive=true -Ddoc.source=src/archives/1.1/asciidoc -Ddoc.output.pdf=target/generated-docs/pdf/1_1_x -Ddoc.output.html=target/generated-docs/html/1_1_x -Ddoc.version=1_1_x -P sign verify +mvn -Ddoc.archive=true -Ddoc.source=src/archives/1.2/asciidoc -Ddoc.output.pdf=target/generated-docs/pdf/1_2_x -Ddoc.output.html=target/generated-docs/html/1_2_x -Ddoc.version=1_2_x -P sign verify +mvn -Ddoc.archive=true -Ddoc.source=src/archives/1.3/asciidoc -Ddoc.output.pdf=target/generated-docs/pdf/1_3_x -Ddoc.output.html=target/generated-docs/html/1_3_x -Ddoc.version=1_3_x -P sign verify +mvn -Ddoc.archive=true -Ddoc.source=src/archives/1.4/asciidoc -Ddoc.output.pdf=target/generated-docs/pdf/1_4_x -Ddoc.output.html=target/generated-docs/html/1_4_x -Ddoc.version=1_4_x -P sign verify +mvn -Ddoc.archive=true -Ddoc.source=src/archives/1.5/asciidoc -Ddoc.output.pdf=target/generated-docs/pdf/1_5_x -Ddoc.output.html=target/generated-docs/html/1_4_x -Ddoc.version=1_5_x -P sign verify mvn -P sign install cd .. echo Generating Javadoc... diff --git a/manual/pom.xml b/manual/pom.xml index 94a3243..007863b 100644 --- a/manual/pom.xml +++ b/manual/pom.xml @@ -24,14 +24,14 @@ </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>manual</artifactId> + <artifactId>unomi-manual</artifactId> <name>Apache Unomi :: Manual</name> <packaging>bundle</packaging> <properties> <doc.source>src/main/asciidoc</doc.source> - <doc.output.html>target/generated-docs/html</doc.output.html> - <doc.output.pdf>target/generated-docs/pdf</doc.output.pdf> + <doc.output.html>target/generated-docs/html/latest</doc.output.html> + <doc.output.pdf>target/generated-docs/pdf/latest</doc.output.pdf> <doc.version>${project.version}</doc.version> </properties>
