maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agud...@apache.org
Subject [1/3] git commit: [SUREFIRE-989] fix site generation for failsafe-plugin
Date Sat, 27 Apr 2013 23:19:51 GMT
Updated Branches:
  refs/heads/master 1948fd441 -> 28e048818


[SUREFIRE-989] fix site generation for failsafe-plugin


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/3a87742e
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/3a87742e
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/3a87742e

Branch: refs/heads/master
Commit: 3a87742e9c8da06a85faaa7d25379dff5c1b8f50
Parents: 98a75bf
Author: Andreas Gudian <agudian@apache.org>
Authored: Sat Apr 27 21:57:13 2013 +0200
Committer: Andreas Gudian <agudian@apache.org>
Committed: Sat Apr 27 22:03:05 2013 +0200

----------------------------------------------------------------------
 maven-failsafe-plugin/pom.xml                      |    7 ++
 maven-surefire-plugin/pom.xml                      |   44 +++++++++++++++
 maven-surefire-plugin/src/assembly/site-source.xml |    9 +++
 pom.xml                                            |   12 ++--
 4 files changed, 67 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a87742e/maven-failsafe-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index 4ce02a2..58f5b30 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -153,6 +153,13 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <siteDirectory>${project.build.directory}/source-site</siteDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
         <executions>
           <execution>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a87742e/maven-surefire-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml
index 5b9cca4..8b4dae6 100644
--- a/maven-surefire-plugin/pom.xml
+++ b/maven-surefire-plugin/pom.xml
@@ -102,6 +102,50 @@
         </dependencies>
       </plugin>
       <plugin>
+        <artifactId>maven-site-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>prepare-site-source</id>
+            <phase>process-resources</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>
+      <!-- BEGIN HACK: use replacer plugin to remove the second xml processing instruction
(MSITE-670).  -->
+      <!-- can be removed once maven-site-plugin 3.3 is released. -->
+      <plugin>
+        <groupId>com.google.code.maven-replacer-plugin</groupId>
+        <artifactId>replacer</artifactId>
+        <version>1.5.2</version>
+        <executions>
+           <execution>
+               <phase>prepare-package</phase>
+               <goals>
+                   <goal>replace</goal>
+               </goals>                   
+           </execution>
+        </executions>
+        <configuration>
+           <regexFlags>
+             <regexFlag>DOTALL</regexFlag>
+           </regexFlags>
+           <file>${project.build.directory}/source-site/site.xml</file>
+           <replacements>
+               <replacement>
+                   <token>(.+)&lt;\?xml [^&gt;]+&gt;(.*)</token>
+                   <value>$1$2</value>
+               </replacement>         
+           </replacements>
+        </configuration>
+      </plugin>
+      <!-- END HACK -->
+      <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
           <execution>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a87742e/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 0c563eb..ff550c5 100644
--- a/maven-surefire-plugin/src/assembly/site-source.xml
+++ b/maven-surefire-plugin/src/assembly/site-source.xml
@@ -28,6 +28,15 @@
     <fileSet>
       <useDefaultExcludes>true</useDefaultExcludes>
       <directory>${basedir}/src/site</directory>
+      <excludes>
+        <exclude>site.xml</exclude>
+      </excludes>
+      <filtered>false</filtered>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <useDefaultExcludes>true</useDefaultExcludes>
+      <directory>${project.build.directory}/source-site</directory>
       <filtered>false</filtered>
       <outputDirectory>/</outputDirectory>
     </fileSet>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a87742e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dae63eb..2da7fb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -316,6 +316,13 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
           <version>3.2</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.doxia</groupId>
+              <artifactId>doxia-module-markdown</artifactId>
+              <version>1.3</version>
+            </dependency>
+          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -425,11 +432,6 @@
                   <artifactId>surefire-shadefire</artifactId>
                   <version>${project.version}</version>
                 </dependency -->
-                <dependency>
-                  <groupId>org.apache.maven.doxia</groupId>
-                  <artifactId>doxia-module-markdown</artifactId>
-                  <version>1.3</version>
-                </dependency>
               </dependencies>
             </plugin>
           </plugins>


Mime
View raw message