Merge pull request #12344 from rmuir/2.1.16

Update randomizedtesting to 2.1.16

core/pom.xml

@@ -1033,8 +1033,6 @@
                         <configuration>
                             <target>
                                 <ant antfile="${elasticsearch.integ.antfile}" target="stop-external-cluster"/>
-                                <!-- TODO: remove this and the xslt when junit4 is fixed -->
-                                <ant antfile="${elasticsearch.integ.antfile}" target="fixup-failsafe-summary"/>
                             </target>
                         </configuration>
                     </execution>

dev-tools/src/main/resources/ant/fixup-failsafe-summary.xslt

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- remove this when junit4 summary format is fixed -->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
-  <xsl:template match="/">
-    <failsafe-summary>
-      <xsl:attribute name="timeout">
-        <xsl:value-of select="failsafe-summary/@timeout"/>
-      </xsl:attribute>
-      <completed><xsl:value-of select="failsafe-summary/@completed"/></completed>
-      <errors><xsl:value-of select="failsafe-summary/@errors"/></errors>
-      <failures><xsl:value-of select="failsafe-summary/@failures"/></failures>
-      <skipped><xsl:value-of select="failsafe-summary/@skipped"/></skipped>
-      <failureMessage><xsl:value-of select="failsafe-summary/@failureMessage"/></failureMessage>
-    </failsafe-summary>
-  </xsl:template>
-</xsl:stylesheet>

dev-tools/src/main/resources/ant/integration-tests.xml

@@ -183,11 +183,4 @@
     <delete file="${integ.pidfile}"/>
   </target>
 
-  <!-- TODO: remove this and the xslt when junit4 is fixed -->
-  <target name="fixup-failsafe-summary" unless="${shouldskip}">
-    <xslt in="${project.build.directory}/failsafe-reports/failsafe-summary-buggy.xml"
-          out="${project.build.directory}/failsafe-reports/failsafe-summary.xml"
-          style="${elasticsearch.tools.directory}/ant/fixup-failsafe-summary.xslt"/>
-  </target>
-
 </project>

plugins/pom.xml

@@ -321,8 +321,6 @@
                             <configuration>
                                 <target>
                                     <ant antfile="${elasticsearch.integ.antfile}" target="stop-external-cluster"/>
-                                    <!-- TODO: remove this and the xslt when junit4 is fixed -->
-                                    <ant antfile="${elasticsearch.integ.antfile}" target="fixup-failsafe-summary"/>
                                 </target>
                             </configuration>
                         </execution>

pom.xml

@@ -43,7 +43,7 @@
         <!-- libraries -->
         <lucene.version>5.2.1</lucene.version>
         <lucene.maven.version>5.2.1</lucene.maven.version>
-        <testframework.version>2.1.15</testframework.version>
+        <testframework.version>2.1.16</testframework.version>
         <jackson.version>2.5.3</jackson.version>
         <slf4j.version>1.6.2</slf4j.version>
         <log4j.version>1.2.17</log4j.version>
@@ -718,7 +718,7 @@
                                 <listeners>
                                     <report-ant-xml 
                                         mavenExtensions="true" 
-                                        summaryFile="${project.build.directory}/failsafe-reports/failsafe-summary-buggy.xml"
+                                        summaryFile="${project.build.directory}/failsafe-reports/failsafe-summary.xml"
                                         dir="${project.build.directory}/failsafe-reports"/>
                                 </listeners>
                                 <!-- currently only 1 cpu works, because integ tests don't make "unique" test directories? -->