You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by st...@apache.org on 2011/07/08 14:52:14 UTC
svn commit: r1144298 - in /maven/surefire/trunk:
maven-failsafe-plugin/pom.xml maven-failsafe-plugin/src/site/
maven-surefire-plugin/pom.xml maven-surefire-plugin/src/assembly/
maven-surefire-plugin/src/assembly/site-source.xml
Author: stephenc
Date: Fri Jul 8 12:52:13 2011
New Revision: 1144298
URL: http://svn.apache.org/viewvc?rev=1144298&view=rev
Log:
[SUREFIRE-752] Fix duplication in surefire/failsafe sites.
o A tad hackier than I would like, but less evil than svn:externals, and we can always go back to the old two copies way without too much pain
o Note that you cannot actually build the whole site from the root anyway unless you have done an install first, but by attaching the site-source.zip on both lifecycles we ensure that the generated site is always based off the correct source if you are doing a multi-module build.
o site:run is less than perfect for maven-failsafe-plugin with this solution :-(
Added:
maven/surefire/trunk/maven-surefire-plugin/src/assembly/
maven/surefire/trunk/maven-surefire-plugin/src/assembly/site-source.xml
Removed:
maven/surefire/trunk/maven-failsafe-plugin/src/site/
Modified:
maven/surefire/trunk/maven-failsafe-plugin/pom.xml
maven/surefire/trunk/maven-surefire-plugin/pom.xml
Modified: maven/surefire/trunk/maven-failsafe-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/pom.xml?rev=1144298&r1=1144297&r2=1144298&view=diff
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-failsafe-plugin/pom.xml Fri Jul 8 12:52:13 2011
@@ -158,6 +158,14 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-toolchain</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.10-SNAPSHOT</version>
+ <scope>provided</scope>
+ <type>zip</type>
+ <classifier>site-source</classifier>
+ </dependency>
</dependencies>
<build>
@@ -196,6 +204,7 @@
<artifactId>maven-site-plugin</artifactId>
<configuration>
<stagingSiteURL>scp://people.apache.org/www/maven.apache.org/plugins/${project.artifactId}-${project.version}</stagingSiteURL>
+ <siteDirectory>${project.build.directory}/source-site</siteDirectory>
</configuration>
</plugin>
<plugin>
@@ -244,6 +253,26 @@
<settingsFile>src/it/settings.xml</settingsFile>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>site-site</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>maven-surefire-plugin</includeArtifactIds>
+ <includeScope>provided</includeScope>
+ <includeTypes>zip</includeTypes>
+ <includeClassifiers>site-source</includeClassifiers>
+ <outputDirectory>${project.build.directory}/source-site</outputDirectory>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: maven/surefire/trunk/maven-surefire-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/pom.xml?rev=1144298&r1=1144297&r2=1144298&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-plugin/pom.xml Fri Jul 8 12:52:13 2011
@@ -205,6 +205,39 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-site</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <attach>true</attach>
+ <classifier>site-source</classifier>
+ <descriptors>
+ <descriptor>src/assembly/site-source.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ <execution>
+ <id>site-site</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <attach>true</attach>
+ <classifier>site-source</classifier>
+ <descriptors>
+ <descriptor>src/assembly/site-source.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Added: maven/surefire/trunk/maven-surefire-plugin/src/assembly/site-source.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/assembly/site-source.xml?rev=1144298&view=auto
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/assembly/site-source.xml (added)
+++ maven/surefire/trunk/maven-surefire-plugin/src/assembly/site-source.xml Fri Jul 8 12:52:13 2011
@@ -0,0 +1,16 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>site-source</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <directory>${basedir}/src/site</directory>
+ <filtered>false</filtered>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file