From f010fba57aeeb3d563745e77e05d36ad121e5a47 Mon Sep 17 00:00:00 2001 From: aheritier Date: Mon, 8 May 2006 23:14:54 +0000 Subject: [PATCH] MPANT-25: Add a new goal (ant:execute) to execute a build.xml file from maven. git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@405217 13f79535-47bb-0310-9956-ffa450edef68 --- ant/plugin.jelly | 19 +++++++++++++++++++ ant/plugin.properties | 7 ++++++- ant/src/plugin-test/maven.xml | 4 ++-- ant/xdocs/changes.xml | 7 ++----- ant/xdocs/properties.xml | 23 ++++++++++++++++++++++- 5 files changed, 51 insertions(+), 9 deletions(-) diff --git a/ant/plugin.jelly b/ant/plugin.jelly index a1956cd7..a9d44241 100644 --- a/ant/plugin.jelly +++ b/ant/plugin.jelly @@ -48,4 +48,23 @@ ${maven.ant.generatebuild.file} generated. + + + Executing ${maven.ant.execute.dir}/${maven.ant.execute.script} ... + + + + + + + + + + + + ${maven.ant.execute.dir}/${maven.ant.execute.script} executed. + + diff --git a/ant/plugin.properties b/ant/plugin.properties index fb7c356a..d45a9d02 100644 --- a/ant/plugin.properties +++ b/ant/plugin.properties @@ -21,7 +21,12 @@ # keep them apart from the project specific properties. # ------------------------------------------------------------------- +maven.ant.execute.script = build.xml +maven.ant.execute.dir = ${basedir} +maven.ant.execute.target = + maven.ant.generatebuild.file = ${basedir}/build.xml -maven.ant.use.properties = true maven.ant.compatibility = 1.6 + +maven.ant.use.properties = true maven.ant.use.multirepo = true \ No newline at end of file diff --git a/ant/src/plugin-test/maven.xml b/ant/src/plugin-test/maven.xml index 017f342d..84707a19 100644 --- a/ant/src/plugin-test/maven.xml +++ b/ant/src/plugin-test/maven.xml @@ -19,9 +19,9 @@ - + - + diff --git a/ant/xdocs/changes.xml b/ant/xdocs/changes.xml index 9e13f277..68034065 100644 --- a/ant/xdocs/changes.xml +++ b/ant/xdocs/changes.xml @@ -26,11 +26,8 @@ - Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : -
    -
  • commons-jelly-tags-xml v1.0 -> v1.1
    • -
- + Add a new goal (ant:execute) to execute a build.xml file from maven. + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : commons-jelly-tags-xml v1.0 to v1.1. Ant script looks for dependencies in several remote repositories. diff --git a/ant/xdocs/properties.xml b/ant/xdocs/properties.xml index 1c04e0dd..5ad69cb2 100644 --- a/ant/xdocs/properties.xml +++ b/ant/xdocs/properties.xml @@ -67,10 +67,31 @@ maven.ant.use.multirepo Defines if you want to generate a script which will download dependencies from all your repositories. If false, the script will only download them from the first one (ibiblio by default). - since 1.9 + since 1.10 Yes true + + maven.ant.execute.script + The buildfile to use. Defaults to "build.xml". This file is expected to be a filename relative to the "maven.ant.execute.dir" property given. + since 1.10 + Yes + "build.xml" + + + maven.ant.execute.dir + The directory to use as a basedir for the Ant project. Defaults to the current project's basedir. This will override the basedir setting of the called project. + since 1.10 + Yes + ${basedir} + + + maven.ant.execute.target + The target of the Ant project that should be executed. Defaults to the project's default target. + since 1.9 + Yes + <empty> +