Author: olamy
Date: Sun Aug 30 07:25:13 2009
New Revision: 809256
URL: http://svn.apache.org/viewvc?rev=809256&view=rev
Log:
merge new it from trunk.
merge -r 809251:809252
Added:
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/
- copied from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml
- copied unchanged from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/profiles.txt
- copied unchanged from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/profiles.txt
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/
- copied from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/main/
- copied from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/main/
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/main/java/
- copied from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/main/java/
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/main/java/org/
- copied from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/main/java/org/
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/main/java/org/apache/
- copied from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/main/java/org/apache/
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/main/java/org/apache/maven/
- copied from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/main/java/org/apache/maven/
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/main/java/org/apache/maven/plugins/
- copied from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/main/java/org/apache/maven/plugins/
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/main/java/org/apache/maven/plugins/site/
- copied from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/main/java/org/apache/maven/plugins/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/main/java/org/apache/maven/plugins/site/its/
- copied from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/main/java/org/apache/maven/plugins/site/its/
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/main/java/org/apache/maven/plugins/site/its/App.java
- copied unchanged from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/main/java/org/apache/maven/plugins/site/its/App.java
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/test/
- copied from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/test/
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/test/java/
- copied from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/test/java/
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/test/java/org/
- copied from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/test/java/org/
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/test/java/org/apache/
- copied from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/test/java/org/apache/
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/test/java/org/apache/maven/
- copied from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/test/java/org/apache/maven/
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/test/java/org/apache/maven/plugins/
- copied from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/test/java/org/apache/maven/plugins/
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/test/java/org/apache/maven/plugins/site/
- copied from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/test/java/org/apache/maven/plugins/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/test/java/org/apache/maven/plugins/site/its/
- copied from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/test/java/org/apache/maven/plugins/site/its/
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/src/test/java/org/apache/maven/plugins/site/its/AppTest.java
- copied unchanged from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/src/test/java/org/apache/maven/plugins/site/its/AppTest.java
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/verify.groovy
- copied unchanged from r809252,
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/verify.groovy
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
maven/plugins/branches/maven-site-plugin-3.x/pom.xml
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 30 07:25:13 2009
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:806898-806906,807943-808180
+/maven/plugins/trunk/maven-site-plugin:806898-806906,807943-808180,809252
Modified: maven/plugins/branches/maven-site-plugin-3.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/pom.xml?rev=809256&r1=809255&r2=809256&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/pom.xml Sun Aug 30 07:25:13
2009
@@ -336,7 +336,7 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-help-plugin</artifactId>
+ <artifactId>maven-plugin-plugin</artifactId>
<version>2.5</version>
</plugin>
<plugin>
