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 00000000..db4b1fb5 Binary files /dev/null and b/ant/src/plugin-test/lib/activation-1.0.2.jar differ diff --git a/ant/src/plugin-test/maven.xml b/ant/src/plugin-test/maven.xml index 116393c5..f96a5ab8 100644 --- a/ant/src/plugin-test/maven.xml +++ b/ant/src/plugin-test/maven.xml @@ -47,6 +47,12 @@ + + + + + + + + + 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.