diff options
| author | Robert Gemmell <robbie@apache.org> | 2013-10-06 11:04:56 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2013-10-06 11:04:56 +0000 |
| commit | 6b49962c50e5ebbe810ddbb562dc2b55a3c4de06 (patch) | |
| tree | e4c7e1227ec4214094cded08b4a8effe9c9dc024 /qpid/java/common.xml | |
| parent | 9e1128eed479d269cd9700675a46dd979f26d40a (diff) | |
| download | qpid-python-6b49962c50e5ebbe810ddbb562dc2b55a3c4de06.tar.gz | |
QPID-5207, QPID-5048: use the dojo release zip instead of extracting files from the war
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1529610 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common.xml')
| -rw-r--r-- | qpid/java/common.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qpid/java/common.xml b/qpid/java/common.xml index 46c41a7a1f..005dd261b4 100644 --- a/qpid/java/common.xml +++ b/qpid/java/common.xml @@ -286,8 +286,8 @@ <!-- targets for downloading ivy and retrieving dependencies --> <target name="retrieve-dependencies" depends="load-ivy, configure-ivy, retrieve-optional-dependencies" unless="${ivy.dont.retrieve}"> <echo message="Resolving and retrieving dependencies..."/> - <ivy:resolve type="jar,bundle,war" file="${project.root}/ivy.retrieve.xml" conf="required"/> - <ivy:retrieve type="jar,bundle,war" conf="required" sync="true" + <ivy:resolve type="jar,bundle,zip" file="${project.root}/ivy.retrieve.xml" conf="required"/> + <ivy:retrieve type="jar,bundle,zip" conf="required" sync="true" pattern="${project.root}/lib/required/[artifact]-[revision].[ext]" /> </target> @@ -314,7 +314,7 @@ fail so long as Ivy is in at least one of the locations. --> <mkdir dir="${ivy.jar.dir}"/> <path id="ivy.lib.path"> - <fileset dir="${ivy.jar.dir}" includes="*.jar"/> + <fileset dir="${ivy.jar.dir}" includes="*${ivy.install.version}*.jar"/> </path> <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/> |