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 19:21:29 UTC
incubator-unomi git commit: Fix generation and uploading of manual,
REST API Doc and JavaDoc
Repository: incubator-unomi
Updated Branches:
refs/heads/master 60313f858 -> 030f87147
Fix generation and uploading of manual, REST API Doc and JavaDoc
Signed-off-by: Serge Huber <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/030f8714
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/030f8714
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/030f8714
Branch: refs/heads/master
Commit: 030f87147b1b8bffb0cd6d1f675ae638ff85fdbb
Parents: 60313f8
Author: Serge Huber <sh...@apache.org>
Authored: Thu Sep 20 21:21:13 2018 +0200
Committer: Serge Huber <sh...@apache.org>
Committed: Thu Sep 20 21:21:13 2018 +0200
----------------------------------------------------------------------
generate-site-and-upload.sh | 5 +++--
generate-site.sh | 5 +++--
pom.xml | 7 +++++++
3 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/030f8714/generate-site-and-upload.sh
----------------------------------------------------------------------
diff --git a/generate-site-and-upload.sh b/generate-site-and-upload.sh
index 7763efd..d8dc0c5 100755
--- a/generate-site-and-upload.sh
+++ b/generate-site-and-upload.sh
@@ -28,13 +28,14 @@ cd manual
mvn -Phtml
mvn -Ppdf
cd ..
+echo Generating Javadoc...
+mvn javadoc:aggregate -P integration-tests
cd rest
-mvn javadoc:aggregate
mvn package
cd ..
mkdir target/staging/unomi-api
-cp -R rest/target/site/apidocs target/staging/unomi-api
mkdir target/staging/manual
+cp -R target/site/apidocs target/staging/unomi-api
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
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/030f8714/generate-site.sh
----------------------------------------------------------------------
diff --git a/generate-site.sh b/generate-site.sh
index 06c27f2..10b23f8 100755
--- a/generate-site.sh
+++ b/generate-site.sh
@@ -23,12 +23,13 @@ cd manual
mvn -Phtml
mvn -Ppdf
cd ..
+echo Generating Javadoc...
+mvn javadoc:aggregate -P integration-tests
cd rest
-mvn javadoc:aggregate
mvn package
cd ..
mkdir target/staging/unomi-api
-cp -R rest/target/site/apidocs target/staging/unomi-api
mkdir target/staging/manual
+cp -R target/site/apidocs target/staging/unomi-api
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/030f8714/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d29915e..a355855 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1002,6 +1002,11 @@
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -1019,6 +1024,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
</plugin>
+ <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
@@ -1028,6 +1034,7 @@
<pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/incubator/unomi/website/</pubScmUrl>
</configuration>
</plugin>
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>