You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2006/04/23 07:17:44 UTC

svn commit: r396217 - in /maven/maven-1/plugins/trunk/cruisecontrol: plugin.properties xdocs/changes.xml xdocs/properties.xml

Author: ltheussl
Date: Sat Apr 22 22:17:42 2006
New Revision: 396217

URL: http://svn.apache.org/viewcvs?rev=396217&view=rev
Log:
PR: MPCRUISECONTROL-29
Default for maven.cruisecontrol.logs.mergedirectory is incorrect on the Properties page.

Modified:
    maven/maven-1/plugins/trunk/cruisecontrol/plugin.properties
    maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml
    maven/maven-1/plugins/trunk/cruisecontrol/xdocs/properties.xml

Modified: maven/maven-1/plugins/trunk/cruisecontrol/plugin.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/cruisecontrol/plugin.properties?rev=396217&r1=396216&r2=396217&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/cruisecontrol/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/cruisecontrol/plugin.properties Sat Apr 22 22:17:42 2006
@@ -39,7 +39,7 @@
 
 # We use the root directory to search for JUnit report files so that it works
 # both in single and multiproject setups.
-maven.cruisecontrol.logs.mergedirectory=${maven.cruisecontrol.checkout.dir}/${pom.artifactId}
+maven.cruisecontrol.logs.mergedirectory=${maven.cruisecontrol.checkout.dir}/${pom.artifactId}/${maven.build.dir}/test-reports
 maven.cruisecontrol.logs.pattern=TEST-*.xml
 
 maven.cruisecontrol.logs.merge=true

Modified: maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml?rev=396217&r1=396216&r2=396217&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml Sat Apr 22 22:17:42 2006
@@ -26,6 +26,7 @@
   </properties>
   <body>
     <release version="1.8-SNAPSHOT" date="In SVN">
+      <action dev="ltheussl" type="fix" issue="MPCRUISECONTROL-29">Default for <code>maven.cruisecontrol.logs.mergedirectory</code> is incorrect on the Properties page.</action>
       <action dev="ltheussl" type="fix" issue="MPCRUISECONTROL-33">Property <code>maven.cruisecontrol.goals</code> contains deprecated <code>scm:update-project</code>.</action>
       <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : 
         <ul>

Modified: maven/maven-1/plugins/trunk/cruisecontrol/xdocs/properties.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/cruisecontrol/xdocs/properties.xml?rev=396217&r1=396216&r2=396217&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/cruisecontrol/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/cruisecontrol/xdocs/properties.xml Sat Apr 22 22:17:42 2006
@@ -114,7 +114,7 @@
           <td>
             Directory containing .xml reports files to merge. 
             Default value is
-            <code>${maven.cruisecontrol.checkout.dir}/${module}/[maven.build.dir relative location]/test-reports</code>.
+            <code>${maven.cruisecontrol.checkout.dir}/${pom.artifactId}/${maven.build.dir}/test-reports</code>.
           </td>
         </tr>
         <tr>