maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r1479095 - in /maven/plugins/trunk/maven-site-plugin/src/it: site-stage-deploy-2/ site-stage-deploy-2/plugins/ site-stage-deploy-2/pom/ site-stage-deploy-3/ site-stage-deploy-4/ site-stage-deploy/ top-parent-different-site/ top-parent-no-site/
Date Sat, 04 May 2013 13:03:27 GMT
Author: hboutemy
Date: Sat May  4 13:03:27 2013
New Revision: 1479095

URL: http://svn.apache.org/r1479095
Log:
renamed ITs about site:stage-deploy to better match the logic: each IT purpose is described
in main POM name and/or description

Added:
    maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-2/
      - copied from r1479067, maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy/
    maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-3/
      - copied from r1479067, maven/plugins/trunk/maven-site-plugin/src/it/top-parent-no-site/
    maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-4/
      - copied from r1479067, maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/
Removed:
    maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy/
    maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/
    maven/plugins/trunk/maven-site-plugin/src/it/top-parent-no-site/
Modified:
    maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-2/plugins/pom.xml
    maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-2/pom.xml
    maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-2/pom/pom.xml
    maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-2/verify.bsh
    maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-3/pom.xml
    maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-4/pom.xml

Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-2/plugins/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-2/plugins/pom.xml?rev=1479095&r1=1479067&r2=1479095&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-2/plugins/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-2/plugins/pom.xml Sat May
 4 13:03:27 2013
@@ -40,7 +40,7 @@ under the License.
     <!-- override parent because artifactId does not match -->
     <site>
       <id>website</id>
-      <url>file://@project.build.directory@/it/site-stage-deploy/deploy/plugins/</url>
+      <url>file://@project.build.directory@/it/site-stage-deploy-2/deploy/plugins/</url>
     </site>
   </distributionManagement>
 

Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-2/pom.xml?rev=1479095&r1=1479067&r2=1479095&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-2/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-2/pom.xml Sat May  4 13:03:27
2013
@@ -28,12 +28,13 @@ under the License.
   <packaging>pom</packaging>
 
   <name>Aggregator</name>
+  <description>Complex stage-deploy test</description>
   <url>http://example.net/junk/</url>
 
   <distributionManagement>
     <site>
       <id>website</id>
-      <url>file://@project.build.directory@/it/site-stage-deploy/deploy/junk/</url>
+      <url>file://@project.build.directory@/it/site-stage-deploy-2/deploy/junk/</url>
     </site>
   </distributionManagement>
 

Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-2/pom/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-2/pom/pom.xml?rev=1479095&r1=1479067&r2=1479095&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-2/pom/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-2/pom/pom.xml Sat May 
4 13:03:27 2013
@@ -34,7 +34,7 @@ under the License.
   <distributionManagement>
     <site>
       <id>website</id>
-      <url>file://@project.build.directory@/it/site-stage-deploy/deploy/</url>
+      <url>file://@project.build.directory@/it/site-stage-deploy-2/deploy/</url>
     </site>
   </distributionManagement>
 

Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-2/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-2/verify.bsh?rev=1479095&r1=1479067&r2=1479095&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-2/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-2/verify.bsh Sat May  4
13:03:27 2013
@@ -28,7 +28,7 @@ try
     final File deployDirectory = new File( basedir, "deploy" );
     if ( !deployDirectory.exists() || !deployDirectory.isDirectory() )
     {
-        System.err.println( "deployDirectory is missing or not a directory." );
+        System.err.println( "deploy directory is missing or not a directory: " + deployDirectory
);
         return false;
     }
 
@@ -36,7 +36,7 @@ try
     File junkDirectory = new File( deployDirectory, "junk" );
     if ( !junkDirectory.exists() || !junkDirectory.isDirectory() )
     {
-        System.err.println( "junkDirectory is missing or not a directory." );
+        System.err.println( "junk directory is missing or not a directory: " + junkDirectory
);
         return false;
     }
 
@@ -44,7 +44,7 @@ try
     File pluginsDirectory = new File( deployDirectory, "plugins" );
     if ( !pluginsDirectory.exists() || !pluginsDirectory.isDirectory() )
     {
-        System.err.println( "deploy pluginsDirectory is missing or not a directory." );
+        System.err.println( "deploy pluginsDirectory is missing or not a directory: " + pluginsDirectory
);
         return false;
     }
 
@@ -52,7 +52,7 @@ try
     File mavenRocksDirectory = new File( pluginsDirectory, "maven-rocks-plugin" );
     if ( !mavenRocksDirectory.exists() || !mavenRocksDirectory.isDirectory() )
     {
-        System.err.println( "deploy mavenRocksDirectory is missing or not a directory." );
+        System.err.println( "deploy mavenRocksDirectory is missing or not a directory: "
+ mavenRocksDirectory );
         return false;
     }
 

Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-3/pom.xml?rev=1479095&r1=1479067&r2=1479095&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-3/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-3/pom.xml Sat May  4 13:03:27
2013
@@ -31,16 +31,17 @@ under the License.
 
   <groupId>org.apache.maven.plugins.its.noparentsite</groupId>
   <artifactId>main</artifactId>
-  <packaging>pom</packaging>
-  <name>main</name>
   <version>1.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <name>top-parent-no-site</name>
 
   <url>http://dummy.com/</url>
 
   <distributionManagement>
     <site>
       <id>website</id>
-      <url>file://@project.build.directory@/it/top-parent-no-site/deploy/</url>
+      <url>file://@project.build.directory@/it/site-stage-deploy-3/deploy/</url>
     </site>
   </distributionManagement>
 

Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-4/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-4/pom.xml?rev=1479095&r1=1479067&r2=1479095&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-4/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy-4/pom.xml Sat May  4 13:03:27
2013
@@ -31,16 +31,17 @@ under the License.
 
   <groupId>org.apache.maven.plugins.its.differentparentsite</groupId>
   <artifactId>main</artifactId>
-  <packaging>pom</packaging>
-  <name>main</name>
   <version>1.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <name>top-parent-different-site</name>
 
   <url>http://dummy.com/</url>
 
   <distributionManagement>
     <site>
       <id>website</id>
-      <url>file://@project.build.directory@/it/top-parent-different-site/deploy/</url>
+      <url>file://@project.build.directory@/it/site-stage-deploy-4/deploy/</url>
     </site>
   </distributionManagement>
 



Mime
View raw message