Author: brett
Date: Fri Dec 28 16:49:35 2012
New Revision: 1426577
URL: http://svn.apache.org/viewvc?rev=1426577&view=rev
Log:
improvements to the reference documentation - more work still to do on CSS, links, etc.
Removed:
continuum/trunk/src/site/apt/findbugs.apt
Modified:
continuum/trunk/continuum-docs/pom.xml
continuum/trunk/pom.xml
continuum/trunk/src/site/apt/index.apt
Modified: continuum/trunk/continuum-docs/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/pom.xml?rev=1426577&r1=1426576&r2=1426577&view=diff
==============================================================================
--- continuum/trunk/continuum-docs/pom.xml (original)
+++ continuum/trunk/continuum-docs/pom.xml Fri Dec 28 16:49:35 2012
@@ -79,7 +79,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1</version>
<reportSets>
<reportSet>
<reports>
Modified: continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/pom.xml?rev=1426577&r1=1426576&r2=1426577&view=diff
==============================================================================
--- continuum/trunk/pom.xml (original)
+++ continuum/trunk/pom.xml Fri Dec 28 16:49:35 2012
@@ -53,6 +53,7 @@
<xmlrpc.version>3.1.2</xmlrpc.version>
<atlassian.xmlrpc.binder.version>0.11</atlassian.xmlrpc.binder.version>
<svnUrl>https://svn.apache.org/repos/asf/continuum/site-publish/ref/latest</svnUrl>
+ <surefire.version>2.12</surefire.version>
</properties>
<scm>
@@ -61,34 +62,49 @@
<url>http://svn.apache.org/viewvc/continuum/trunk/</url>
</scm>
<reporting>
+ <excludeDefaults>true</excludeDefaults>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-changelog-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.4</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ <report>summary</report>
+ <report>license</report>
+ <report>dependencies</report>
+ <report>dependency-management</report>
+ <report>plugins</report>
+ <report>plugin-management</report>
+ <report>modules</report>
+ <report>dependency-convergence</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
+ <version>2.3</version>
+ <inherited>false</inherited>
+ <reportSets>
+ <reportSet>
+ <id>aggregate</id>
+ <reports>
+ <report>aggregate</report>
+ <report>test-aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.6.1</version>
+ <version>2.9</version>
+ <inherited>false</inherited>
<configuration>
<source>1.5</source>
- <aggregate>true</aggregate>
<doclet>gr.spinellis.umlgraph.doclet.UmlGraphDoc</doclet>
<docletArtifact>
<groupId>gr.spinellis</groupId>
@@ -102,26 +118,14 @@
-nodefontpackagesize 7
</additionalparam>
</configuration>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.4</version>
- <!-- TODO: choose appropriate rulesets -->
- <configuration>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
- <inherited>true</inherited>
+ <reportSets>
+ <reportSet>
+ <id>aggregate</id>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
</plugins>
</reporting>
@@ -196,6 +200,16 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<configuration>
<!-- Note: we use this instead of distributionManagement as that currently
impacts the URLs that are
@@ -254,20 +268,12 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
- <inherited>true</inherited>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.12</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<argLine>-Xmx512m</argLine>
@@ -787,11 +793,6 @@
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
- <artifactId>continuum-plexus-application</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.continuum</groupId>
<artifactId>continuum-notifier-api</artifactId>
<version>${project.version}</version>
</dependency>
Modified: continuum/trunk/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/continuum/trunk/src/site/apt/index.apt?rev=1426577&r1=1426576&r2=1426577&view=diff
==============================================================================
--- continuum/trunk/src/site/apt/index.apt (original)
+++ continuum/trunk/src/site/apt/index.apt Fri Dec 28 16:49:35 2012
@@ -24,13 +24,11 @@ Apache Continuum Developer Documentation
Welcome! This site contains the developer documentation for Apache Continuum. Here you
will find Javadocs,
FindBugs reports, information about our unit and functional tests, and some requirements
docs.
- {{{apidocs/index.html}Javadocs}}.
+ {{{./apidocs/index.html}Javadocs}}.
- {{{findbugs.html}Findbugs Reports}}.
+ {{{,.architecture.html}Architecture}}.
- {{{architecture.html}Architecture}}.
+ {{{,.requirements.html}Requirements}}.
- {{{requirements.html}Requirements}}.
-
- {{{continuum-webapp-test/index.html}Functional Tests}}.
+ {{{./continuum-webapp-test/index.html}Functional Tests}}.
\ No newline at end of file
|