[SUREFIRE-1015] Fix failsafe site creation New attempt: don't use the effective-site of surefire-plugin to pull in the site definition from the aggregator, but copy the aggregator site.xml to a directory matching the unpack-dir in failsafe
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/17fb2c9e Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/17fb2c9e Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/17fb2c9e Branch: refs/heads/master Commit: 17fb2c9e9e89c2bc86aec6c904aaa16a3b6f0aa4 Parents: 43feabc Author: Andreas Gudian <agud...@apache.org> Authored: Sat Jul 13 22:45:24 2013 +0200 Committer: Andreas Gudian <agud...@apache.org> Committed: Sat Jul 13 22:45:24 2013 +0200 ---------------------------------------------------------------------- maven-failsafe-plugin/pom.xml | 21 ++++++++++++++++++++ maven-surefire-plugin/pom.xml | 16 --------------- .../src/assembly/site-source.xml | 3 --- 3 files changed, 21 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/17fb2c9e/maven-failsafe-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index d8dcd0c..e0ef61d 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -152,6 +152,27 @@ </executions> </plugin> <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy-resources</id> + <phase>pre-site</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${basedir}/../target/source-site</outputDirectory> + <resources> + <resource> + <directory>../src/site</directory> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> <configuration> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/17fb2c9e/maven-surefire-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml index 3524f9e..3f2c3e5 100644 --- a/maven-surefire-plugin/pom.xml +++ b/maven-surefire-plugin/pom.xml @@ -102,22 +102,6 @@ </dependencies> </plugin> <plugin> - <artifactId>maven-site-plugin</artifactId> - <executions> - <execution> - <id>prepare-site-source</id> - <phase>pre-site</phase> - <goals> - <goal>effective-site</goal> - </goals> - <configuration> - <siteDirectory>${basedir}/src/site</siteDirectory> - <output>${project.build.directory}/source-site/site.xml</output> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/17fb2c9e/maven-surefire-plugin/src/assembly/site-source.xml ---------------------------------------------------------------------- diff --git a/maven-surefire-plugin/src/assembly/site-source.xml b/maven-surefire-plugin/src/assembly/site-source.xml index ff550c5..25fc6b8 100644 --- a/maven-surefire-plugin/src/assembly/site-source.xml +++ b/maven-surefire-plugin/src/assembly/site-source.xml @@ -28,9 +28,6 @@ <fileSet> <useDefaultExcludes>true</useDefaultExcludes> <directory>${basedir}/src/site</directory> - <excludes> - <exclude>site.xml</exclude> - </excludes> <filtered>false</filtered> <outputDirectory>/</outputDirectory> </fileSet>
