From 88927529df8de7e486c03d6fb172574de891e7a4 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 22 Apr 2022 11:59:53 +0200
Subject: [PATCH] Disable test failing to compile with JUnit 5.8.x
---
ant.spec | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/ant.spec b/ant.spec
index 22a6dfb..23ca322 100644
--- a/ant.spec
+++ b/ant.spec
@@ -34,7 +34,7 @@
Name: ant
Version: 1.10.12
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Java build tool
Summary(it): Tool per la compilazione di programmi java
Summary(fr): Outil de compilation pour java
@@ -342,6 +342,9 @@ rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java
src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java \
src/tests/junit/org/apache/tools/mail/MailMessageTest.java
+# Test relies on internal JUnit 5 API that was changed
+rm src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyXmlResultFormatterTest.java
+
# Log4jListener is deprecated by upstream: Apache Log4j (1) is not
# developed any more. Last release is 1.2.17 from 26 May 2012 and
# contains vulnerability issues.
@@ -640,6 +643,9 @@ LC_ALL=C.UTF-8 %{ant} test
# -----------------------------------------------------------------------------
%changelog
+* Fri Apr 22 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.12-4
+- Fix FTBFS with JUnit 5.8.x
+
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.10.12-3
- Rebuilt for java-17-openjdk as system jdk