From 8c17a346b02ff92bbd2cfb494368709088d69ad4 Mon Sep 17 00:00:00 2001 From: ltheussl Date: Sun, 23 Apr 2006 05:17:42 +0000 Subject: [PATCH] PR: MPCRUISECONTROL-29 Default for maven.cruisecontrol.logs.mergedirectory is incorrect on the Properties page. git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@396217 13f79535-47bb-0310-9956-ffa450edef68 --- cruisecontrol/plugin.properties | 2 +- cruisecontrol/xdocs/changes.xml | 1 + cruisecontrol/xdocs/properties.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cruisecontrol/plugin.properties b/cruisecontrol/plugin.properties index 30b92006..800bcd17 100644 --- a/cruisecontrol/plugin.properties +++ b/cruisecontrol/plugin.properties @@ -39,7 +39,7 @@ maven.cruisecontrol.schedule.time=1900 # 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 diff --git a/cruisecontrol/xdocs/changes.xml b/cruisecontrol/xdocs/changes.xml index bb32dd9f..ec289a3a 100644 --- a/cruisecontrol/xdocs/changes.xml +++ b/cruisecontrol/xdocs/changes.xml @@ -26,6 +26,7 @@ + Default for maven.cruisecontrol.logs.mergedirectory is incorrect on the Properties page. Property maven.cruisecontrol.goals contains deprecated scm:update-project. Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
    diff --git a/cruisecontrol/xdocs/properties.xml b/cruisecontrol/xdocs/properties.xml index 5cf94c15..2d5b1d2e 100644 --- a/cruisecontrol/xdocs/properties.xml +++ b/cruisecontrol/xdocs/properties.xml @@ -114,7 +114,7 @@ Directory containing .xml reports files to merge. Default value is - ${maven.cruisecontrol.checkout.dir}/${module}/[maven.build.dir relative location]/test-reports. + ${maven.cruisecontrol.checkout.dir}/${pom.artifactId}/${maven.build.dir}/test-reports.