Author: mbenson
Date: Sun Feb 9 23:00:36 2014
New Revision: 1566463
URL: http://svn.apache.org/r1566463
Log:
merge split javadoc plugin configuration; skip empty jars
Modified:
commons/proper/weaver/trunk/pom.xml
Modified: commons/proper/weaver/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/pom.xml?rev=1566463&r1=1566462&r2=1566463&view=diff
==============================================================================
--- commons/proper/weaver/trunk/pom.xml (original)
+++ commons/proper/weaver/trunk/pom.xml Sun Feb 9 23:00:36 2014
@@ -260,6 +260,13 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <skipIfEmpty>true</skipIfEmpty>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
@@ -311,13 +318,6 @@ under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>
@@ -335,6 +335,7 @@ under the License.
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
@@ -348,6 +349,7 @@ under the License.
</executions>
<configuration>
<source>${maven.compiler.source}</source>
+ <aggregate>true</aggregate>
</configuration>
</plugin>
</plugins>
