diff --git a/cruisecontrol/plugin.properties b/cruisecontrol/plugin.properties index 9198f58e..36060b4a 100644 --- a/cruisecontrol/plugin.properties +++ b/cruisecontrol/plugin.properties @@ -37,13 +37,13 @@ maven.cruisecontrol.schedule.type=interval maven.cruisecontrol.schedule.interval=300 maven.cruisecontrol.schedule.time=1900 -# If left undefined this property is computed automatically by the plugin -# from the ${maven.build.dir} property. -#maven.cruisecontrol.logs.mergedirectory=${maven.cruisecontrol.checkout.dir}/${module}/target/test-reports +# 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}/${module} +maven.cruisecontrol.logs.pattern=TEST-*.xml maven.cruisecontrol.logs.merge=true maven.cruisecontrol.logs.encodingtype=ISO-8859-1 -maven.cruisecontrol.logs.pattern=*.xml maven.cruisecontrol.currentbuildstatus.filename=status.txt diff --git a/cruisecontrol/xdocs/changes.xml b/cruisecontrol/xdocs/changes.xml index 18053200..a37a945e 100644 --- a/cruisecontrol/xdocs/changes.xml +++ b/cruisecontrol/xdocs/changes.xml @@ -26,6 +26,11 @@ + + Modified default value of maven.cruisecontrol.logs.mergedirectory + so that CC can aggregate JUnit test reports both for single project and + multiproject setups. + Compute automatically the merge directory automatically (the value of maven.cruisecontrol.logs.mergedirectory diff --git a/cruisecontrol/xdocs/faq.fml b/cruisecontrol/xdocs/faq.fml index fe1ddfbf..dc563453 100644 --- a/cruisecontrol/xdocs/faq.fml +++ b/cruisecontrol/xdocs/faq.fml @@ -139,17 +139,6 @@ maven.cruisecontrol.template=${plugin.resources}/my-cc-template.jsl]]> project for your multiproject (i.e. viewing the multiproject project as one project only). - - - How can I tell CC to correctly merge JUnit logs for a multiproject setup? - - Define the following 2 properties in the project.properties file of your master project: - - -