is there a special reason for this? I didn't notice any interference effects and the deploy locations were chosen such that they correspond to common default values (eg stage-deploy = deploy + "staging"), so if there is a problem, maybe this needs to be fixed separately?
-Lukas denn...@apache.org wrote:
Author: dennisl Date: Wed Mar 16 18:14:30 2011 New Revision: 1082242 URL: http://svn.apache.org/viewvc?rev=1082242&view=rev Log: o Move the stage-deploy directory out of the deploy directory for this IT, to make sure they don't interfere with each other. Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/aggregator/pom.xml maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/module/pom.xml maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/parent/pom.xml maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/pom.xml maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/verify.bsh Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/aggregator/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/aggregator/pom.xml?rev=1082242&r1=1082241&r2=1082242&view=diff ============================================================================== --- maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/aggregator/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/aggregator/pom.xml Wed Mar 16 18:14:30 2011 @@ -23,8 +23,8 @@ <artifactId>maven-site-plugin</artifactId> <version>@project.version@</version> <configuration> -<stagingDirectory>@project.build.directory@/it/site-inheritance/webhost.company.com/staging/</stagingDirectory> -<stagingSiteURL>file:///@project.build.directory@/it/site-inheritance/webhost.company.com/deploy/staging/</stagingSiteURL> +<stagingDirectory>@project.build.directory@/it/site-inheritance/webhost.company.com/stage/</stagingDirectory> +<stagingSiteURL>file:///@project.build.directory@/it/site-inheritance/webhost.company.com/stage-deploy/</stagingSiteURL> </configuration> </plugin> </plugins> Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/module/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/module/pom.xml?rev=1082242&r1=1082241&r2=1082242&view=diff ============================================================================== --- maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/module/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/module/pom.xml Wed Mar 16 18:14:30 2011 @@ -22,8 +22,8 @@ <artifactId>maven-site-plugin</artifactId> <version>@project.version@</version> <configuration> -<stagingDirectory>@project.build.directory@/it/site-inheritance/webhost.company.com/staging/www/website/module</stagingDirectory> -<stagingSiteURL>file:///@project.build.directory@/it/site-inheritance/webhost.company.com/deploy/staging/www/website/module</stagingSiteURL> +<stagingDirectory>@project.build.directory@/it/site-inheritance/webhost.company.com/stage/www/website/module</stagingDirectory> +<stagingSiteURL>file:///@project.build.directory@/it/site-inheritance/webhost.company.com/stage-deploy/www/website/module</stagingSiteURL> </configuration> </plugin> </plugins> Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/parent/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/parent/pom.xml?rev=1082242&r1=1082241&r2=1082242&view=diff ============================================================================== --- maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/parent/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/parent/pom.xml Wed Mar 16 18:14:30 2011 @@ -23,8 +23,8 @@ <artifactId>maven-site-plugin</artifactId> <version>@project.version@</version> <configuration> -<stagingDirectory>@project.build.directory@/it/site-inheritance/webhost.company.com/staging/</stagingDirectory> -<stagingSiteURL>file:///@project.build.directory@/it/site-inheritance/webhost.company.com/deploy/staging/</stagingSiteURL> +<stagingDirectory>@project.build.directory@/it/site-inheritance/webhost.company.com/stage/</stagingDirectory> +<stagingSiteURL>file:///@project.build.directory@/it/site-inheritance/webhost.company.com/stage-deploy/</stagingSiteURL> </configuration> </plugin> </plugins> Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/pom.xml?rev=1082242&r1=1082241&r2=1082242&view=diff ============================================================================== --- maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/pom.xml Wed Mar 16 18:14:30 2011 @@ -23,8 +23,8 @@ <artifactId>maven-site-plugin</artifactId> <version>@project.version@</version> <configuration> -<stagingDirectory>@project.build.directory@/it/site-inheritance/webhost.company.com/staging/junk/</stagingDirectory> -<stagingSiteURL>file:///@project.build.directory@/it/site-inheritance/webhost.company.com/deploy/staging/junk/</stagingSiteURL> +<stagingDirectory>@project.build.directory@/it/site-inheritance/webhost.company.com/stage/junk/</stagingDirectory> +<stagingSiteURL>file:///@project.build.directory@/it/site-inheritance/webhost.company.com/stage-deploy/junk/</stagingSiteURL> </configuration> </plugin> </plugins>
[snip] --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
