diff --git a/.classpath b/.classpath
index 21639df29d0..9c0fdcd1ca0 100644
--- a/.classpath
+++ b/.classpath
@@ -109,9 +109,9 @@
 	<classpathentry kind="lib" path="extensions/indexes/lucene/lib/lucene-core-4.10.4.jar"/>
 	<classpathentry kind="lib" path="extensions/indexes/lucene/lib/lucene-queries-4.10.4.jar"/>
 	<classpathentry kind="lib" path="extensions/indexes/lucene/lib/lucene-queryparser-4.10.4.jar"/>
-	<classpathentry kind="lib" path="tools/ant/lib/ant-1.9.7.jar"/>
+	<classpathentry kind="lib" path="tools/ant/lib/ant-1.10.1.jar"/>
 	<classpathentry kind="lib" path="tools/ant/lib/ant-antunit-1.3.jar"/>
-	<classpathentry kind="lib" path="tools/ant/lib/ant-launcher-1.9.7.jar"/>
+	<classpathentry kind="lib" path="tools/ant/lib/ant-launcher-1.10.1.jar"/>
 	<classpathentry kind="lib" path="tools/aspectj/lib/aspectjrt-1.8.9.jar"/>
 	<classpathentry kind="lib" path="lib/core/cglib-nodep-2.2.2.jar"/>
 	<classpathentry kind="lib" path="lib/core/clj-ds-0.0.4.jar"/>
diff --git a/build.bat b/build.bat
index 2d935d2c540..6459b18949b 100644
--- a/build.bat
+++ b/build.bat
@@ -25,7 +25,7 @@ set EXIST_HOME=%CD%
 
 :gotExistHome
 set ANT_HOME=%EXIST_HOME%\tools\ant
-set _LIBJARS=%CLASSPATH%;%ANT_HOME%\lib\ant-launcher-1.9.7.jar
+set _LIBJARS=%CLASSPATH%;%ANT_HOME%\lib\ant-launcher-1.10.1.jar
 
 set JAVA_ENDORSED_DIRS=%EXIST_HOME%\lib\endorsed
 
diff --git a/build.sh b/build.sh
index 4158c181ed5..9bf5449f6f1 100755
--- a/build.sh
+++ b/build.sh
@@ -30,7 +30,7 @@ fi
 
 ANT_HOME="$EXIST_HOME/tools/ant"
 
-LOCALCLASSPATH="$ANT_HOME/lib/ant-launcher-1.9.7.jar"
+LOCALCLASSPATH="$ANT_HOME/lib/ant-launcher-1.10.1.jar"
 
 JAVA_ENDORSED_DIRS="$EXIST_HOME"/lib/endorsed
 
diff --git a/installer/scripts/build.bat b/installer/scripts/build.bat
index 4fc0491dfc8..e11d2adf084 100644
--- a/installer/scripts/build.bat
+++ b/installer/scripts/build.bat
@@ -15,7 +15,7 @@ set EXIST_HOME=$INSTALL_PATH
 
 :gotExistHome
 set ANT_HOME=%EXIST_HOME%\tools\ant
-set _LIBJARS=%CLASSPATH%;%ANT_HOME%\lib\ant-launcher-1.9.7.jar;%EXIST_HOME%\lib\test\junit-4.12.jar;%JAVA_HOME%\lib\tools.jar
+set _LIBJARS=%CLASSPATH%;%ANT_HOME%\lib\ant-launcher-1.10.1.jar;%EXIST_HOME%\lib\test\junit-4.12.jar;%JAVA_HOME%\lib\tools.jar
 
 set JAVA_ENDORSED_DIRS=%EXIST_HOME%\lib\endorsed
 
diff --git a/installer/scripts/build.sh b/installer/scripts/build.sh
index 503065d2d37..73274d91cb0 100644
--- a/installer/scripts/build.sh
+++ b/installer/scripts/build.sh
@@ -12,7 +12,7 @@ fi
 
 ANT_HOME="$EXIST_HOME/tools/ant"
 
-LOCALCLASSPATH=$CLASSPATH:$ANT_HOME/lib/ant-launcher-1.9.7.jar:$EXIST_HOME/lib/test/junit-4.12.jar
+LOCALCLASSPATH=$CLASSPATH:$ANT_HOME/lib/ant-launcher-1.10.1.jar:$EXIST_HOME/lib/test/junit-4.12.jar
 
 JAVA_ENDORSED_DIRS="$EXIST_HOME"/lib/endorsed
 
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 6e25f9eaf55..e6e6fc7653e 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -80,7 +80,7 @@ manifest.custom.permissions=
 src.src8.dir=extensions/xqdoc/src
 file.reference.test-src-1=extensions/fluent/test/src
 jmx.config.file=
-file.reference.ant-1.9.7.jar=tools/ant/lib/ant-1.9.7.jar
+file.reference.ant-1.10.1.jar=tools/ant/lib/ant-1.10.1.jar
 build.test.results.dir=${build.dir}/test/results
 file.reference.jetty-security-9.3.9.v20160517.jar=tools/jetty/lib/jetty-security-9.3.9.v20160517.jar
 file.reference.exquery-annotations-common-1.0-SNAPSHOT.jar=extensions/exquery/lib/exquery-annotations-common-1.0-SNAPSHOT.jar
@@ -312,7 +312,7 @@ javac.classpath=\
     ${file.reference.easymock-3.4.jar}:\
     ${file.reference.objenesis-2.2.jar}:\
     ${file.reference.hamcrest-core-1.3.jar}:\
-    ${file.reference.ant-1.9.7.jar}:\
+    ${file.reference.ant-1.10.1.jar}:\
     ${file.reference.xmlunit-1.6.jar}:\
     ${file.reference.aspectjtools-1.8.9.jar}:\
     ${file.reference.aspectjrt-1.8.9.jar}:\
diff --git a/tools/ant/etc/jdepend-frames.xsl b/tools/ant/etc/jdepend-frames.xsl
index 458abf22904..802873450dc 100644
--- a/tools/ant/etc/jdepend-frames.xsl
+++ b/tools/ant/etc/jdepend-frames.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <xsl:stylesheet  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
   xmlns:lxslt="http://xml.apache.org/xslt"
-  xmlns:redirect="http://xml.apache.org/xalan/redirect"
+  xmlns:redirect="org.apache.xalan.lib.Redirect"
   extension-element-prefixes="redirect">
 <xsl:output method="html" indent="yes" encoding="US-ASCII"/>
 <!--
@@ -28,8 +28,6 @@
  It creates a set of HTML files a la javadoc where you can browse easily
  through all packages and classes.
 
- @author <a href="mailto:jtulley@novell.com">Jeff Tulley</a>
-
   -->
 <xsl:param name="output.dir" select="'.'"/>
 
diff --git a/tools/ant/etc/junit-frames.xsl b/tools/ant/etc/junit-frames.xsl
index 9ea322a6f45..624fd6923bc 100644
--- a/tools/ant/etc/junit-frames.xsl
+++ b/tools/ant/etc/junit-frames.xsl
@@ -2,9 +2,9 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
     xmlns:lxslt="http://xml.apache.org/xslt"
     xmlns:redirect="http://xml.apache.org/xalan/redirect"
-    xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
+    xmlns:string="xalan://java.lang.String"
     extension-element-prefixes="redirect">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
+<xsl:output method="html" indent="yes" encoding="UTF-8"/>
 <xsl:decimal-format decimal-separator="." grouping-separator=","/>
 <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
@@ -79,6 +79,13 @@
         <xsl:with-param name="type" select="'errors'"/>
       </xsl:apply-templates>
     </redirect:write>
+    
+    <!-- create the alltests-skipped.html at the root -->
+    <redirect:write file="{$output.dir}/alltests-skipped.html">
+      <xsl:apply-templates select="." mode="all.tests">
+        <xsl:with-param name="type" select="'skipped'"/>
+      </xsl:apply-templates>
+    </redirect:write>
 
   <!-- process all packages -->
     <xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
@@ -117,13 +124,27 @@
       <xsl:apply-templates select="." mode="class.details"/>
     </redirect:write>
     <xsl:if test="string-length(./system-out)!=0">
-      <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-out.txt">
-        <xsl:value-of disable-output-escaping="yes" select="./system-out"/>
+      <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-out.html">
+        <html>
+          <head>
+            <title>Standard Output from <xsl:value-of select="@name"/></title>
+          </head>
+          <body>
+            <pre><xsl:value-of select="./system-out"/></pre>
+          </body>
+        </html>
       </redirect:write>
     </xsl:if>
     <xsl:if test="string-length(./system-err)!=0">
-      <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-err.txt">
-        <xsl:value-of disable-output-escaping="yes" select="./system-err"/>
+      <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-err.html">
+        <html>
+          <head>
+            <title>Standard Error from <xsl:value-of select="@name"/></title>
+          </head>
+          <body>
+            <pre><xsl:value-of select="./system-err"/></pre>
+          </body>
+        </html>
       </redirect:write>
     </xsl:if>
     <xsl:if test="@failures != 0">
@@ -140,6 +161,13 @@
         </xsl:apply-templates>
       </redirect:write>
     </xsl:if>
+    <xsl:if test="@skipped != 0">
+      <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-skipped.html">
+        <xsl:apply-templates select="." mode="class.details">
+          <xsl:with-param name="type" select="'skipped'"/>
+        </xsl:apply-templates>
+      </redirect:write>
+    </xsl:if>
   </xsl:for-each>
 </xsl:template>
 
@@ -215,7 +243,7 @@ h6 {
 }
 </xsl:template>
 
-<!-- Create list of all/failed/errored tests -->
+<!-- Create list of all/failed/errored/skipped tests -->
 <xsl:template match="testsuites" mode="all.tests">
     <xsl:param name="type" select="'all'"/>
     <html>
@@ -227,6 +255,9 @@ h6 {
 		<xsl:when test="$type = 'errors'">
 		    <xsl:text>All Errors</xsl:text>
 		</xsl:when>
+		<xsl:when test="$type = 'skipped'">
+		    <xsl:text>All Skipped</xsl:text>
+		</xsl:when>
 		<xsl:otherwise>
 		    <xsl:text>All Tests</xsl:text>
 		</xsl:otherwise>
@@ -269,6 +300,11 @@ h6 {
                     <xsl:with-param name="show.class" select="'yes'"/>
                   </xsl:apply-templates>
                 </xsl:when>
+                <xsl:when test="$type = 'skipped'">
+                  <xsl:apply-templates select=".//testcase[skipped]" mode="print.test">
+                    <xsl:with-param name="show.class" select="'yes'"/>
+                  </xsl:apply-templates>
+                </xsl:when>
                 <xsl:otherwise>
                   <xsl:apply-templates select=".//testcase" mode="print.test">
                     <xsl:with-param name="show.class" select="'yes'"/>
@@ -348,6 +384,9 @@ h6 {
 		<xsl:when test="$type = 'errors'">
 		    <h2>Errors</h2>
 		</xsl:when>
+		<xsl:when test="$type = 'skipped'">
+		    <h2>Skipped</h2>
+		</xsl:when>
 		<xsl:otherwise>
 		    <h2>Tests</h2>
 		</xsl:otherwise>
@@ -370,6 +409,9 @@ h6 {
 		    <xsl:when test="$type = 'errors'">
 			<xsl:apply-templates select="./testcase[error]" mode="print.test"/>
 		    </xsl:when>
+		    <xsl:when test="$type = 'skipped'">
+			<xsl:apply-templates select="./testcase[skipped]" mode="print.test"/>
+		    </xsl:when>
 		    <xsl:otherwise>
 			<xsl:apply-templates select="./testcase" mode="print.test"/>
 		    </xsl:otherwise>
@@ -384,7 +426,7 @@ h6 {
             <xsl:if test="string-length(./system-out)!=0">
                 <div class="Properties">
                     <a>
-                        <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-out.txt</xsl:attribute>
+                        <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-out.html</xsl:attribute>
                         System.out &#187;
                     </a>
                 </div>
@@ -392,7 +434,7 @@ h6 {
             <xsl:if test="string-length(./system-err)!=0">
                 <div class="Properties">
                     <a>
-                        <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-err.txt</xsl:attribute>
+                        <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-err.html</xsl:attribute>
                         System.err &#187;
                     </a>
                 </div>
@@ -549,6 +591,7 @@ h6 {
         <xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
         <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>
         <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>
+        <xsl:variable name="skippedCount" select="sum(testsuite/@skipped)" />
         <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
         <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/>
         <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
@@ -556,6 +599,7 @@ h6 {
             <th>Tests</th>
             <th>Failures</th>
             <th>Errors</th>
+            <th>Skipped</th>
             <th>Success rate</th>
             <th>Time</th>
         </tr>
@@ -570,6 +614,7 @@ h6 {
             <td><a title="Display all tests" href="all-tests.html"><xsl:value-of select="$testCount"/></a></td>
             <td><a title="Display all failures" href="alltests-fails.html"><xsl:value-of select="$failureCount"/></a></td>
             <td><a title="Display all errors" href="alltests-errors.html"><xsl:value-of select="$errorCount"/></a></td>
+            <td><a title="Display all skipped test" href="alltests-skipped.html"><xsl:value-of select="$skippedCount" /></a></td>
             <td>
                 <xsl:call-template name="display-percent">
                     <xsl:with-param name="value" select="$successRate"/>
@@ -613,6 +658,7 @@ h6 {
                     <td><xsl:value-of select="sum($insamepackage/@tests)"/></td>
                     <td><xsl:value-of select="sum($insamepackage/@errors)"/></td>
                     <td><xsl:value-of select="sum($insamepackage/@failures)"/></td>
+                    <td><xsl:value-of select="sum($insamepackage/@skipped)" /></td>
                     <td>
                     <xsl:call-template name="display-time">
                         <xsl:with-param name="value" select="sum($insamepackage/@time)"/>
@@ -707,6 +753,7 @@ h6 {
         <th>Tests</th>
         <th>Errors</th>
         <th>Failures</th>
+        <th>Skipped</th>
         <th nowrap="nowrap">Time(s)</th>
         <th nowrap="nowrap">Time Stamp</th>
         <th>Host</th>
@@ -749,8 +796,8 @@ h6 {
 		    <xsl:apply-templates select="@errors"/>
 		</xsl:otherwise>
 	    </xsl:choose>
-	</td>
-        <td>
+		</td>
+	    <td>
 	    <xsl:choose>
 		<xsl:when test="@failures != 0">
 		    <a title="Display only failures" href="{@id}_{@name}-fails.html"><xsl:apply-templates select="@failures"/></a>
@@ -759,7 +806,17 @@ h6 {
 		    <xsl:apply-templates select="@failures"/>
 		</xsl:otherwise>
 	    </xsl:choose>
-	</td>
+		</td>
+	    <td>
+	    <xsl:choose>
+		<xsl:when test="@skipped != 0">
+		    <a title="Display only skipped tests" href="{@id}_{@name}-skipped.html"><xsl:apply-templates select="@skipped"/></a>
+		</xsl:when>
+		<xsl:otherwise>
+		    <xsl:apply-templates select="@skipped"/>
+		</xsl:otherwise>
+	    </xsl:choose>
+		</td>
         <td><xsl:call-template name="display-time">
                 <xsl:with-param name="value" select="@time"/>
             </xsl:call-template>
@@ -805,6 +862,10 @@ h6 {
                 <td>Error</td>
                 <td><xsl:apply-templates select="error"/></td>
             </xsl:when>
+            <xsl:when test="skipped">
+                <td>Skipped</td>
+                <td><xsl:apply-templates select="skipped"/></td>
+            </xsl:when>
             <xsl:otherwise>
                 <td>Success</td>
                 <td></td>
@@ -819,7 +880,7 @@ h6 {
 </xsl:template>
 
 
-<!-- Note : the below template error and failure are the same style
+<!-- Note : the below template skipped, error and failure are the same style
             so just call the same style store in the toolkit template -->
 <xsl:template match="failure">
     <xsl:call-template name="display-failures"/>
@@ -829,6 +890,10 @@ h6 {
     <xsl:call-template name="display-failures"/>
 </xsl:template>
 
+<xsl:template match="skipped">
+    <xsl:call-template name="display-failures"/>
+</xsl:template>
+
 <!-- Style for the error and failure in the testcase template -->
 <xsl:template name="display-failures">
     <xsl:choose>
@@ -850,9 +915,11 @@ h6 {
 
 <xsl:template name="JS-escape">
     <xsl:param name="string"/>
-    <xsl:param name="tmp1" select="stringutils:replace(string($string),'\','\\')"/>
-    <xsl:param name="tmp2" select="stringutils:replace(string($tmp1),&quot;'&quot;,&quot;\&apos;&quot;)"/>
-    <xsl:value-of select="$tmp2"/>
+    <xsl:param name="tmp1" select="string:replaceAll(string:new(string($string)),'\\','\\\\')"/>
+    <xsl:param name="tmp2" select="string:replaceAll(string:new(string($tmp1)),&quot;'&quot;,&quot;\\&apos;&quot;)"/>
+    <xsl:param name="tmp3" select="string:replaceAll(string:new(string($tmp2)),&quot;&#10;&quot;,'\\n')"/>
+    <xsl:param name="tmp4" select="string:replaceAll(string:new(string($tmp3)),&quot;&#13;&quot;,'\\r')"/>
+    <xsl:value-of select="$tmp4"/>
 </xsl:template>
 
 
@@ -862,7 +929,35 @@ h6 {
 -->
 <xsl:template name="br-replace">
     <xsl:param name="word"/>
-    <xsl:value-of disable-output-escaping="yes" select='stringutils:replace(string($word),"&#xA;","&lt;br/>")'/>
+    <xsl:param name="splitlimit">32</xsl:param>
+    <xsl:variable name="secondhalfstartindex" select="(string-length($word)+(string-length($word) mod 2)) div 2"/>
+    <xsl:variable name="secondhalfword" select="substring($word, $secondhalfstartindex)"/>
+    <!-- When word is very big, a recursive replace is very heap/stack expensive, so subdivide on line break after middle of string -->
+    <xsl:choose>
+      <xsl:when test="(string-length($word) > $splitlimit) and (contains($secondhalfword, '&#xa;'))">
+        <xsl:variable name="secondhalfend" select="substring-after($secondhalfword, '&#xa;')"/>
+        <xsl:variable name="firsthalflen" select="string-length($word) - string-length($secondhalfword)"/>
+        <xsl:variable name="firsthalfword" select="substring($word, 1, $firsthalflen)"/>
+        <xsl:variable name="firsthalfend" select="substring-before($secondhalfword, '&#xa;')"/>
+        <xsl:call-template name="br-replace">
+            <xsl:with-param name="word" select="concat($firsthalfword,$firsthalfend)"/>
+        </xsl:call-template>
+        <br/>
+        <xsl:call-template name="br-replace">
+            <xsl:with-param name="word" select="$secondhalfend"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:when test="contains($word, '&#xa;')">
+        <xsl:value-of select="substring-before($word, '&#xa;')"/>
+        <br/>
+        <xsl:call-template name="br-replace">
+          <xsl:with-param name="word" select="substring-after($word, '&#xa;')"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$word"/>
+      </xsl:otherwise>
+    </xsl:choose>
 </xsl:template>
 
 <xsl:template name="display-time">
diff --git a/tools/ant/lib/ant-1.10.1.jar b/tools/ant/lib/ant-1.10.1.jar
new file mode 100644
index 00000000000..4a7f8edc67f
Binary files /dev/null and b/tools/ant/lib/ant-1.10.1.jar differ
diff --git a/tools/ant/lib/ant-1.9.7.jar b/tools/ant/lib/ant-1.9.7.jar
deleted file mode 100644
index 1c348e3eb5c..00000000000
Binary files a/tools/ant/lib/ant-1.9.7.jar and /dev/null differ
diff --git a/tools/ant/lib/ant-antlr-1.10.1.jar b/tools/ant/lib/ant-antlr-1.10.1.jar
new file mode 100644
index 00000000000..2b4a481b903
Binary files /dev/null and b/tools/ant/lib/ant-antlr-1.10.1.jar differ
diff --git a/tools/ant/lib/ant-antlr-1.9.7.jar b/tools/ant/lib/ant-antlr-1.9.7.jar
deleted file mode 100644
index 9d26694efcf..00000000000
Binary files a/tools/ant/lib/ant-antlr-1.9.7.jar and /dev/null differ
diff --git a/tools/ant/lib/ant-jdepend-1.10.1.jar b/tools/ant/lib/ant-jdepend-1.10.1.jar
new file mode 100644
index 00000000000..8a551cc3650
Binary files /dev/null and b/tools/ant/lib/ant-jdepend-1.10.1.jar differ
diff --git a/tools/ant/lib/ant-jdepend-1.9.7.jar b/tools/ant/lib/ant-jdepend-1.9.7.jar
deleted file mode 100644
index b0cba22d445..00000000000
Binary files a/tools/ant/lib/ant-jdepend-1.9.7.jar and /dev/null differ
diff --git a/tools/ant/lib/ant-junit-1.10.1.jar b/tools/ant/lib/ant-junit-1.10.1.jar
new file mode 100644
index 00000000000..fb01a9ca728
Binary files /dev/null and b/tools/ant/lib/ant-junit-1.10.1.jar differ
diff --git a/tools/ant/lib/ant-junit-1.9.7.jar b/tools/ant/lib/ant-junit-1.9.7.jar
deleted file mode 100644
index 22daf47fa21..00000000000
Binary files a/tools/ant/lib/ant-junit-1.9.7.jar and /dev/null differ
diff --git a/tools/ant/lib/ant-junit4-1.10.1.jar b/tools/ant/lib/ant-junit4-1.10.1.jar
new file mode 100644
index 00000000000..29304a950d0
Binary files /dev/null and b/tools/ant/lib/ant-junit4-1.10.1.jar differ
diff --git a/tools/ant/lib/ant-junit4-1.9.7.jar b/tools/ant/lib/ant-junit4-1.9.7.jar
deleted file mode 100644
index 7794423dc20..00000000000
Binary files a/tools/ant/lib/ant-junit4-1.9.7.jar and /dev/null differ
diff --git a/tools/ant/lib/ant-launcher-1.10.1.jar b/tools/ant/lib/ant-launcher-1.10.1.jar
new file mode 100644
index 00000000000..5073d2f8ec7
Binary files /dev/null and b/tools/ant/lib/ant-launcher-1.10.1.jar differ
diff --git a/tools/ant/lib/ant-launcher-1.9.7.jar b/tools/ant/lib/ant-launcher-1.9.7.jar
deleted file mode 100644
index 78b34128aa2..00000000000
Binary files a/tools/ant/lib/ant-launcher-1.9.7.jar and /dev/null differ