You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2009/08/23 01:55:22 UTC

svn commit: r806909 - in /maven/plugins/branches/maven-site-plugin-3.x: ./ src/it/site-attach-descriptor/ src/it/site-attach-descriptor/src/ src/it/site-attach-descriptor/src/site/ src/it/site-attach-descriptor/src/site/xdoc/ src/it/site-deploy/ src/it...

Author: olamy
Date: Sat Aug 22 23:55:21 2009
New Revision: 806909

URL: http://svn.apache.org/viewvc?rev=806909&view=rev
Log:
merge new its from trunk (merge -r 806897:806906 )

Added:
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/   (props changed)
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/goals.txt
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/goals.txt
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/pom.xml
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/pom.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/src/
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/src/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/src/site/
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/src/site/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/src/site/site.xml
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/src/site/site.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/src/site/xdoc/
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/src/site/xdoc/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/src/site/xdoc/index.xml
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/src/site/xdoc/index.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/verify.bsh
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/verify.bsh
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/   (props changed)
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/goals.txt
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/goals.txt
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/pom.xml
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/pom.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/src/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/main/
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/src/main/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/main/java/
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/src/main/java/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/main/java/foo/
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/src/main/java/foo/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/main/java/foo/App.java
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/src/main/java/foo/App.java
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/src/site/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/apt/
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/src/site/apt/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/apt/download.apt.vm
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/src/site/apt/download.apt.vm
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/site.xml
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/src/site/site.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/xdoc/
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/src/site/xdoc/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/xdoc/index.xml
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/src/site/xdoc/index.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/xdoc/releases/
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/src/site/xdoc/releases/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/xdoc/releases/release1.6.3.xml
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/src/site/xdoc/releases/release1.6.3.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/src/site/xdoc/releases/release1.6.xml
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/src/site/xdoc/releases/release1.6.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/verify.bsh
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/verify.bsh
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/   (props changed)
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-jar/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/goals.txt
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-jar/goals.txt
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/pom.xml
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-jar/pom.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-jar/src/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/main/
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-jar/src/main/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/main/java/
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-jar/src/main/java/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/main/java/foo/
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-jar/src/main/java/foo/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/main/java/foo/App.java
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-jar/src/main/java/foo/App.java
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-jar/src/site/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/apt/
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-jar/src/site/apt/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/apt/download.apt.vm
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-jar/src/site/apt/download.apt.vm
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/site.xml
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-jar/src/site/site.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/xdoc/
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-jar/src/site/xdoc/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/xdoc/index.xml
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-jar/src/site/xdoc/index.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/xdoc/releases/
      - copied from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-jar/src/site/xdoc/releases/
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/xdoc/releases/release1.6.3.xml
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-jar/src/site/xdoc/releases/release1.6.3.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/src/site/xdoc/releases/release1.6.xml
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-jar/src/site/xdoc/releases/release1.6.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/verify.bsh
      - copied unchanged from r806906, maven/plugins/trunk/maven-site-plugin/src/it/site-jar/verify.bsh
Modified:
    maven/plugins/branches/maven-site-plugin-3.x/   (props changed)

Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
    svn:mergeinfo = /maven/plugins/trunk/maven-site-plugin:806898-806906

Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 22 23:55:21 2009
@@ -0,0 +1,2 @@
+build.log
+target

Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 22 23:55:21 2009
@@ -0,0 +1,2 @@
+build.log
+target

Propchange: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 22 23:55:21 2009
@@ -0,0 +1,2 @@
+build.log
+target