backport without.maven
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/304a25e4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/304a25e4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/304a25e4 Branch: refs/heads/trunk Commit: 304a25e42d346c5c5ed3a13e0933b520abe321bf Parents: 3d55724 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Apr 23 10:27:58 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Apr 23 10:27:58 2013 -0500 ---------------------------------------------------------------------- build.xml | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/304a25e4/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 3491431..09b7701 100644 --- a/build.xml +++ b/build.xml @@ -519,7 +519,7 @@ </artifact:pom> </target> - <target name="maven-ant-tasks-retrieve-build" depends="maven-declare-dependencies"> + <target name="maven-ant-tasks-retrieve-build" depends="maven-declare-dependencies" unless="without.maven"> <artifact:dependencies pomRefId="build-deps-pom" filesetId="build-dependency-jars" sourcesFilesetId="build-dependency-sources" @@ -1041,7 +1041,6 @@ <mkdir dir="${build.test.dir}/cassandra"/> <mkdir dir="${build.test.dir}/output"/> <junit fork="on" forkmode="@{forkmode}" failureproperty="testfailed" maxmemory="1024m" timeout="@{timeout}"> - <sysproperty key="net.sourceforge.cobertura.datafile" file="${cobertura.datafile}"/> <formatter type="xml" usefile="true"/> <formatter type="brief" usefile="false"/> <jvmarg value="-Dstorage-config=${test.conf}"/> @@ -1052,7 +1051,6 @@ <classpath> <path refid="cassandra.classpath" /> <pathelement location="${test.classes}"/> - <path refid="cobertura.classpath"/> <pathelement location="${test.conf}"/> <fileset dir="${test.lib}"> <include name="**/*.jar" />
