Re-enable ImegeIO test Resolves: RHEL-5365

Resolves: RHEL-5365

.ant.metadata

@@ -0,0 +1 @@
+7760da2f3f5708ee0975caf634df16d5567fffe5 apache-ant-1.10.9-src.tar.bz2

ant-build.xml.patch

@@ -1,14 +1,5 @@
 --- build.xml~	2021-05-17 12:32:48.406394876 +0200
 +++ build.xml	2021-05-17 12:32:39.990389601 +0200
-@@ -145,8 +145,6 @@
-      -->
-     <pathelement location="${src.junit}"/>
-     <pathelement location="${tests.etc.dir}"/>
--    <!-- Otherwise many tests fail with "com.sun.tools.javac.Main is not on the classpath.": -->
--    <pathelement location="${java.home}/../lib/tools.jar"/>
-   </path>
- 
-   <!--
 @@ -819,7 +817,6 @@
        </metainf>
        <manifest>

ant.spec

@@ -62,6 +62,7 @@ BuildRequires:  mvn(commons-net:commons-net)
 BuildRequires:  mvn(javax.mail:mail)
 BuildRequires:  mvn(jdepend:jdepend)
 BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(log4j:log4j:1.2.13)
 BuildRequires:  mvn(org.tukaani:xz)
 BuildRequires:  mvn(oro:oro)
 BuildRequires:  mvn(regexp:regexp)
@@ -70,8 +71,6 @@ BuildRequires:  mvn(xml-resolver:xml-resolver)
 BuildRequires:  mvn(org.hamcrest:hamcrest-core)
 BuildRequires:  mvn(org.hamcrest:hamcrest-library)
 
-BuildRequires:  junit5
-
 # Theoretically Ant might be usable with just JRE, but typical Ant
 # workflow requires full JDK, so we recommend it here.
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -86,7 +85,6 @@ Requires:       %{name}-lib = %{version}-%{release}
 Requires:       javapackages-tools
 
 BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
 
 %description
 Apache Ant is a Java library and command-line tool whose mission is to
@@ -197,6 +195,16 @@ Optional apache bcel tasks for %{name}.
 %description apache-bcel -l fr
 Taches apache bcel optionelles pour %{name}.
 
+%package apache-log4j
+Summary:        Optional apache log4j tasks for %{name}
+Requires:       %{name} = %{version}-%{release}
+
+%description apache-log4j
+Optional apache log4j tasks for %{name}.
+
+%description apache-log4j -l fr
+Taches apache log4j optionelles pour %{name}.
+
 %package apache-oro
 Summary:        Optional apache oro tasks for %{name}
 Requires:       %{name} = %{version}-%{release}
@@ -274,16 +282,6 @@ Optional junit tasks for %{name}.
 %description junit -l fr
 Taches junit optionelles pour %{name}.
 
-%package junit5
-Summary:        Optional junit5 tasks for %{name}
-Requires:       %{name} = %{version}-%{release}
-
-%description junit5
-Optional junit5 tasks for %{name}.
-
-%description junit5 -l fr
-Taches junit5 optionelles pour %{name}.
-
 %package testutil
 Summary:        Test utility classes for %{name}
 Requires:       %{name} = %{version}-%{release}
@@ -340,7 +338,7 @@ rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java
    src/tests/junit/org/apache/tools/mail/MailMessageTest.java
 
 #install jars
-build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer hamcrest/core hamcrest/library xz-java junit5 opentest4j
+build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit log4j-1 oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer hamcrest/core hamcrest/library xz-java
 
 # fix hardcoded paths in ant script and conf
 cp -p %{SOURCE2} %{name}.conf
@@ -363,11 +361,6 @@ mv LICENSE.utf8 LICENSE
 # We want a hard dep on antlr
 %pom_xpath_remove pom:optional src/etc/poms/ant-antlr/pom.xml
 
-# Disable tests comparing exception message
-sed -i /'public void testFailOnError()'/i@org.junit.Ignore src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java
-
-rm src/main/org/apache/tools/ant/listener/Log4jListener.java
-
 %build
 %{ant} jars test-jar javadocs
 
@@ -380,7 +373,7 @@ xmlto man man/%{name}.xml -o man
 rm -fr build/lib/ant-jai.jar build/lib/ant-netrexx.jar
 # -----------------------------------------------------------------------------
 
-rm -fr build/lib/ant-apache-log4j.jar
+rm -fr build/lib/ant-junitlauncher.jar
 
 %install
 # ANT_HOME and subdirs
@@ -450,6 +443,7 @@ echo "apache-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_syscon
 echo "apache-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-net
 #echo "jai ant/ant-jai" > $RPM_BUILD_ROOT%%{_sysconfdir}/%%{name}.d/jai
 echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bcel
+echo "log4j12 ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-log4j
 echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-oro
 echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-regexp
 echo "xalan-j2 xalan-j2-serializer ant/ant-apache-xalan2" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-xalan2
@@ -459,7 +453,6 @@ echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jdepend
 echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch
 echo "junit hamcrest/core ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit
 echo "junit hamcrest/core ant/ant-junit4" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit4
-echo "junit5 hamcrest/core junit opentest4j ant/ant-junitlauncher" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junitlauncher
 echo "testutil ant/ant-testutil" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/testutil
 echo "xz-java ant/ant-xz" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/xz
 
@@ -539,6 +532,10 @@ export LC_ALL=C.UTF-8
 %{ant_home}/lib/%{name}-apache-bcel.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-bcel
 
+%files apache-log4j -f .mfiles-apache-log4j
+%{ant_home}/lib/%{name}-apache-log4j.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/apache-log4j
+
 %files apache-oro -f .mfiles-apache-oro
 %{ant_home}/lib/%{name}-apache-oro.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-oro
@@ -581,10 +578,6 @@ export LC_ALL=C.UTF-8
 %{ant_home}/etc/junit-frames-saxon.xsl
 %{ant_home}/etc/junit-noframes-saxon.xsl
 
-%files junit5 -f .mfiles-junitlauncher
-%{ant_home}/lib/%{name}-junitlauncher.jar
-%config(noreplace) %{_sysconfdir}/%{name}.d/junitlauncher
-
 %files testutil -f .mfiles-testutil
 %{ant_home}/lib/%{name}-testutil.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/testutil