From f3837f017b5cae73832a47fb1f8b1708216acc00 Mon Sep 17 00:00:00 2001
From: Gintas Grigelionis <gintas@apache.org>
Date: Thu, 25 Oct 2018 17:06:24 +0200
Subject: [PATCH] Make Jenkins builds work again

---
 src/etc/poms/ant/pom.xml                                  | 8 ++++----
 .../junit/org/apache/tools/ant/taskdefs/AntTest.java      | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/etc/poms/ant/pom.xml b/src/etc/poms/ant/pom.xml
index 4c21e3bb1..d2286b17d 100644
--- a/src/etc/poms/ant/pom.xml
+++ b/src/etc/poms/ant/pom.xml
@@ -296,9 +296,9 @@
     </testResources>
     <sourceDirectory>../../../../src/main</sourceDirectory>
     <testSourceDirectory>../../../../src/tests/junit</testSourceDirectory>
-    <!-- directory name hardcoded in AntTest -->
-    <outputDirectory>../../../../target/build/classes</outputDirectory>
-    <testOutputDirectory>../../../../target/build/testcases</testOutputDirectory>
-    <directory>../../../../target/build</directory>
+    <!-- directory name is hardcoded in AntTest -->
+    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
+    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
+    <directory>../../../../target/${project.artifactId}</directory>
   </build>
 </project>
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
index 3bd5b0cde..a029781d9 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
@@ -374,7 +374,8 @@ public class AntTest {
         // Cf. #42263
         buildRule.executeTarget("sub-show-ant.core.lib");
         String realLog = buildRule.getLog();
-        assertTrue("found ant.core.lib in: " + realLog, realLog.matches(".*(ant[.]jar|build.classes).*"));
+        assertTrue("found ant.core.lib in: " + realLog,
+                realLog.matches(".*(ant[.]jar|ant.classes|build.classes).*"));
     }
 
     private class BasedirChecker implements BuildListener {