Update to upstream version 1.10.9

Related: RHEL-5365

.gitignore

@@ -19,3 +19,4 @@ apache-ant-1.8.4-src.tar.bz2
 /apache-ant-1.10.5-src.tar.bz2
 /apache-ant-1.10.6-src.tar.bz2
 /apache-ant-1.10.7-src.tar.bz2
+/apache-ant-1.10.9-src.tar.bz2

ant-build.xml.patch

@@ -1,5 +1,5 @@
---- apache-ant-1.10.7/build.xml~	2019-10-31 14:10:07.739864466 +0100
+--- build.xml~	2021-05-17 12:32:48.406394876 +0200
-+++ apache-ant-1.10.7/build.xml	2019-10-31 14:10:12.018897830 +0100
++++ build.xml	2021-05-17 12:32:39.990389601 +0200
 @@ -145,8 +145,6 @@
       -->
      <pathelement location="${src.junit}"/>
@@ -9,7 +9,7 @@
    </path>
  
    <!--
-@@ -801,7 +799,6 @@
+@@ -819,7 +817,6 @@
        </metainf>
        <manifest>
          <attribute name="Main-Class" value="org.apache.tools.ant.Main"/>
@@ -17,29 +17,29 @@
        </manifest>
      </jar>
  
-@@ -1543,7 +1540,25 @@
+@@ -1562,7 +1559,25 @@
-              maxmemory="1000M"
+              verbose="${javadoc.verbose}"
-              verbose="${javadoc.verbose}">
+              additionalparam="${javadoc.doclint.none}">
  
 -      <packageset dir="${java.dir}"/>
 +      <fileset dir="${java.dir}">
-+	<include name="**/*.java"/>
++        <include name="**/*.java"/>
-+	<exclude name="org/apache/tools/ant/taskdefs/email/MimeMailer.java"/>
++        <exclude name="org/apache/tools/ant/taskdefs/email/MimeMailer.java"/>
-+	<exclude name="org/apache/tools/ant/taskdefs/optional/NetRexxC.java"/>
++        <exclude name="org/apache/tools/ant/taskdefs/optional/NetRexxC.java"/>
-+	<exclude name="org/apache/tools/ant/taskdefs/optional/image/Image.java"/>
++        <exclude name="org/apache/tools/ant/taskdefs/optional/image/Image.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/Arc.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/Arc.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/BasicShape.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/BasicShape.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/Draw.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/Draw.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/DrawOperation.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/DrawOperation.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/Ellipse.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/Ellipse.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/ImageOperation.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/ImageOperation.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/Rectangle.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/Rectangle.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/Rotate.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/Rotate.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/Scale.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/Scale.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/Text.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/Text.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/TransformOperation.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/TransformOperation.java"/>
-+	<exclude name="org/apache/tools/ant/types/optional/image/ColorMapper.java"/>
++        <exclude name="org/apache/tools/ant/types/optional/image/ColorMapper.java"/>
-+	<exclude name="org/apache/tools/ant/taskdefs/optional/image/ImageIOTask.java"/>
++        <exclude name="org/apache/tools/ant/taskdefs/optional/image/ImageIOTask.java"/>
 +      </fileset>
  
        <!-- hide some meta information for javadoc -->

ant.spec

@@ -31,14 +31,14 @@
 %global ant_home %{_datadir}/ant
 
 Name:           ant
-Version:        1.10.7
+Version:        1.10.9
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Java build tool
 Summary(it):    Tool per la compilazione di programmi java
 Summary(fr):    Outil de compilation pour java
 License:        ASL 2.0
 URL:            https://ant.apache.org/
-Source0:        https://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
+Source0:        https://archive.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
 Source2:        apache-ant-1.8.ant.conf
 # manpage
 Source3:        ant.asciidoc
@@ -62,7 +62,6 @@ 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)
@@ -87,6 +86,7 @@ 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,16 +197,6 @@ 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}
@@ -333,7 +323,7 @@ Javadoc pour %{name}.
 
 %prep
 %setup -q -n apache-ant-%{version}
-%patch0 -p1
+%patch0 -p0
 
 # clean jar files
 find . -name "*.jar" | xargs -t rm
@@ -350,7 +340,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 log4j-1 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 oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer hamcrest/core hamcrest/library xz-java junit5 opentest4j
 
 # fix hardcoded paths in ant script and conf
 cp -p %{SOURCE2} %{name}.conf
@@ -373,6 +363,11 @@ 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
 
@@ -385,6 +380,8 @@ 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
+
 %install
 # ANT_HOME and subdirs
 mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc,bin}
@@ -453,7 +450,6 @@ 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
@@ -543,10 +539,6 @@ 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
@@ -612,6 +604,9 @@ export LC_ALL=C.UTF-8
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue Jan 30 2024 Marián Konček <mkoncek@redhat.com> - 1.10.9-1
+- Update to upstream version 1.10.9
+
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.7-2
 - Mass rebuild for javapackages-tools 201902
 

sources

@@ -1 +1 @@
-SHA512 (apache-ant-1.10.7-src.tar.bz2) = 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+SHA512 (apache-ant-1.10.9-src.tar.bz2) = 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4