Author: ltheussl
Date: Wed Jun 17 11:15:03 2009
New Revision: 785559
URL: http://svn.apache.org/viewvc?rev=785559&view=rev
Log:
Move config to pluginManagement, put back config in profiles (why is that not
inherited?)
Modified:
maven/doxia/doxia-sitetools/trunk/pom.xml
maven/doxia/doxia/trunk/pom.xml
Modified: maven/doxia/doxia-sitetools/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/pom.xml?rev=785559&r1=785558&r2=785559&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/pom.xml Wed Jun 17 11:15:03 2009
@@ -244,6 +244,25 @@
<comparisonVersion>1.1</comparisonVersion>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <links>
+ <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
+ <link>http://plexus.codehaus.org/plexus-utils/apidocs/</link>
+ <link>http://junit.sourceforge.net/javadoc/</link>
+ </links>
+ <tagletArtifacts>
+ <tagletArtifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0</version>
+ </tagletArtifact>
+ </tagletArtifacts>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -259,25 +278,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <links>
- <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
- <link>http://plexus.codehaus.org/plexus-utils/apidocs/</link>
- <link>http://junit.sourceforge.net/javadoc/</link>
- </links>
- <tagletArtifacts>
- <tagletArtifact>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-javadoc</artifactId>
- <version>1.0</version>
- </tagletArtifact>
- </tagletArtifacts>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -323,6 +323,21 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <links>
+ <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
+ <link>http://plexus.codehaus.org/plexus-utils/apidocs/</link>
+ <link>http://junit.sourceforge.net/javadoc/</link>
+ </links>
+ <tagletArtifacts>
+ <tagletArtifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0</version>
+ </tagletArtifact>
+ </tagletArtifacts>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -360,6 +375,19 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<aggregate>true</aggregate>
+ <source>1.4</source>
+ <links>
+ <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
+ <link>http://plexus.codehaus.org/plexus-utils/apidocs/</link>
+ <link>http://junit.sourceforge.net/javadoc/</link>
+ </links>
+ <tagletArtifacts>
+ <tagletArtifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0</version>
+ </tagletArtifact>
+ </tagletArtifacts>
</configuration>
<reportSets>
<reportSet>
Modified: maven/doxia/doxia/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?rev=785559&r1=785558&r2=785559&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/pom.xml (original)
+++ maven/doxia/doxia/trunk/pom.xml Wed Jun 17 11:15:03 2009
@@ -297,6 +297,25 @@
<comparisonVersion>1.1</comparisonVersion>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <links>
+ <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
+ <link>http://plexus.codehaus.org/plexus-utils/apidocs/</link>
+ <link>http://junit.sourceforge.net/javadoc/</link>
+ </links>
+ <tagletArtifacts>
+ <tagletArtifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0</version>
+ </tagletArtifact>
+ </tagletArtifacts>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -323,25 +342,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <links>
- <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
- <link>http://plexus.codehaus.org/plexus-utils/apidocs/</link>
- <link>http://junit.sourceforge.net/javadoc/</link>
- </links>
- <tagletArtifacts>
- <tagletArtifact>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-javadoc</artifactId>
- <version>1.0</version>
- </tagletArtifact>
- </tagletArtifacts>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -414,6 +414,21 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <links>
+ <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
+ <link>http://plexus.codehaus.org/plexus-utils/apidocs/</link>
+ <link>http://junit.sourceforge.net/javadoc/</link>
+ </links>
+ <tagletArtifacts>
+ <tagletArtifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0</version>
+ </tagletArtifact>
+ </tagletArtifacts>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -451,6 +466,19 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<aggregate>true</aggregate>
+ <source>1.4</source>
+ <links>
+ <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
+ <link>http://plexus.codehaus.org/plexus-utils/apidocs/</link>
+ <link>http://junit.sourceforge.net/javadoc/</link>
+ </links>
+ <tagletArtifacts>
+ <tagletArtifact>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-javadoc</artifactId>
+ <version>1.0</version>
+ </tagletArtifact>
+ </tagletArtifacts>
</configuration>
<reportSets>
<reportSet>
