You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2018/09/20 18:41:13 UTC
[1/2] incubator-unomi git commit: Update generation of documentation
script
Repository: incubator-unomi
Updated Branches:
refs/heads/master f0b309019 -> 60313f858
Update generation of documentation script
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/9e685bd6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/9e685bd6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/9e685bd6
Branch: refs/heads/master
Commit: 9e685bd686af19cc2b83a747a456ec4fe66c8d27
Parents: b32fce9
Author: Francois Papon <fp...@apache.org>
Authored: Thu Sep 20 16:49:34 2018 +0400
Committer: Francois Papon <fp...@apache.org>
Committed: Thu Sep 20 21:30:08 2018 +0400
----------------------------------------------------------------------
generate-site-and-upload.sh | 23 +++++++++++++++++------
generate-site.sh | 16 +++++++++++++---
manual/pom.xml | 4 ++--
rest/pom.xml | 8 +-------
4 files changed, 33 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9e685bd6/generate-site-and-upload.sh
----------------------------------------------------------------------
diff --git a/generate-site-and-upload.sh b/generate-site-and-upload.sh
index ac0e591..7763efd 100755
--- a/generate-site-and-upload.sh
+++ b/generate-site-and-upload.sh
@@ -22,11 +22,22 @@ if [ $# -ne 2 ]
echo "Illegal number of arguments supplied. Syntax should be generate-site-and-upload.sh SVNusername SVNpassword"
exit 1
fi
-echo Generating site...
-mvn clean install site site:stage -P !integration-tests,!performance-tests
+echo Generating documentation...
+mvn clean
+cd manual
+mvn -Phtml
+mvn -Ppdf
+cd ..
cd rest
+mvn javadoc:aggregate
mvn package
-cd -
-echo Committing site to Apache SVN...
-mvn scm-publish:publish-scm -Dusername=$1 -Dpassword=$2
-echo Site generation and upload completed.
\ No newline at end of file
+cd ..
+mkdir target/staging/unomi-api
+cp -R rest/target/site/apidocs target/staging/unomi-api
+mkdir target/staging/manual
+cp -R manual/target/generated-html/latest target/staging/manual
+echo Committing documentation to Apache SVN...
+mvn scm-publish:publish-scm -Dscmpublish.pubScmUrl=scm:svn:https://svn.apache.org/repos/asf/incubator/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/incubator/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/incubator/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
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9e685bd6/generate-site.sh
----------------------------------------------------------------------
diff --git a/generate-site.sh b/generate-site.sh
index fe3ebd2..06c27f2 100755
--- a/generate-site.sh
+++ b/generate-site.sh
@@ -17,8 +17,18 @@
# limitations under the License.
#
################################################################################
-echo Generating site...
-mvn site site:stage -P !integration-tests,!performance-tests
+echo Generating documentation...
+mvn clean
+cd manual
+mvn -Phtml
+mvn -Ppdf
+cd ..
cd rest
+mvn javadoc:aggregate
mvn package
-cd -
+cd ..
+mkdir target/staging/unomi-api
+cp -R rest/target/site/apidocs target/staging/unomi-api
+mkdir target/staging/manual
+cp -R manual/target/generated-html/latest target/staging/manual
+echo Documentation generation completed!
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9e685bd6/manual/pom.xml
----------------------------------------------------------------------
diff --git a/manual/pom.xml b/manual/pom.xml
index 01f9310..6403a5c 100644
--- a/manual/pom.xml
+++ b/manual/pom.xml
@@ -61,7 +61,7 @@
</executions>
<configuration>
<sourceDirectory>src/main/asciidoc</sourceDirectory>
- <outputDirectory>target/generated-html/${project.version}</outputDirectory>
+ <outputDirectory>target/generated-html/latest</outputDirectory>
<preserveDirectories>true</preserveDirectories>
<headerFooter>true</headerFooter>
<imagesDir>src/main/asciidoc/images</imagesDir>
@@ -89,7 +89,7 @@
</dependencies>
<configuration>
<sourceDirectory>src/main/asciidoc</sourceDirectory>
- <outputDirectory>target/generated-pdf/${project.version}</outputDirectory>
+ <outputDirectory>target/generated-pdf/latest</outputDirectory>
<preserveDirectories>true</preserveDirectories>
<headerFooter>true</headerFooter>
<backend>pdf</backend>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9e685bd6/rest/pom.xml
----------------------------------------------------------------------
diff --git a/rest/pom.xml b/rest/pom.xml
index 5864d35..8a78449 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -234,11 +234,6 @@
</analysis>
</configuration>
</plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -273,6 +268,5 @@
</configuration>
</plugin>
</plugins>
- </reporting>
-
+ </build>
</project>
[2/2] incubator-unomi git commit: This closes pull request number #68
Posted by sh...@apache.org.
This closes pull request number #68
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/60313f85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/60313f85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/60313f85
Branch: refs/heads/master
Commit: 60313f85841fafa0d8b95c3108cd821ca6a57786
Parents: f0b3090 9e685bd
Author: Serge Huber <sh...@apache.org>
Authored: Thu Sep 20 20:40:51 2018 +0200
Committer: Serge Huber <sh...@apache.org>
Committed: Thu Sep 20 20:40:51 2018 +0200
----------------------------------------------------------------------
generate-site-and-upload.sh | 23 +++++++++++++++++------
generate-site.sh | 16 +++++++++++++---
manual/pom.xml | 4 ++--
rest/pom.xml | 8 +-------
4 files changed, 33 insertions(+), 18 deletions(-)
----------------------------------------------------------------------