diff --git a/ant/plugin.jelly b/ant/plugin.jelly index 75aaf81e..8bc7a640 100644 --- a/ant/plugin.jelly +++ b/ant/plugin.jelly @@ -22,7 +22,9 @@ xmlns:ant="jelly:ant" xmlns:maven="jelly:maven" xmlns:test="test" - xmlns:j="jelly:core"> + xmlns:j="jelly:core" + xmlns:i="jelly:interaction" + xmlns:u="jelly:util"> @@ -37,21 +39,52 @@ description="Generate an Ant build file" prereqs="ant:generate-build"/> - - - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - The property "maven.ant.generatebuild.file" is no more used. - Use the properties "maven.ant.generate.dir" and "maven.ant.generate.script" instead - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + + + + + The ant script [${maven.ant.generate.dir}/${maven.ant.generate.script}] already exists !! + + + + + + !! Your script will be replaced replaced !! + + + Script generation aborted. + + + + + + The property "maven.ant.generate.force" is setted to [${maven.ant.generate.force}]. + !! Your current script will be replaced !! + + + + + + + + + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + The property "maven.ant.generatebuild.file" is no more used. + Use the properties "maven.ant.generate.dir" and "maven.ant.generate.script" instead + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + + Generating ${maven.ant.generate.dir}/${maven.ant.generate.script} ... + + + + + ${maven.ant.generate.dir}/${maven.ant.generate.script} generated. - Generating ${maven.ant.generate.dir}/${maven.ant.generate.script} ... - - - - - ${maven.ant.generate.dir}/${maven.ant.generate.script} generated. This library is already loaded by maven's core. Be careful to use the same version number as in the core. + + commons-jelly + commons-jelly-tags-interaction + 1.0 + maven-changes-plugin diff --git a/ant/xdocs/changes.xml b/ant/xdocs/changes.xml index 9ad9afdb..801f4bfb 100644 --- a/ant/xdocs/changes.xml +++ b/ant/xdocs/changes.xml @@ -26,6 +26,7 @@ + The plugin overwrote existing ant script files without warning. From now the plugin ask you if you want to replace it. You can also use the property maven.ant.generate.force to force the plugin to replace the current script. The property maven.ant.generatebuild.file is replaced by properties maven.ant.generate.dir, maven.ant.generate.script. The generated script is ${maven.ant.generate.dir}/${maven.ant.generate.script}. The property maven.ant.generatebuild.file is removed. Add a new goal (ant:execute) to execute a build.xml file from maven. diff --git a/ant/xdocs/properties.xml b/ant/xdocs/properties.xml index 70464625..079bbcf9 100644 --- a/ant/xdocs/properties.xml +++ b/ant/xdocs/properties.xml @@ -47,6 +47,13 @@ Yes ${basedir} + + maven.ant.generate.force + If the ant script file already exists the plugin ask you if you want to replace it. Setting this property to true, will force the plugin to overwrite this file without to ask the question. + since 1.10 + Yes + false + maven.ant.excludeTests Holds a comma separated list of source file patterns that will be excluded in the generated Ant build, e.g.