This is an automated email from the ASF dual-hosted git repository. mshuler pushed a commit to branch cassandra-3.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit fa6b40f4603025ef416afee7e4f76b9b8cd041fc Merge: c07f3c8 63ff65a Author: Michael Shuler <mshu...@apache.org> AuthorDate: Wed May 22 15:09:25 2019 -0400 Merge branch 'cassandra-2.2' into cassandra-3.0 build.properties.default | 4 ++-- build.xml | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --cc build.xml index 8ef8c67,ca06b41..2023e11 --- a/build.xml +++ b/build.xml @@@ -25,10 -25,10 +25,10 @@@ <property name="debuglevel" value="source,lines,vars"/> <!-- default version and SCM information --> - <property name="base.version" value="2.2.15"/> + <property name="base.version" value="3.0.19"/> - <property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/> - <property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/> - <property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/> + <property name="scm.connection" value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/> + <property name="scm.developerConnection" value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/> + <property name="scm.url" value="https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree"/> <!-- directory details --> <property name="basedir" value="."/> @@@ -104,10 -108,14 +104,10 @@@ <!-- default for cql tests. Can be override by -Dcassandra.test.use_prepared=false --> <property name="cassandra.test.use_prepared" value="true" /> - <!-- https://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"/> - + <!-- skip flushing schema tables during tests --> + <property name="cassandra.test.flush_local_schema_changes" value="false" /> + - <!-- http://www.eclemma.org/jacoco/ --> + <!-- https://www.eclemma.org/jacoco/ --> <property name="jacoco.export.dir" value="${build.dir}/jacoco/" /> <property name="jacoco.partials.dir" value="${jacoco.export.dir}/partials" /> <property name="jacoco.partialexecfile" value="${jacoco.partials.dir}/partial.exec" /> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org