Updated to 2.5.3

.gitignore

@@ -11,3 +11,5 @@
 /apache-ivy-2.5.1-src.tar.gz.asc
 /apache-ivy-2.5.2-src.tar.gz
 /apache-ivy-2.5.2-src.tar.gz.asc
+/apache-ivy-2.5.3-src.tar.gz
+/apache-ivy-2.5.3-src.tar.gz.asc

00-global-settings.patch

@@ -1,6 +1,6 @@
 --- a/src/java/org/apache/ivy/ant/IvyAntSettings.java
 +++ b/src/java/org/apache/ivy/ant/IvyAntSettings.java
-@@ -345,7 +345,7 @@ public class IvyAntSettings extends DataType {
+@@ -345,7 +345,7 @@
          File[] settingsLocations = new File[] {
                  new File(getProject().getBaseDir(), settingsFileName),
                  new File(getProject().getBaseDir(), "ivyconf.xml"), new File(settingsFileName),

apache-ivy.spec

@@ -6,8 +6,8 @@
 %global jarname ivy
 
 Name:           apache-%{jarname}
-Version:        2.5.2
-Release:        9%{?dist}
+Version:        2.5.3
+Release:        1%{?dist}
 Summary:        Java-based dependency manager
 License:        Apache-2.0
 URL:            https://ant.apache.org/ivy
@@ -21,11 +21,12 @@ Source2:        https://archive.apache.org/dist/ant/KEYS
 # Non-upstreamable.  Add /etc/ivy/ivysettings.xml at the end list of
 # settings files Ivy tries to load.  This file will be used only as
 # last resort, when no other setting files exist.
-Patch0:         00-global-settings.patch
+Source3:         00-global-settings.patch
 
 BuildRequires:  gnupg2
 BuildRequires:  ant-openjdk21
 BuildRequires:  ivy-local
+BuildRequires:  dos2unix
 BuildRequires:  mvn(org.apache.ant:ant)
 BuildRequires:  mvn(org.bouncycastle:bcpg-jdk18on)
 BuildRequires:  mvn(org.bouncycastle:bcprov-jdk18on)
@@ -62,7 +63,9 @@ reporting and publication.
 
 %prep
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%autosetup -p1
+%autosetup
+dos2unix src/java/org/apache/ivy/ant/IvyAntSettings.java
+patch -p1 -l < %{SOURCE3}
 # Don't hardcode sysconfdir path
 sed -i 's:/etc/ivy/:%{_sysconfdir}/ivy/:' src/java/org/apache/ivy/ant/IvyAntSettings.java
 # remove BOM
@@ -134,7 +137,7 @@ rm -rf asciidoc
 # create custom ant configuration
 mkdir -p ~/.ant
 cp /etc/ant.conf ~/.ant
-sed -i '$a JAVA_HOME=/usr/lib/jvm/java-11-openjdk' ~/.ant/ant.conf
+sed -i '$a JAVA_HOME=/usr/lib/jvm/java-21-openjdk' ~/.ant/ant.conf
 
 ant -Divy.mode=local \
     -f build-release.xml \

sources

@@ -1,2 +1,2 @@
-SHA512 (apache-ivy-2.5.2-src.tar.gz) = b539ff139bfcb7a7d48ee7b3fcc15774354109bbeede9d3f954d6f8e258efb34cb493aa6eef270b82a0550c407fbaad5ccd51b1fb2c999eb88b5609efa27761c
-SHA512 (apache-ivy-2.5.2-src.tar.gz.asc) = 992cb1154754eb64e3a5902bc5e49b7fedfa222ec2e48e1bccc6fabd890de6ab33dc4deabd01ac36fe11d6e5d0f141c54d7303ce8bee1628d038b1922f1304e9
+SHA512 (apache-ivy-2.5.3-src.tar.gz) = 135c9cdbd3b4d291f67849e1b38964e1adef51b879de6b46ea4b72fd1bfa2d337b7468d46c4632b2bf360bdb9a25af874195f1032c61fe9fcd1f39ffa02469be
+SHA512 (apache-ivy-2.5.3-src.tar.gz.asc) = 37c40100426b4e045a738570b5133845e753d3e0ebcd7a91d401be967446fed7d8d9d17275191b4cbd33f2847f042fa36fa5f125eaea305b3eef63ea668f9af3