Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 d1c3c674f -> d1ad7961e
Remove cobertura from build file patch by rhatch; reviewed by aweisberg for CASSANDRA-10704 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1ad7961 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1ad7961 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1ad7961 Branch: refs/heads/cassandra-3.0 Commit: d1ad7961edfa12695e63161e8dca9f528e8ab51a Parents: d1c3c67 Author: Sylvain Lebresne <[email protected]> Authored: Fri Nov 20 13:08:37 2015 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Nov 20 13:08:37 2015 +0100 ---------------------------------------------------------------------- build.xml | 64 +--------------------------------------------------------- 1 file changed, 1 insertion(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1ad7961/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 577506e..dd3bafa 100644 --- a/build.xml +++ b/build.xml @@ -102,13 +102,6 @@ <!-- skip flushing schema tables during tests --> <property name="cassandra.test.flush_local_schema_changes" value="false" /> - - <!-- http://cobertura.sourceforge.net/ --> - <property name="cobertura.version" value="2.0.3"/> - <property name="cobertura.build.dir" value="${build.dir}/cobertura"/> - <property name="cobertura.report.dir" value="${cobertura.build.dir}/report"/> - <property name="cobertura.classes.dir" value="${cobertura.build.dir}/classes"/> - <property name="cobertura.datafile" value="${cobertura.build.dir}/cobertura.ser"/> <!-- http://www.eclemma.org/jacoco/ --> <property name="jacoco.export.dir" value="${build.dir}/jacoco/" /> @@ -152,7 +145,6 @@ --> <path id="maven-ant-tasks.classpath" path="${build.dir}/maven-ant-tasks-${maven-ant-tasks.version}.jar" /> <path id="cassandra.classpath"> - <pathelement location="${cobertura.classes.dir}"/> <pathelement location="${build.classes.main}" /> <pathelement location="${build.classes.thrift}" /> <fileset dir="${build.lib}"> @@ -165,10 +157,6 @@ </fileset> </path> - <path id="cobertura.classpath"> - <pathelement location="${cobertura.classes.dir}"/> - </path> - <macrodef name="create-javadoc"> <attribute name="destdir"/> <element name="filesets"/> @@ -201,7 +189,6 @@ <target name="clean" description="Remove all locally created artifacts"> <delete dir="${build.test.dir}" /> <delete dir="${build.classes}" /> - <delete dir="${cobertura.classes.dir}" /> <delete dir="${build.src.gen-java}" /> <delete dir="${version.properties.dir}" /> <delete dir="${jacoco.export.dir}" /> @@ -387,12 +374,6 @@ </dependency> <dependency groupId="net.java.dev.jna" artifactId="jna" version="4.0.0"/> - <dependency groupId="net.sourceforge.cobertura" artifactId="cobertura" version="${cobertura.version}"> - <exclusion groupId="xerces" artifactId="xercesImpl"/> - <exclusion groupId="org.mortbay.jetty" artifactId="jetty"/> <!-- older version, also via hadoop-core --> - <exclusion groupId="org.mortbay.jetty" artifactId="jetty-util"/> <!-- older version, also via hadoop-core --> - <exclusion groupId="org.apache.ant" artifactId="ant"/> <!-- older version 1.8.3 --> - </dependency> <dependency groupId="org.jacoco" artifactId="org.jacoco.agent" version="${jacoco.version}"/> <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}"/> @@ -499,7 +480,6 @@ <parent groupId="org.apache.cassandra" artifactId="cassandra-parent" version="${version}"/> - <dependency groupId="net.sourceforge.cobertura" artifactId="cobertura"/> <dependency groupId="org.jacoco" artifactId="org.jacoco.agent"/> <dependency groupId="org.jacoco" artifactId="org.jacoco.ant"/> </artifact:pom> @@ -638,8 +618,7 @@ </copy> <!-- code coverage tools --> <artifact:dependencies pomRefId="coverage-deps-pom" - filesetId="coverage-dependency-jars" - pathId="cobertura.classpath"> + filesetId="coverage-dependency-jars"> <remoteRepository refid="central"/> </artifact:dependencies> <copy todir="${build.dir.lib}/jars"> @@ -1164,7 +1143,6 @@ <mkdir dir="${build.test.dir}/output"/> <mkdir dir="${build.test.dir}/output/@{testtag}"/> <junit fork="on" forkmode="@{forkmode}" failureproperty="testfailed" maxmemory="1024m" timeout="@{timeout}"> - <sysproperty key="net.sourceforge.cobertura.datafile" file="${cobertura.datafile}"/> <formatter classname="org.apache.cassandra.CassandraXMLJUnitResultFormatter" extension=".xml" usefile="true"/> <formatter classname="org.apache.cassandra.CassandraBriefJUnitResultFormatter" usefile="false"/> <jvmarg value="-Dstorage-config=${test.conf}"/> @@ -1186,7 +1164,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" /> @@ -1392,7 +1369,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" /> @@ -1423,7 +1399,6 @@ <mkdir dir="${build.test.dir}/cassandra"/> <mkdir dir="${build.test.dir}/output"/> <junit fork="on" forkmode="once" failureproperty="testfailed" maxmemory="1024m" timeout="${test.timeout}"> - <sysproperty key="net.sourceforge.cobertura.datafile" file="${cobertura.datafile}"/> <formatter type="brief" usefile="false"/> <jvmarg value="-Dstorage-config=${test.conf}"/> <jvmarg value="-Djava.awt.headless=true"/> @@ -1436,7 +1411,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" /> @@ -1489,41 +1463,6 @@ <delete dir="${jacoco.export.dir}"/> </target> - <!-- instruments the classes to later create code coverage reports --> - <target name="cobertura-instrument" depends="build,build-test"> - <taskdef resource="tasks.properties"> - <classpath refid="cobertura.classpath"/> - <classpath refid="cassandra.classpath"/> - </taskdef> - - <delete file="${cobertura.datafile}"/> - - <cobertura-instrument todir="${cobertura.classes.dir}" datafile="${cobertura.datafile}"> - <ignore regex="ch.qos.logback.*"/> - - <fileset dir="${build.classes.main}"> - <include name="**/*.class"/> - <exclude name="**/*Test.class"/> - <exclude name="**/*TestCase.class"/> - <exclude name="**/test/*.class"/> - <!-- cobertura modifies the serialVersionUID of classes. Some of our unit tests rely on backward - wire compatability of these classes. It was easier to exlude them from instrumentation than to - force their serialVersionUIDs. --> - <exclude name="**/*Token.class"/> - <exclude name="${cobertura.excludes}"/> - </fileset> - - </cobertura-instrument> - </target> - - <!-- create both html and xml code coverage reports --> - <target name="cobertura-report"> - <cobertura-report format="html" destdir="${cobertura.report.dir}" srcdir="${build.src.java}" - datafile="${cobertura.datafile}"/> - <cobertura-report format="xml" destdir="${cobertura.report.dir}" srcdir="${build.src.java}" - datafile="${cobertura.datafile}"/> - </target> - <!-- License audit tool --> @@ -1682,7 +1621,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" />
