Author: tchemit Date: 2009-10-09 12:50:02 +0200 (Fri, 09 Oct 2009) New Revision: 606 Modified: trunk/pom.xml Log: - avoid aggregate javadoc on site generation - avoid execution in pluginManagement Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-09 09:46:13 UTC (rev 605) +++ trunk/pom.xml 2009-10-09 10:50:02 UTC (rev 606) @@ -338,9 +338,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <maven.test.testFailureIgnore>false</maven.test.testFailureIgnore> <maven.test.skip>false</maven.test.skip> - <maven.test.forkMode>once</maven.test.forkMode> <!-- to activate generation of reports and javadoc when doing a site --> <maven.reports.generate>true</maven.reports.generate> @@ -380,6 +378,7 @@ </executions> </plugin> + <!-- will be removed before 2.0.0 (all will be in maven-license-plugin) --> <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> @@ -444,29 +443,12 @@ <version>2.4.3</version> <configuration> <skip>${maven.test.skip}</skip> - <testFailureIgnore>${maven.test.testFailureIgnore}</testFailureIgnore> - <forkMode>${maven.test.forkMode}</forkMode> </configuration> </plugin> <plugin> <artifactId>maven-source-plugin</artifactId> <version>2.1</version> - <inherited>true</inherited> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - <execution> - <id>attach-test-sources</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> </plugin> <plugin> @@ -643,21 +625,6 @@ </taglet> </taglets> </configuration> - <executions> - <execution> - <id>attach-javadocs</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - <execution> - <id>attach-test-javadocs</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> <plugin> @@ -708,6 +675,7 @@ <version>${javadoc.version}</version> <configuration> <quiet>true</quiet> + <!--<skip>true</skip>--> <docencoding>${project.build.sourceEncoding}</docencoding> <encoding>${project.build.sourceEncoding}</encoding> <charset>${project.reporting.outputEncoding}</charset> @@ -876,6 +844,14 @@ </taglet> </taglets> </configuration> + <reportSets> + <reportSet> + <reports> + <report>javadoc</report> + <report>test-javadoc</report> + </reports> + </reportSet> + </reportSets> </plugin> <!-- changelog:changelog @@ -963,10 +939,11 @@ <executions> <execution> <id>attach-sources</id> + <goals> + <goal>jar</goal> + <goal>test-jar</goal> + </goals> </execution> - <execution> - <id>attach-test-sources</id> - </execution> </executions> </plugin> @@ -976,10 +953,11 @@ <executions> <execution> <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + <goal>test-jar</goal> + </goals> </execution> - <execution> - <id>attach-test-javadocs</id> - </execution> </executions> </plugin>