From 40b4ade85aba59ab6310daec31cfff5be53542fd Mon Sep 17 00:00:00 2001 From: epugh Date: Tue, 23 Nov 2004 17:14:26 +0000 Subject: [PATCH] MPANT-7. Not obeying jar overrides. While this patch doesn't get every case, it does get the common one of using an included lib. I am using this succesfuly with commons-email's ant build. git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@116257 13f79535-47bb-0310-9956-ffa450edef68 --- ant/project.xml | 2 +- .../plugin-resources/templates/build.jelly | 18 +++++++++++++++--- ant/src/plugin-test/lib/activation-1.0.2.jar | Bin 0 -> 45386 bytes ant/src/plugin-test/maven.xml | 6 ++++++ ant/src/plugin-test/project.properties | 2 ++ ant/src/plugin-test/project.xml | 9 +++++++++ ant/xdocs/changes.xml | 4 ++++ 7 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 ant/src/plugin-test/lib/activation-1.0.2.jar create mode 100644 ant/src/plugin-test/project.properties diff --git a/ant/project.xml b/ant/project.xml index 0fe126f3..20aa6956 100644 --- a/ant/project.xml +++ b/ant/project.xml @@ -23,7 +23,7 @@ 3 maven-ant-plugin Maven Ant Plugin - 1.8.1 + 1.9-SNAPSHOT Generates ant build files from a maven project, so that plain ant users can build your project Generate Ant build file http://maven.apache.org/reference/plugins/ant/ diff --git a/ant/src/plugin-resources/templates/build.jelly b/ant/src/plugin-resources/templates/build.jelly index 90b4a644..c9e55e33 100644 --- a/ant/src/plugin-resources/templates/build.jelly +++ b/ant/src/plugin-resources/templates/build.jelly @@ -349,14 +349,26 @@ proxyuser="${maven.proxy.username}" proxypassword="${maven.proxy.password}"/> - - + + + + + + + + /> + + + + + + + diff --git a/ant/src/plugin-test/lib/activation-1.0.2.jar b/ant/src/plugin-test/lib/activation-1.0.2.jar new file mode 100644 index 0000000000000000000000000000000000000000..db4b1fb55d35fd8ade1067b2a70cc34ba4f3ac98 GIT binary patch literal 45386 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%0D$3ob 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 + + + + + + + + + activation + activation + 1.0.2 + jar + + + junit junit diff --git a/ant/xdocs/changes.xml b/ant/xdocs/changes.xml index 8736e670..4b3117e5 100644 --- a/ant/xdocs/changes.xml +++ b/ant/xdocs/changes.xml @@ -24,6 +24,10 @@ dIon Gillard + + + Obey jar override and not attempt to download relative jars. + Use relative paths in test resources filesets.