Author: ltheussl
Date: Fri Jul 15 07:57:49 2011
New Revision: 1147002
URL: http://svn.apache.org/viewvc?rev=1147002&view=rev
Log:
sync ITs with m3 branch
Added:
maven/plugins/trunk/maven-site-plugin/src/it/empty-report-set/
- copied from r1146707,
maven/plugins/branches/maven-site-plugin-3.x/src/it/empty-report-set/
maven/plugins/trunk/maven-site-plugin/src/it/empty-report-set/invoker.properties
Removed:
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/profiles.txt
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/invoker.properties
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/pom.xml
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1147002&r1=1147001&r2=1147002&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Fri Jul 15 07:57:49 2011
@@ -181,6 +181,10 @@ under the License.
<doxiaSitetoolsVersion>1.2.1-SNAPSHOT</doxiaSitetoolsVersion>
<mavenVersion>2.2.0</mavenVersion>
<wagonVersion>1.0-beta-6</wagonVersion>
+ <!-- for ITs -->
+ <javadocPluginVersion>2.6.1</javadocPluginVersion>
+ <projectInfoReportsPluginVersion>2.2</projectInfoReportsPluginVersion>
+ <checkstylePluginVersion>2.5</checkstylePluginVersion>
</properties>
<dependencies>
Added:
maven/plugins/trunk/maven-site-plugin/src/it/empty-report-set/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/empty-report-set/invoker.properties?rev=1147002&view=auto
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/empty-report-set/invoker.properties
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/empty-report-set/invoker.properties
Fri Jul 15 07:57:49 2011
@@ -0,0 +1 @@
+invoker.maven.version = 3.0+
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/invoker.properties?rev=1147002&r1=1147001&r2=1147002&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/invoker.properties
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/invoker.properties
Fri Jul 15 07:57:49 2011
@@ -1 +1,2 @@
invoker.maven.version = 3.0-
+invoker.profiles=reporting
\ No newline at end of file
Modified: maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/pom.xml?rev=1147002&r1=1147001&r2=1147002&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/pom.xml
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/pom.xml Fri Jul
15 07:57:49 2011
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>11</version>
+ <version>15</version>
</parent>
<groupId>org.apache.maven.plugins.site.its</groupId>
@@ -15,6 +15,12 @@
<name>maven-site-plugin IT: full reporting</name>
<url>http://maven.apache.org</url>
+ <properties>
+ <javadocPluginVersion>@javadocPluginVersion@</javadocPluginVersion>
+
<checkstylePluginVersion>@checkstylePluginVersion@</checkstylePluginVersion>
+
<projectInfoReportsPluginVersion>@projectInfoReportsPluginVersion@</projectInfoReportsPluginVersion>
+ </properties>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -31,6 +37,21 @@
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadocPluginVersion}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstylePluginVersion}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>@projectInfoReportsPluginVersion@</version>
+ </plugin>
</plugins>
</build>
@@ -39,7 +60,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.2</version>
+ <version>@projectInfoReportsPluginVersion@</version>
<configuration>
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
@@ -47,13 +68,15 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadocPluginVersion}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <configLocation>config/maven_checks.xml</configLocation>
- <headerLocation>config/maven-header.txt</headerLocation>
- </configuration>
+ <version>${checkstylePluginVersion}</version>
</plugin>
</plugins>
</reporting>
+
</project>
