You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ag...@apache.org on 2013/07/14 00:46:01 UTC

[1/2] git commit: o Cleanup site creation

Updated Branches:
  refs/heads/master 17fb2c9e9 -> afe18ee61


o Cleanup site creation


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

Branch: refs/heads/master
Commit: 1347e067134019c4308b792c24bd8688ccea1b61
Parents: 17fb2c9
Author: Andreas Gudian <ag...@apache.org>
Authored: Sun Jul 14 00:41:22 2013 +0200
Committer: Andreas Gudian <ag...@apache.org>
Committed: Sun Jul 14 00:41:22 2013 +0200

----------------------------------------------------------------------
 maven-failsafe-plugin/pom.xml |  2 +-
 maven-surefire-plugin/pom.xml | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1347e067/maven-failsafe-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index e0ef61d..6efe665 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -164,7 +164,7 @@
               <outputDirectory>${basedir}/../target/source-site</outputDirectory>
               <resources>
                 <resource>
-                  <directory>../src/site</directory>
+                  <directory>${basedir}/../src/site</directory>
                   <filtering>false</filtering>
                 </resource>
               </resources>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1347e067/maven-surefire-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml
index 3f2c3e5..8f29469 100644
--- a/maven-surefire-plugin/pom.xml
+++ b/maven-surefire-plugin/pom.xml
@@ -118,20 +118,6 @@
               </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>


[2/2] git commit: [SUREFIRE-1016] Pin down SCM URLs to to avoid interpolation in the sub-modules

Posted by ag...@apache.org.
[SUREFIRE-1016] Pin down SCM URLs to to avoid interpolation in the sub-modules


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

Branch: refs/heads/master
Commit: afe18ee61f4a61fb7bce94b579dc7ac17b39024d
Parents: 1347e06
Author: Andreas Gudian <ag...@apache.org>
Authored: Sun Jul 14 00:45:41 2013 +0200
Committer: Andreas Gudian <ag...@apache.org>
Committed: Sun Jul 14 00:45:41 2013 +0200

----------------------------------------------------------------------
 pom.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/afe18ee6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 44df5f3..c5257d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,9 +98,9 @@
   </modules>
 
   <scm>
-    <connection>scm:git:https://git-wip-us.apache.org/repos/asf/maven-surefire.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/maven-surefire.git</developerConnection>
-    <url>https://git-wip-us.apache.org/repos/asf?p=maven-surefire.git</url>
+    <connection>${maven.surefire.scm.devConnection}</connection>
+    <developerConnection>${maven.surefire.scm.devConnection}</developerConnection>
+    <url>${maven.surefire.scm.url}</url>
   </scm>
   <issueManagement>
     <system>jira</system>
@@ -116,6 +116,8 @@
     <shadedVersion>2.12.4</shadedVersion>
     <mavenPluginPluginVersion>3.2</mavenPluginPluginVersion>
 
+    <maven.surefire.scm.devConnection>scm:git:https://git-wip-us.apache.org/repos/asf/maven-surefire.git</maven.surefire.scm.devConnection>
+    <maven.surefire.scm.url>https://git-wip-us.apache.org/repos/asf?p=maven-surefire.git</maven.surefire.scm.url>
 
     <maven.site.cache>${user.home}/maven-sites</maven.site.cache>
     <maven.surefire.siteFilePath>${maven.site.cache}/surefire-${project.version}</maven.surefire.siteFilePath>
@@ -372,9 +374,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.6</version>
+        <version>2.7</version>
         <configuration>
           <dependencyLocationsEnabled>false</dependencyLocationsEnabled><!-- waiting for MPIR-267 -->
+          <!-- pin down urls to to avoid interpolation in the modules -->
+          <webAccessUrl>${maven.surefire.scm.url}</webAccessUrl>
+          <anonymousConnection>${maven.surefire.scm.devConnection}</anonymousConnection>
+          <developerConnection>${maven.surefire.scm.devConnection}</developerConnection>
         </configuration>
         <reportSets>
           <reportSet>