Author: bimargulies
Date: Fri Sep 2 16:11:05 2011
New Revision: 1164601
URL: http://svn.apache.org/viewvc?rev=1164601&view=rev
Log:
pre-release cleanup, site plugin 3.0, etc.
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/pom.xml
Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml?rev=1164601&r1=1164600&r2=1164601&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml Fri Sep 2 16:11:05
2011
@@ -296,7 +296,7 @@
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<settingsFile>src/it/settings.xml</settingsFile>
<filterProperties>
- <sitePluginVersion>2.0.1</sitePluginVersion>
+ <sitePluginVersion>3.0</sitePluginVersion>
</filterProperties>
<goals>
<goal>verify</goal>
@@ -315,26 +315,5 @@
</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>
- <plugins>
- <plugin>
- <artifactId>maven-invoker-plugin</artifactId>
- <configuration>
- <filterProperties>
- <sitePluginVersion>3.0-beta-3</sitePluginVersion>
- </filterProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/pom.xml?rev=1164601&r1=1164600&r2=1164601&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/pom.xml
(original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/plugin-report/pom.xml
Fri Sep 2 16:11:05 2011
@@ -22,6 +22,12 @@ under the License.
<project>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-parent</artifactId>
+ <version>21</version>
+ </parent>
+
<groupId>org.apache.maven.its</groupId>
<artifactId>plugin-report</artifactId>
<version>1.0</version>
@@ -74,7 +80,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.4</version>
<reportSets>
<reportSet>
<reports>
