You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by aw...@apache.org on 2017/03/01 02:06:41 UTC
[02/10] cassandra git commit: Fix "multiple versions of ant
detected..." when running ant test
Fix "multiple versions of ant detected..." when running ant test
Patch by Michael Kjellman; Reviewed by Ariel Weisberg for CASSANDRA-13232
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa66c999
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa66c999
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa66c999
Branch: refs/heads/cassandra-3.0
Commit: aa66c999ad18e63f9c6b53a2da0750099ec7132c
Parents: 3748bf7
Author: Ariel Weisberg <aw...@apple.com>
Authored: Tue Feb 28 19:43:06 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Tue Feb 28 19:43:06 2017 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa66c999/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e7e0367..c27c2b1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232)
* Coalescing strategy sleeps too much (CASSANDRA-13090)
* Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100)
* Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa66c999/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 53a1b27..d815ede 100644
--- a/build.xml
+++ b/build.xml
@@ -147,10 +147,12 @@
<fileset dir="${build.lib}">
<include name="**/*.jar" />
<exclude name="**/*-sources.jar"/>
+ <exclude name="**/ant-*.jar"/>
</fileset>
<fileset dir="${build.dir.lib}">
<include name="**/*.jar" />
<exclude name="**/*-sources.jar"/>
+ <exclude name="**/ant-*.jar"/>
</fileset>
</path>
@@ -1179,7 +1181,7 @@
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}"
- includeantruntime="false"
+ includeantruntime="true"
source="${source.version}"
target="${target.version}">
<classpath>