Merge branch 'master' into third-party

Author: twogee

CONTRIBUTORS

@@ -433,6 +433,7 @@ Tom Eugelink
 Tom May
 Tomasz Bech
 Tomáš Zezula
+Tony Gravagno
 Trejkaz Xaoza
 Ulrich Schmidt
 Uwe Schindler

WHATSNEW

@@ -34,6 +34,12 @@ Fixed bugs:
    then the forked mode launch would fail.
    Bugzilla Report 63958
 
+ * Fixes an issue in AntStructure where an incorrect DTD was being generated.
+   Github Pull Request #116
+
+ * Fixes an incorrect variable name usage in junit-frames-xalan1.xsl.
+   Github Pull Request #117
+
 Other changes:
 --------------
 

contributors.xml

@@ -1783,6 +1783,10 @@
     <first>Tomáš</first>
     <last>Zezula</last>
   </name>
+  <name>
+    <first>Tony</first>
+    <last>Gravagno</last>
+  </name>
   <name>
     <first>Trejkaz</first>
     <last>Xaoza</last>

src/etc/checkstyle/checkstyle-config

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<!DOCTYPE module PUBLIC
+    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+    "https://checkstyle.org/dtds/configuration_1_3.dtd">
 <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with

src/etc/junit-frames-xalan1.xsl

@@ -3,6 +3,7 @@
     xmlns:lxslt="http://xml.apache.org/xslt"
     xmlns:redirect="org.apache.xalan.lib.Redirect"
     xmlns:string="xalan://java.lang.String"
+    xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
     extension-element-prefixes="redirect">
 <xsl:output method="html" indent="yes" encoding="UTF-8"/>
 <xsl:decimal-format decimal-separator="." grouping-separator=","/>
@@ -443,7 +444,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="skipCount" 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%">

src/main/org/apache/tools/ant/taskdefs/AntStructure.java

@@ -324,7 +324,7 @@ public void printElementDecl(final PrintWriter out, final Project p,
                             || !areNmtokens(values)) {
                             sb.append("CDATA ");
                         } else {
-                            sb.append(Stream.of(values).collect(joinAlts));
+                            sb.append(Stream.of(values).collect(joinAlts)).append(" ");
                         }
                     } catch (final InstantiationException | IllegalAccessException ie) {
                         sb.append("CDATA ");
@@ -337,7 +337,7 @@ public void printElementDecl(final PrintWriter out, final Project p,
                             sb.append("CDATA ");
                         } else {
                             sb.append(Stream.of(values).map(Enum::name)
-                                .collect(joinAlts));
+                                .collect(joinAlts)).append(" ");
                         }
                     } catch (final Exception x) {
                         sb.append("CDATA ");