You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/08 23:10:20 UTC
svn commit: r420192 - in /geronimo/sandbox/svkmerge/m2migration:
modules/common/pom.xml pom.xml
Author: jdillon
Date: Sat Jul 8 14:10:20 2006
New Revision: 420192
URL: http://svn.apache.org/viewvc?rev=420192&view=rev
Log:
Functional javadoc plugin configuration
Modified:
geronimo/sandbox/svkmerge/m2migration/modules/common/pom.xml
geronimo/sandbox/svkmerge/m2migration/pom.xml
Modified: geronimo/sandbox/svkmerge/m2migration/modules/common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/common/pom.xml?rev=420192&r1=420191&r2=420192&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/common/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/common/pom.xml Sat Jul 8 14:10:20 2006
@@ -17,7 +17,8 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,7 +30,6 @@
<artifactId>geronimo-common</artifactId>
<name>Geronimo :: Common</name>
- <description>Geronimo Common</description>
<dependencies>
<dependency>
@@ -38,5 +38,6 @@
<version>${pom.version}</version>
</dependency>
</dependencies>
+
</project>
Modified: geronimo/sandbox/svkmerge/m2migration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/pom.xml?rev=420192&r1=420191&r2=420192&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/pom.xml Sat Jul 8 14:10:20 2006
@@ -1219,6 +1219,27 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.0</version>
+ <configuration>
+ <minmemory>128m</minmemory>
+ <maxmemory>512</maxmemory>
+ <breakiterator>true</breakiterator>
+ <quiet>false</quiet>
+ <verbose>false</verbose>
+ <source>1.4</source>
+ <!--
+
+ FIXME: This worked in m1, but m2 complains about it being an invalid flag
+ <additionalparam>-J-Djava.awt.headless=true</additionalparam>
+ -->
+ <linksource>true</linksource>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
+ <link>http://java.sun.com/j2se/1.3/docs/api/</link>
+ <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
+ <link>http://java.sun.com/j2ee/sdk_1.3/techdocs/api/</link>
+ </links>
+ </configuration>
</plugin>
<plugin>