From 8aa86560ce29d306ab562d70664a81d124d774c2 Mon Sep 17 00:00:00 2001
From: Gintas Grigelionis <gintas@apache.org>
Date: Fri, 8 Jun 2018 23:18:13 +0200
Subject: [PATCH 1/3] Fix javadoc (cherry-pick master)

---
 src/main/org/apache/tools/ant/types/PatternSet.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/org/apache/tools/ant/types/PatternSet.java b/src/main/org/apache/tools/ant/types/PatternSet.java
index 6b0a52e7c..976330805 100644
--- a/src/main/org/apache/tools/ant/types/PatternSet.java
+++ b/src/main/org/apache/tools/ant/types/PatternSet.java
@@ -204,6 +204,8 @@ public class PatternSet extends DataType implements Cloneable {
         /**
          * Encoding to use when reading the file, defaults to the platform's default
          * encoding.
+         *
+         * @return the encoding name
          */
         public final String getEncoding() {
             return encoding;

From fa27518dc08203a543a803376cdfaf8b72227529 Mon Sep 17 00:00:00 2001
From: Gintas Grigelionis <gintas@apache.org>
Date: Sat, 9 Jun 2018 17:12:48 +0200
Subject: [PATCH 2/3] Bz 62324: in debug mode, separate message and exception
 it was encapsulated in

---
 src/main/org/apache/tools/ant/DefaultLogger.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/org/apache/tools/ant/DefaultLogger.java b/src/main/org/apache/tools/ant/DefaultLogger.java
index e0cd65121..e683b0575 100644
--- a/src/main/org/apache/tools/ant/DefaultLogger.java
+++ b/src/main/org/apache/tools/ant/DefaultLogger.java
@@ -212,9 +212,8 @@ public class DefaultLogger implements BuildLogger {
       */
     public void targetStarted(BuildEvent event) {
         if (Project.MSG_INFO <= msgOutputLevel
-            && !event.getTarget().getName().equals("")) {
-            String msg = StringUtils.LINE_SEP
-                + event.getTarget().getName() + ":";
+                && !event.getTarget().getName().equals("")) {
+            String msg = String.format("%n%s:", event.getTarget().getName());
             printMessage(msg, out, event.getPriority());
             log(msg);
         }
@@ -302,7 +301,8 @@ public class DefaultLogger implements BuildLogger {
             }
             Throwable ex = event.getException();
             if (Project.MSG_DEBUG <= msgOutputLevel && ex != null) {
-                    message.append(StringUtils.getStackTrace(ex));
+                message.append(String.format("%n%s: ", ex.getClass().getSimpleName()))
+                        .append(StringUtils.getStackTrace(ex));
             }
 
             String msg = message.toString();

From 9a9647c8be044ae55c6d30975e5018a7dba39204 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Sat, 16 Jun 2018 20:17:38 +0200
Subject: [PATCH 3/3] handle error that occur in testsuites directly in
 junitreport

https://bz.apache.org/bugzilla/show_bug.cgi?id=62443
---
 WHATSNEW                 |  4 ++++
 src/etc/junit-frames.xsl | 16 ++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/WHATSNEW b/WHATSNEW
index 699ad2304..382fac2e8 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -32,6 +32,10 @@ Fixed bugs:
    end of the inout stream (usually System.in or System.console) are
    reached before a valid input has been read.
 
+ * junitreport does not list testsuites that fail to start any tests
+   because of an exception inside the all-tests and alltests-errors frames.
+   Bugzilla Report 62443
+
 Other changes:
 --------------
 
diff --git a/src/etc/junit-frames.xsl b/src/etc/junit-frames.xsl
index 624fd6923..49fc6671d 100644
--- a/src/etc/junit-frames.xsl
+++ b/src/etc/junit-frames.xsl
@@ -296,6 +296,7 @@ h6 {
                   </xsl:apply-templates>
                 </xsl:when>
                 <xsl:when test="$type = 'errors'">
+                  <xsl:apply-templates select=".//testsuite[error]" mode="alltests.error.row"/>
                   <xsl:apply-templates select=".//testcase[error]" mode="print.test">
                     <xsl:with-param name="show.class" select="'yes'"/>
                   </xsl:apply-templates>
@@ -306,6 +307,7 @@ h6 {
                   </xsl:apply-templates>
                 </xsl:when>
                 <xsl:otherwise>
+                  <xsl:apply-templates select=".//testsuite[error]" mode="alltests.error.row"/>
                   <xsl:apply-templates select=".//testcase" mode="print.test">
                     <xsl:with-param name="show.class" select="'yes'"/>
                   </xsl:apply-templates>
@@ -969,4 +971,18 @@ h6 {
     <xsl:param name="value"/>
     <xsl:value-of select="format-number($value,'0.00%')"/>
 </xsl:template>
+
+<xsl:template match="testsuite" mode="alltests.error.row">
+  <xsl:variable name="package.dir">
+    <xsl:if test="not(@package = '')"><xsl:value-of select="translate(@package,'.','/')"/><xsl:text>/</xsl:text></xsl:if>
+  </xsl:variable>
+  <xsl:variable name="class.href">
+    <xsl:value-of select="concat($package.dir, @id, '_', @name, '.html')"/>
+  </xsl:variable>
+  <tr class="Error">
+    <td><a href="{$class.href}"><xsl:value-of select="@name"/></a></td>
+    <td colspan="3"><xsl:apply-templates select="./error"/></td>
+  </tr>
+</xsl:template>
+
 </xsl:stylesheet>