You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2010/09/13 22:37:47 UTC
svn commit: r996682 - in /maven/plugins/trunk/maven-pdf-plugin: pom.xml
src/it/fop-basic/pom.xml src/it/pdf-with-reporting-section/
src/it/pdf-with-reporting-section/pom.xml
Author: olamy
Date: Mon Sep 13 20:37:47 2010
New Revision: 996682
URL: http://svn.apache.org/viewvc?rev=996682&view=rev
Log:
upgrade parent version and invoker plugin version.
[MPDF-41] with maven 3 pdf failure if reporting section is not empty
add it test.
Added:
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/
- copied from r995575, maven/plugins/trunk/maven-pdf-plugin/src/it/fop-basic/
Modified:
maven/plugins/trunk/maven-pdf-plugin/pom.xml
maven/plugins/trunk/maven-pdf-plugin/src/it/fop-basic/pom.xml
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/pom.xml
Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/pom.xml?rev=996682&r1=996681&r2=996682&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pdf-plugin/pom.xml Mon Sep 13 20:37:47 2010
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>18</version>
+ <version>17</version>
</parent>
<artifactId>maven-pdf-plugin</artifactId>
@@ -405,7 +405,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
<configuration>
<debug>true</debug>
<projectsDirectory>src/it</projectsDirectory>
@@ -450,7 +450,7 @@ under the License.
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.2</version>
+ <version>2.2</version>
<reportSets>
<reportSet>
<reports>
@@ -495,5 +495,25 @@ under the License.
</plugins>
</build>
</profile>
+ <profile>
+ <id>maven-3</id>
+ <activation>
+ <file>
+ <!-- This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
+ <exists>${basedir}</exists>
+ </file>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0-beta-2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
</profiles>
</project>
Modified: maven/plugins/trunk/maven-pdf-plugin/src/it/fop-basic/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/it/fop-basic/pom.xml?rev=996682&r1=996681&r2=996682&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/it/fop-basic/pom.xml (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/it/fop-basic/pom.xml Mon Sep 13 20:37:47 2010
@@ -42,7 +42,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.2</version>
+ <version>2.4.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -51,4 +51,7 @@ under the License.
</plugin>
</plugins>
</build>
+
+
+
</project>
Modified: maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/pom.xml?rev=996682&r1=995575&r2=996682&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/pom.xml (original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/pom.xml Mon Sep 13 20:37:47 2010
@@ -42,7 +42,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.2</version>
+ <version>2.4.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -51,4 +51,27 @@ under the License.
</plugin>
</plugins>
</build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.2</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>cim</report>
+ <report>summary</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+
</project>