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 :