You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2013/08/01 13:23:07 UTC
svn commit: r1509173 - in /jackrabbit/oak/trunk: oak-doc/pom.xml
oak-doc/src/site/markdown/api.md oak-doc/src/site/site.xml oak-parent/pom.xml
Author: mduerig
Date: Thu Aug 1 11:23:07 2013
New Revision: 1509173
URL: http://svn.apache.org/r1509173
Log:
OAK-301 Document Oak
- proper id for site distribution
- generate and link javadoc
Removed:
jackrabbit/oak/trunk/oak-doc/src/site/markdown/api.md
Modified:
jackrabbit/oak/trunk/oak-doc/pom.xml
jackrabbit/oak/trunk/oak-doc/src/site/site.xml
jackrabbit/oak/trunk/oak-parent/pom.xml
Modified: jackrabbit/oak/trunk/oak-doc/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-doc/pom.xml?rev=1509173&r1=1509172&r2=1509173&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-doc/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-doc/pom.xml Thu Aug 1 11:23:07 2013
@@ -37,6 +37,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
+ <generateReports>true</generateReports>
+ <skip>false</skip>
<skipDeploy>false</skipDeploy>
</configuration>
</plugin>
@@ -45,7 +47,7 @@
<distributionManagement>
<site>
- <id>testi</id>
+ <id>jackrabbit.oak.site-deploy</id>
<url>${project.baseUri}/target/site-deploy</url>
</site>
</distributionManagement>
Modified: jackrabbit/oak/trunk/oak-doc/src/site/site.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-doc/src/site/site.xml?rev=1509173&r1=1509172&r2=1509173&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-doc/src/site/site.xml (original)
+++ jackrabbit/oak/trunk/oak-doc/src/site/site.xml Thu Aug 1 11:23:07 2013
@@ -44,7 +44,7 @@ under the License.
<menu name="Developing Oak">
<item href="dev_getting_started.html" name="Getting Started" />
<item href="participating.html" name="Participating" />
- <item href="api.html" name="API docs" />
+ <item href="apidocs/index.html" name="API docs" />
</menu>
<menu name="Links">
</menu>
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1509173&r1=1509172&r2=1509173&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Thu Aug 1 11:23:07 2013
@@ -226,6 +226,7 @@
<version>3.3</version>
<configuration>
<generateReports>false</generateReports>
+ <skip>true</skip>
<skipDeploy>true</skipDeploy>
</configuration>
<dependencies>
@@ -238,6 +239,24 @@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>aggregate</id>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ <phase>site</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <reportOutputDirectory>${basedir}/oak-doc/target/site</reportOutputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencyManagement>