diff options
Diffstat (limited to 'qpid/java/common.xml')
| -rw-r--r-- | qpid/java/common.xml | 37 |
1 files changed, 10 insertions, 27 deletions
diff --git a/qpid/java/common.xml b/qpid/java/common.xml index 319ca4c06d..0f7117e3f0 100644 --- a/qpid/java/common.xml +++ b/qpid/java/common.xml @@ -62,10 +62,12 @@ <property name="cobertura.dir" value="${project.root}/lib/cobertura" /> <property name="cobertura.version" value="1.9.4.1" /> - <property name="cobertura.download.url" - value="http://downloads.sourceforge.net/project/cobertura/cobertura/${cobertura.version}/cobertura-${cobertura.version}-bin.zip" /> - <property name="cobertura.zip.filename" value="cobertura-${cobertura.version}-bin.zip" /> - <property name="cobertura.temp.dir" value="${cobertura.dir}"/> + + <path id="cobertura.classpath"> + <fileset dir="${cobertura.dir}"> + <include name="**/*.jar" /> + </fileset> + </path> <property name="mllib.dir" value="${project.root}/../python" /> <property name="findbugs.dir" value="${project.root}/lib/findbugs" /> @@ -75,13 +77,6 @@ <property name="eclipse.compilercompliance" value="5.0"/> <property name="eclipse.container" value="JVM 1.5"/> - <path id="cobertura.classpath"> - <fileset dir="${cobertura.dir}"> - <include name="cobertura-${cobertura.version}/*.jar" /> - <include name="cobertura-${cobertura.version}/**/lib/*.jar" /> - </fileset> - </path> - <!-- properties for generating the maven artifacts --> <property name="maven.local.repo" value="${build.scratch}/maven-local-repo"/> <property name="maven.settings.xml" value="${project.root}/maven-settings.xml"/> @@ -257,22 +252,6 @@ <taskdef classpathref="cobertura.classpath" resource="tasks.properties" /> </target> - <!--download Cobertura jar and expand--> - <target name="download-cobertura" description="download Cobertura if not already present" depends="cobertura-check" unless="cobertura.already.exists"> - <mkdir dir="${cobertura.dir}"/> - <echo>Downloading Cobertura ${cobertura.version}</echo> - <get src="${cobertura.download.url}" dest="${cobertura.temp.dir}/${cobertura.zip.filename}" usetimestamp="false" /> - <echo>Extracting Cobertura JAR and dependencies</echo> - <unzip src="${cobertura.temp.dir}/${cobertura.zip.filename}" dest="${cobertura.dir}"/> - <echo>Cleanup Cobertura Download</echo> - <delete file="${cobertura.temp.dir}/${cobertura.zip.filename}"/> - <echo>Done</echo> - </target> - - <target name="cobertura-check"> - <available property="cobertura.already.exists" file="${cobertura.dir}/cobertura-${cobertura.version}" type="dir"/> - </target> - <target name="findbugs-init"> <mkdir dir="${findbugs.dir}"/> @@ -305,6 +284,10 @@ <ivy:resolve type="jar" file="${project.root}/ivy.retrieve.xml" conf="findbugs"/> <ivy:retrieve type="jar" conf="findbugs" sync="true" pattern="${findbugs.dir}/[artifact]-[revision].[ext]" /> + + <ivy:resolve type="jar" file="${project.root}/ivy.retrieve.xml" conf="cobertura"/> + <ivy:retrieve type="jar" conf="cobertura" sync="true" + pattern="${cobertura.dir}/[artifact]-[revision].[ext]" /> </target> |