Author: hboutemy
Date: Sat Mar 14 18:59:27 2009
New Revision: 754506
URL: http://svn.apache.org/viewvc?rev=754506&view=rev
Log:
o upgraded maven-site-plugin to 2.0
o upgraded maven-project-info-reports-plugin to 2.1.1 (need MPIR-146 fix)
(merged from 2.1.x branch r754505)
Modified:
maven/components/branches/maven-2.1.0-RC/ (props changed)
maven/components/branches/maven-2.1.0-RC/apache-maven/ (props changed)
maven/components/branches/maven-2.1.0-RC/apache-maven/src/test/ (props
changed)
maven/components/branches/maven-2.1.0-RC/maven-integration-tests/ (props
changed)
maven/components/branches/maven-2.1.0-RC/maven-model/src/test/ (props
changed)
maven/components/branches/maven-2.1.0-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java
(props changed)
maven/components/branches/maven-2.1.0-RC/pom.xml
Propchange: maven/components/branches/maven-2.1.0-RC/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 14 18:59:27 2009
@@ -2,6 +2,6 @@
/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060,729738,729785,730461,730631,734502,734803,736543,746381
/maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990
-/maven/components/branches/maven-2.1.x:751686,753648
+/maven/components/branches/maven-2.1.x:751686,753648,754505
/maven/components/trunk:572229,720001,721902,726845,729292
/maven/sandbox/branches/maven/MNG-3379:678167
Propchange: maven/components/branches/maven-2.1.0-RC/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 14 18:59:27 2009
@@ -2,7 +2,7 @@
/maven/components/branches/maven-2.0.x/apache-maven:533160,636838,649903,657432,659677,679552-679867,693956-728820,728836,728940,736543,746038
/maven/components/branches/maven-2.1.0-M1-RC/apache-maven:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC/apache-maven:688883,689695,689976,689990
-/maven/components/branches/maven-2.1.x/apache-maven:751686,753648
+/maven/components/branches/maven-2.1.x/apache-maven:751686,753648,754505
/maven/components/trunk/apache-maven:720001,721902,726845,727688
/maven/components/trunk/maven-distribution:727688
/maven/sandbox/branches/maven/MNG-3379/apache-maven:678167
Propchange: maven/components/branches/maven-2.1.0-RC/apache-maven/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 14 18:59:27 2009
@@ -1,3 +1,3 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven/src/test:728834
/maven/components/branches/maven-2.0.x/apache-maven/src/test:736543
-/maven/components/branches/maven-2.1.x/apache-maven/src/test:751686,753648
+/maven/components/branches/maven-2.1.x/apache-maven/src/test:751686,753648,754505
Propchange: maven/components/branches/maven-2.1.0-RC/maven-integration-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 14 18:59:27 2009
@@ -1,3 +1,3 @@
/maven/components/branches/maven-2.0.10-RC/maven-integration-tests:728834
/maven/components/branches/maven-2.0.x/maven-integration-tests:736543
-/maven/components/branches/maven-2.1.x/maven-integration-tests:751686,753648
+/maven/components/branches/maven-2.1.x/maven-integration-tests:751686,753648,754505
Propchange: maven/components/branches/maven-2.1.0-RC/maven-model/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 14 18:59:27 2009
@@ -1,3 +1,3 @@
/maven/components/branches/maven-2.0.10-RC/maven-model/src/test:728834
/maven/components/branches/maven-2.0.x/maven-model/src/test:736543
-/maven/components/branches/maven-2.1.x/maven-model/src/test:751686,753648
+/maven/components/branches/maven-2.1.x/maven-model/src/test:751686,753648,754505
Propchange:
maven/components/branches/maven-2.1.0-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 14 18:59:27 2009
@@ -1,4 +1,4 @@
/maven/components/branches/maven-2.0.10-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:688259,725329-725330,725342,725349,725359
/maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:690315,691793
/maven/components/branches/maven-2.1.0-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:688883,689695,689976,689990
-/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:751686,753648
+/maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:751686,753648,754505
Modified: maven/components/branches/maven-2.1.0-RC/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-RC/pom.xml?rev=754506&r1=754505&r2=754506&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.0-RC/pom.xml (original)
+++ maven/components/branches/maven-2.1.0-RC/pom.xml Sat Mar 14 18:59:27 2009
@@ -156,7 +156,7 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
+ <version>2.0</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
@@ -526,6 +526,11 @@
<id>reporting</id>
<reporting>
<plugins>
+ <plugin><!-- TODO: remove when upgrading parent to version 12 -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1.1</version>
+ </plugin><!-- /TODO -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
@@ -548,7 +553,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1</version>
+ <version>2.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
