Author: olamy
Date: Wed Aug 26 20:59:12 2009
New Revision: 808185

URL: http://svn.apache.org/viewvc?rev=808185&view=rev
Log:
merge surefire report it from trunk.
svn merge -r 807942:808180 
https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin

Added:
    maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/
      - copied from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/pom.xml
      - copied unchanged from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/pom.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/src/
      - copied from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/src/
    
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/src/main/
      - copied from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/src/main/
    
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/src/main/java/
      - copied from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/src/main/java/
    
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/src/main/java/org/
      - copied from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/src/main/java/org/
    
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/src/main/java/org/apache/
      - copied from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/src/main/java/org/apache/
    
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/src/main/java/org/apache/maven/
      - copied from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/src/main/java/org/apache/maven/
    
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/src/main/java/org/apache/maven/plugins/
      - copied from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/src/main/java/org/apache/maven/plugins/
    
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/src/main/java/org/apache/maven/plugins/site/
      - copied from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/src/main/java/org/apache/maven/plugins/site/
    
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/src/main/java/org/apache/maven/plugins/site/its/
      - copied from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/src/main/java/org/apache/maven/plugins/site/its/
    
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/src/main/java/org/apache/maven/plugins/site/its/App.java
      - copied unchanged from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/src/main/java/org/apache/maven/plugins/site/its/App.java
    
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/src/test/
      - copied from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/src/test/
    
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/src/test/java/
      - copied from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/src/test/java/
    
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/src/test/java/org/
      - copied from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/src/test/java/org/
    
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/src/test/java/org/apache/
      - copied from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/src/test/java/org/apache/
    
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/src/test/java/org/apache/maven/
      - copied from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/src/test/java/org/apache/maven/
    
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/src/test/java/org/apache/maven/plugins/
      - copied from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/src/test/java/org/apache/maven/plugins/
    
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/src/test/java/org/apache/maven/plugins/site/
      - copied from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/src/test/java/org/apache/maven/plugins/site/
    
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/src/test/java/org/apache/maven/plugins/site/its/
      - copied from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/src/test/java/org/apache/maven/plugins/site/its/
    
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/src/test/java/org/apache/maven/plugins/site/its/AppTest.java
      - copied unchanged from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/src/test/java/org/apache/maven/plugins/site/its/AppTest.java
    
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/verify.groovy
      - copied unchanged from r808180, 
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/verify.groovy
Modified:
    maven/plugins/branches/maven-site-plugin-3.x/   (props changed)

Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 26 20:59:12 2009
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:806898-806906
+/maven/plugins/trunk/maven-site-plugin:806898-806906,807943-808180


Reply via email to