From 40a9188d8b8404d1f764b6671c4b61be5eb7b086 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 26 Jan 2018 18:56:49 +0100
Subject: [PATCH 1/3] infinite redirect test runs into network timeouts on
 Jenkins

this failure has been crying wolf for so long we hardly notice
something else might be broken in all the noise of failed Jenkins
builds.
---
 src/tests/antunit/taskdefs/get-test.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tests/antunit/taskdefs/get-test.xml b/src/tests/antunit/taskdefs/get-test.xml
index 0bca337c7..a8ca6a911 100644
--- a/src/tests/antunit/taskdefs/get-test.xml
+++ b/src/tests/antunit/taskdefs/get-test.xml
@@ -94,7 +94,7 @@
     </target>
     
     
-    <target name="testInfiniteRedirect">
+    <target name="testInfiniteRedirect" unless="jenkins">
         <au:expectfailure expectedmessage="More than 25 times redirected, giving up">
       <get  src="${location}/infinite.txt" dest="${output}/infinite.tmp"/>
         </au:expectfailure>

From 294f13b8c94a2c2e4a801d60532f90d3e2241d88 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 26 Jan 2018 19:51:04 +0100
Subject: [PATCH 2/3] tunnel jenkins property via three layers of build files

---
 build.xml        | 1 +
 launch-build.xml | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index e9701e08f..37476c08d 100644
--- a/build.xml
+++ b/build.xml
@@ -1914,6 +1914,7 @@ ${antunit.reports}
       <propertyset>
         <propertyref name="antunit.tmpdir"/>
         <propertyref name="ant.home"/>
+        <propertyref name="jenkins"/>
       </propertyset>
     </au:antunit>
   </target>
diff --git a/launch-build.xml b/launch-build.xml
index 0103d3664..753ef2bc9 100644
--- a/launch-build.xml
+++ b/launch-build.xml
@@ -21,7 +21,11 @@
         Build file be able to launch the boostrap build of Ant on every supported platform
     </description>
     
-    <property name="args" value="allclean test -Dignore.tests.failed=true -Doptional.jars.whenmanifestonly=skip" />
+    <property name="default-args" value="allclean test -Dignore.tests.failed=true -Doptional.jars.whenmanifestonly=skip" />
+    <condition property="args" value="${default-args} -Djenkins=t">
+      <isset property="jenkins"/>
+    </condition>
+    <property name="args" value="${default-args}" />
 
     <condition property="launch.cmd" value="${basedir}/build.sh">
         <os family="unix" />

From 6fe6914f62ab7efa01995ee9d9ed0291fb699b1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Mat=C3=A8rne?= <jhm@apache.org>
Date: Fri, 26 Jan 2018 20:00:50 +0100
Subject: [PATCH 3/3] hint: log4j-bridge requires a newer version of Ant

---
 manual/listeners.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manual/listeners.html b/manual/listeners.html
index e201638a6..7387288f0 100644
--- a/manual/listeners.html
+++ b/manual/listeners.html
@@ -420,7 +420,7 @@ documentation page</a>.</p>
 
 <h4>Using the Log4j 1.2 Bridge</h4>
 You could use the <a href="http://logging.apache.org/log4j/2.x/log4j-1.2-api/index.html">Log4j Bridge</a>
-if your application is written against the Log4j (1.x) API, but you want to use the Log4j 2.x runtime. 
+if your application is written against the Log4j (1.x) API, but you want to use the Log4j 2.x runtime.
 For using the bridge with Ant you have to add
 <ul>
   <li>log4j-1.2-api-${log4j.version}.jar</li>
@@ -429,6 +429,7 @@ For using the bridge with Ant you have to add
   <li>log4j2.xml</li>
 </ul>
 to your classpath (e.g. via the <code>-lib</code> option).
+(For using the bridge Ant 1.9.10/1.10.2 or higher is required.)
 Translating the 1.x properties file into the 2.x xml syntax would result in
 <blockquote>
 <pre><code>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;