diff --git a/cruisecontrol/plugin.jelly b/cruisecontrol/plugin.jelly index 999a4403..78311fbe 100644 --- a/cruisecontrol/plugin.jelly +++ b/cruisecontrol/plugin.jelly @@ -65,7 +65,7 @@ value="${maven.build.dir}/cruisecontrol-config-temp.xml" /> + value="file:${maven.cruisecontrol.template}" /> diff --git a/cruisecontrol/plugin.properties b/cruisecontrol/plugin.properties index fce69019..898066d8 100644 --- a/cruisecontrol/plugin.properties +++ b/cruisecontrol/plugin.properties @@ -23,3 +23,4 @@ maven.cruisecontrol.home=CC_HOME_NOT_SET maven.cruisecontrol.mail.host=localhost maven.cruisecontrol.mail.defaultsuffix=DEFAULT_SUFFIX_NOT_SET maven.cruisecontrol.mail.subjectprefix=[BUILD] +maven.cruisecontrol.template=${plugin.resources}/cruisecontrol.jsl diff --git a/cruisecontrol/project.xml b/cruisecontrol/project.xml index b2ecc442..17284c1c 100644 --- a/cruisecontrol/project.xml +++ b/cruisecontrol/project.xml @@ -22,7 +22,7 @@ ../plugin-parent/project.xml maven-cruisecontrol-plugin Maven Cruise Control Plugin - 1.2 + 1.3-dev A plugin to handle the generating and maintaining of Cruise Control configuration. Requires Maven 1.0 RC2. Cruise Control Plugin for Maven http://maven.apache.org/reference/plugins/cruisecontrol/ @@ -55,6 +55,15 @@ Java Developer + + Eric Pugh + epugh + epugh@opensourceconnections.com + OpenSource Connections + + Java Developer + + diff --git a/cruisecontrol/xdocs/changes.xml b/cruisecontrol/xdocs/changes.xml index b49ca482..59d0cdfa 100644 --- a/cruisecontrol/xdocs/changes.xml +++ b/cruisecontrol/xdocs/changes.xml @@ -24,6 +24,9 @@ Brett Porter + + allow user to specify different cc template to use + fix problem if target does not exist diff --git a/cruisecontrol/xdocs/properties.xml b/cruisecontrol/xdocs/properties.xml index 3a8216fe..ba020e92 100644 --- a/cruisecontrol/xdocs/properties.xml +++ b/cruisecontrol/xdocs/properties.xml @@ -101,6 +101,13 @@ ${pom.build.nagEmailAddress}.

+ + maven.cruisecontrol.template + Yes + +

Template file to use in generating the cruisecontrol.xml file.

+ +