Author: niallp
Date: Wed Mar 3 00:16:13 2010
New Revision: 918281
URL: http://svn.apache.org/viewvc?rev=918281&view=rev
Log:
Remove deprecated <agreggate> property from javadoc plugin and move MANIFEST
configuration for javadoc and source plugin to <dependencyManagement> section
(moving the MANIFEST configuration means it now gets picked up whatever
commands are used to generate the javadoc/source jars)
Modified:
commons/proper/commons-parent/trunk/pom.xml
Modified: commons/proper/commons-parent/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/pom.xml?rev=918281&r1=918280&r2=918281&view=diff
==============================================================================
--- commons/proper/commons-parent/trunk/pom.xml (original)
+++ commons/proper/commons-parent/trunk/pom.xml Wed Mar 3 00:16:13 2010
@@ -178,6 +178,13 @@
<configuration>
<encoding>${commons.encoding}</encoding>
<docEncoding>${commons.docEncoding}</docEncoding>
+ <source>${maven.compile.source}</source>
+ <archive>
+ <manifest>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
</configuration>
</plugin>
<plugin>
@@ -199,6 +206,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.1</version>
+ <configuration>
+ <archive>
+ <manifest>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -327,7 +342,6 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.6.1</version>
<configuration>
- <aggregate>false</aggregate>
<source>${maven.compile.source}</source>
<encoding>${commons.encoding}</encoding>
<docEncoding>${commons.docEncoding}</docEncoding>
@@ -437,14 +451,6 @@
<phase>package</phase>
</execution>
</executions>
- <configuration>
- <archive>
- <manifest>
-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- </archive>
- </configuration>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
@@ -463,15 +469,6 @@
<goal>jar</goal>
</goals>
<phase>package</phase>
- <configuration>
- <source>${maven.compile.source}</source>
- <archive>
- <manifest>
-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- </archive>
- </configuration>
</execution>
</executions>
</plugin>
@@ -528,14 +525,6 @@
<phase>package</phase>
</execution>
</executions>
- <configuration>
- <archive>
- <manifest>
-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- </archive>
- </configuration>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
@@ -554,15 +543,6 @@
<goal>jar</goal>
</goals>
<phase>package</phase>
- <configuration>
- <source>${maven.compile.source}</source>
- <archive>
- <manifest>
-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- </archive>
- </configuration>
</execution>
</executions>
</plugin>
