You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oltu.apache.org by si...@apache.org on 2013/01/24 18:35:37 UTC

svn commit: r1438097 - /oltu/trunk/pom.xml

Author: simonetripodi
Date: Thu Jan 24 17:35:35 2013
New Revision: 1438097

URL: http://svn.apache.org/viewvc?rev=1438097&view=rev
Log:
[AMBER-77] Update the Oltu website

restored the Doclava renderer for javadoc
restored javadoc aggregation (and publishing)

Modified:
    oltu/trunk/pom.xml

Modified: oltu/trunk/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/pom.xml?rev=1438097&r1=1438096&r2=1438097&view=diff
==============================================================================
--- oltu/trunk/pom.xml (original)
+++ oltu/trunk/pom.xml Thu Jan 24 17:35:35 2013
@@ -722,8 +722,34 @@
             <artifactId>maven-javadoc-plugin</artifactId>
             <version>${javadoc.version}</version>
             <configuration>
-              <aggregate>true</aggregate>
+              <notimestamp>true</notimestamp>
+              <bootclasspath>${sun.boot.class.path}</bootclasspath>
+              <doclet>com.google.doclava.Doclava</doclet>
+              <useStandardDocletOptions>false</useStandardDocletOptions>
+              <additionalJOption>-J-Xmx1024m</additionalJOption>
+              <docletArtifact>
+                <groupId>com.google.doclava</groupId>
+                <artifactId>doclava</artifactId>
+                <version>1.0.5</version>
+              </docletArtifact>
+              <additionalparam>
+                -quiet
+                -federate JDK http://download.oracle.com/javase/6/docs/api/index.html?
+                -federationxml JDK http://doclava.googlecode.com/svn/static/api/openjdk-6.xml
+                -hdf project.name "Apache Oltu"
+                -apiversion "${project.version}"
+                -d ${project.reporting.outputDirectory}/apidocs
+              </additionalparam>
             </configuration>
+            <executions>
+              <execution>
+                <id>aggregate</id>
+                <phase>site</phase>
+                <goals>
+                  <goal>aggregate</goal>
+                </goals>
+              </execution>
+            </executions>
           </plugin>
 
           <plugin>
@@ -766,26 +792,6 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <version>${javadoc.version}</version>
-            <configuration>
-              <notimestamp>true</notimestamp>
-              <bootclasspath>${sun.boot.class.path}</bootclasspath>
-              <doclet>com.google.doclava.Doclava</doclet>
-              <useStandardDocletOptions>false</useStandardDocletOptions>
-              <additionalJOption>-J-Xmx1024m</additionalJOption>
-              <docletArtifact>
-                <groupId>com.google.doclava</groupId>
-                <artifactId>doclava</artifactId>
-                <version>1.0.5</version>
-              </docletArtifact>
-              <additionalparam>
-                -quiet
-                -federate JDK http://download.oracle.com/javase/6/docs/api/index.html?
-                -federationxml JDK http://doclava.googlecode.com/svn/static/api/openjdk-6.xml
-                -hdf project.name "Apache Oltu"
-                -apiversion "${project.version}"
-                -d ${project.reporting.outputDirectory}/apidocs
-              </additionalparam>
-            </configuration>
             <reportSets>
               <reportSet>
                 <id>default</id>
@@ -793,6 +799,12 @@
                   <report>javadoc</report>
                 </reports>
               </reportSet>
+              <reportSet>
+                <id>aggregate</id>
+                <reports>
+                  <report>aggregate</report>
+                </reports>
+              </reportSet>
             </reportSets>
           </plugin>
         </plugins>