From aa66c999ad18e63f9c6b53a2da0750099ec7132c Mon Sep 17 00:00:00 2001
From: Ariel Weisberg <aweisberg@apple.com>
Date: Tue, 28 Feb 2017 19:43:06 -0500
Subject: [PATCH] Fix "multiple versions of ant detected..." when running ant
 test

Patch by Michael Kjellman; Reviewed by Ariel Weisberg for CASSANDRA-13232
---
 CHANGES.txt | 1 +
 build.xml   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e7e036774d..c27c2b19bf 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)
diff --git a/build.xml b/build.xml
index 53a1b279b7..d815ede5fd 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>