From 816c7a8c381e48d50634ec502c766218399a628a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:28:10 +0000 Subject: [PATCH 01/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-io.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 2601bef..bce9c25 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,7 +1,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 URL: http://commons.apache.org/io @@ -41,6 +41,9 @@ sed -i 's/\r//' *.txt %doc RELEASE-NOTES.txt %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1:2.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 1:2.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From f008cf21951ed90ec0bd4e93a05bc67ebb92e908 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 7 Feb 2019 17:16:27 +0000 Subject: [PATCH 02/71] Rebuild to regenerate OSGi metadata --- apache-commons-io.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index bce9c25..0aa282b 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,7 +1,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 URL: http://commons.apache.org/io @@ -31,7 +31,7 @@ sed -i 's/\r//' *.txt # NOTE: tests *may* fail because commons-io is on surefire's classpath and causes # tests to be run against the system version and not the one we just built -%mvn_build +%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.io %install %mvn_install @@ -41,6 +41,9 @@ sed -i 's/\r//' *.txt %doc RELEASE-NOTES.txt %changelog +* Thu Feb 07 2019 Mat Booth - 1:2.6-6 +- Rebuild to regenerate OSGi metadata + * Thu Jan 31 2019 Fedora Release Engineering - 1:2.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 615be618a39f5a91e814bdf6d416d05557b1fd7b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:17 +0200 Subject: [PATCH 03/71] Mass rebuild for javapackages-tools 201901 --- apache-commons-io.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index b1bc6f2..3dbe7c4 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,7 +1,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 URL: http://commons.apache.org/io @@ -41,6 +41,9 @@ sed -i 's/\r//' *.txt %doc RELEASE-NOTES.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1:2.6-4 +- Mass rebuild for javapackages-tools 201901 + * Wed Feb 07 2018 Fedora Release Engineering - 1:2.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From b767e331425d4dc05b8fb0cbe5d6502e3f89b3fc Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 25 Jun 2019 08:53:26 +0200 Subject: [PATCH 04/71] Declare module package --- apache-commons-io.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 3dbe7c4..b75f26c 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -19,6 +19,7 @@ Commons-IO contains utility classes, stream implementations, file filters, and endian classes. It is a library of utilities to assist with developing IO functionality. +%{?module_package} %{?javadoc_package} %prep @@ -36,7 +37,7 @@ sed -i 's/\r//' *.txt %install %mvn_install -%files -f .mfiles +%files -n %{?module_prefix}%{name} -f .mfiles %license LICENSE.txt NOTICE.txt %doc RELEASE-NOTES.txt From bb236950e01a9643bfd34118685d612a79b76ddf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 25 Jun 2019 09:15:21 +0200 Subject: [PATCH 05/71] Use standard artifact installation location --- apache-commons-io.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index b75f26c..95dc629 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -27,7 +27,6 @@ to assist with developing IO functionality. sed -i 's/\r//' *.txt %build -%mvn_file : commons-io %{name} %mvn_alias : org.apache.commons: # NOTE: tests *may* fail because commons-io is on surefire's classpath and causes From ddc431ea93d79eb24f15814086b5d23ba6307307 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 27 Jun 2019 14:36:26 +0200 Subject: [PATCH 06/71] Revert "Use standard artifact installation location" This reverts commit bb236950e01a9643bfd34118685d612a79b76ddf. --- apache-commons-io.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 95dc629..b75f26c 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -27,6 +27,7 @@ to assist with developing IO functionality. sed -i 's/\r//' *.txt %build +%mvn_file : commons-io %{name} %mvn_alias : org.apache.commons: # NOTE: tests *may* fail because commons-io is on surefire's classpath and causes From 321169b33b60e95091f302b6844a141bd4c4bf3f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 1 Jul 2019 13:15:12 +0200 Subject: [PATCH 07/71] Run tests in multiple reusable forks to improve test performance --- apache-commons-io.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index b75f26c..b27167a 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -26,12 +26,13 @@ to assist with developing IO functionality. %setup -q -n commons-io-%{version}-src sed -i 's/\r//' *.txt -%build +# Run tests in multiple reusable forks to improve test performance +sed -i -e /reuseForks/d -e /forkCount/d pom.xml + %mvn_file : commons-io %{name} %mvn_alias : org.apache.commons: -# NOTE: tests *may* fail because commons-io is on surefire's classpath and causes -# tests to be run against the system version and not the one we just built +%build %mvn_build %install From 4f2c6e1b903776ba3a710d55da290a9b5b731f61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 18:04:50 +0000 Subject: [PATCH 08/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-io.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 0aa282b..ea66099 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,7 +1,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 URL: http://commons.apache.org/io @@ -41,6 +41,9 @@ sed -i 's/\r//' *.txt %doc RELEASE-NOTES.txt %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1:2.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Feb 07 2019 Mat Booth - 1:2.6-6 - Rebuild to regenerate OSGi metadata From 9317d853a6652818f8acbeb84df5a204bdb9d216 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 09/71] Mass rebuild for javapackages-tools 201902 --- apache-commons-io.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index b27167a..adcf77a 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,7 +1,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 URL: http://commons.apache.org/io @@ -43,6 +43,9 @@ sed -i -e /reuseForks/d -e /forkCount/d pom.xml %doc RELEASE-NOTES.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1:2.6-5 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 1:2.6-4 - Mass rebuild for javapackages-tools 201901 From 5f931efaafd8d23224c4438a0dbebd3a9896f894 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 11 Dec 2019 17:34:22 +0100 Subject: [PATCH 10/71] Fix OSGi bundle symbolic name --- apache-commons-io.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index adcf77a..cd29e35 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -33,7 +33,7 @@ sed -i -e /reuseForks/d -e /forkCount/d pom.xml %mvn_alias : org.apache.commons: %build -%mvn_build +%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.io %install %mvn_install From 5108ed09dbaed15b070c1da956403560fe1867f4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 25 Jan 2020 14:40:08 +0100 Subject: [PATCH 11/71] Build with OpenJDK 8 --- apache-commons-io.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index cd29e35..4897652 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,7 +1,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 URL: http://commons.apache.org/io @@ -9,7 +9,7 @@ BuildArch: noarch Source0: http://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz -BuildRequires: maven-local +BuildRequires: maven-local-openjdk8 BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) @@ -43,6 +43,9 @@ sed -i -e /reuseForks/d -e /forkCount/d pom.xml %doc RELEASE-NOTES.txt %changelog +* Sat Jan 25 2020 Mikolaj Izdebski - 1:2.6-6 +- Build with OpenJDK 8 + * Tue Nov 05 2019 Mikolaj Izdebski - 1:2.6-5 - Mass rebuild for javapackages-tools 201902 From c54384e3f823b647b38e55882f3fb9ef3a23ff54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:44:54 +0000 Subject: [PATCH 12/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-io.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index ea66099..916d473 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,7 +1,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 URL: http://commons.apache.org/io @@ -41,6 +41,9 @@ sed -i 's/\r//' *.txt %doc RELEASE-NOTES.txt %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1:2.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 1:2.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From effdf1ac9b04913775d5930276980abd9c0d858f Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 15:33:58 +0200 Subject: [PATCH 13/71] Rebuilt for JDK-11 --- apache-commons-io.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 916d473..9d032da 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,7 +1,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.6 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 URL: http://commons.apache.org/io @@ -41,6 +41,9 @@ sed -i 's/\r//' *.txt %doc RELEASE-NOTES.txt %changelog +* Fri Jul 10 2020 Jiri Vanek - 1:2.6-9 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Tue Jan 28 2020 Fedora Release Engineering - 1:2.6-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 5d0969a92ebce0fe8797ce8b476f92f59511b947 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:10:51 +0000 Subject: [PATCH 14/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-io.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 9d032da..46bb21c 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,7 +1,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.6 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 URL: http://commons.apache.org/io @@ -41,6 +41,9 @@ sed -i 's/\r//' *.txt %doc RELEASE-NOTES.txt %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1:2.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 10 2020 Jiri Vanek - 1:2.6-9 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 56d06f3f1ec2b6d268a8e39e687044a2845b814f Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 29 Jul 2020 16:28:04 +0200 Subject: [PATCH 15/71] Update to upstream version 2.7 --- .gitignore | 1 + apache-commons-io.spec | 29 ++++++++++++++++++++++++----- sources | 2 +- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3843a9b..cba945a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ commons-io-2.1-src.tar.gz /commons-io-2.4-src.tar.gz /commons-io-2.5-src.tar.gz /commons-io-2.6-src.tar.gz +/commons-io-2.7-src.tar.gz diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 4897652..f74c907 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,18 +1,20 @@ Name: apache-commons-io Epoch: 1 -Version: 2.6 -Release: 6%{?dist} +Version: 2.7 +Release: 1%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 -URL: http://commons.apache.org/io +URL: https://commons.apache.org/io BuildArch: noarch -Source0: http://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz +Source0: https://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz BuildRequires: maven-local-openjdk8 -BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter) +BuildRequires: mvn(org.mockito:mockito-core) %description Commons-IO contains utility classes, stream implementations, @@ -28,10 +30,24 @@ sed -i 's/\r//' *.txt # Run tests in multiple reusable forks to improve test performance sed -i -e /reuseForks/d -e /forkCount/d pom.xml +sed -i '//d' pom.xml %mvn_file : commons-io %{name} %mvn_alias : org.apache.commons: +%pom_remove_dep org.junit-pioneer:junit-pioneer +%pom_remove_dep com.google.jimfs:jimfs + +# Test depends on com.google.jimfs:jimfs +rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java + +# This annotation is part of junitpioneer +sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/output/XmlStreamWriterTest.java +sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java + +rm src/test/java/org/apache/commons/io/output/XmlStreamWriterTest.java +rm src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java + %build %mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.io @@ -43,6 +59,9 @@ sed -i -e /reuseForks/d -e /forkCount/d pom.xml %doc RELEASE-NOTES.txt %changelog +* Wed Jul 29 2020 Marian Koncek - 1:2.7-1 +- Update to upstream version 2.7 + * Sat Jan 25 2020 Mikolaj Izdebski - 1:2.6-6 - Build with OpenJDK 8 diff --git a/sources b/sources index 3dc47d1..3a7630f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-io-2.6-src.tar.gz) = fa22397631283726b85276d8fb367e10755351ef2c4c87c5519485ba68ab26ffa2bfe36ee686f53f82e3aeb9e423618d89ad97b02fb272a549e0d4769928e764 +SHA512 (commons-io-2.7-src.tar.gz) = 9898b59c2aebdc1c51a7f8aca14e3080a08b766404c2aff091b204ba55870129dd95643665a6d46e15e94cd9d4cb280488ab0a28a1c51f43d132f839b742edc3 From 65f12bfa74cb3bb89613e2b05d2c542caa11a1af Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 29 Jul 2020 16:56:10 +0200 Subject: [PATCH 16/71] Reenable removed tests --- apache-commons-io.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index f74c907..8965e06 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -45,9 +45,6 @@ rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFil sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/output/XmlStreamWriterTest.java sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java -rm src/test/java/org/apache/commons/io/output/XmlStreamWriterTest.java -rm src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java - %build %mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.io From 34de7e2c804517d5ce5cbdd70cfac5485eebf115 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 4 Aug 2020 15:35:07 +0200 Subject: [PATCH 17/71] Add a reminder for tests --- apache-commons-io.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 8965e06..3ab9e69 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -46,6 +46,7 @@ sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/output/XmlStreamWr sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java %build +# See "-DcommonsIoVersion" in maven-surefire for the tested version %mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.io %install From d87674a7ddcac3c34f13828502af58a29b5087a5 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 21 Aug 2020 10:29:51 +0200 Subject: [PATCH 18/71] update to version 2.7 --- .gitignore | 8 ++++-- apache-commons-io.spec | 64 ++++++++++++++++++++++++++++++++++-------- sources | 2 +- 3 files changed, 60 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 3843a9b..97f3ee3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,13 @@ -commons-io-1.4-src.tar.gz +/results_* +/*.src.rpm + +/commons-io-1.4-src.tar.gz /commons-io-2.0-src.tar.gz /commons-io-2.0.1-src.tar.gz -commons-io-2.1-src.tar.gz +/commons-io-2.1-src.tar.gz /commons-io-2.2-src.tar.gz /commons-io-2.3-src.tar.gz /commons-io-2.4-src.tar.gz /commons-io-2.5-src.tar.gz /commons-io-2.6-src.tar.gz +/commons-io-2.7-src.tar.gz diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 46bb21c..5903eef 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,46 +1,87 @@ +# unit tests do not finish +%bcond_with tests + +%global srcname commons-io + Name: apache-commons-io Epoch: 1 -Version: 2.6 -Release: 10%{?dist} +Version: 2.7 +Release: 1%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 -URL: http://commons.apache.org/io + +URL: https://commons.apache.org/io +Source0: https://archive.apache.org/dist/commons/io/source/%{srcname}-%{version}-src.tar.gz + BuildArch: noarch -Source0: http://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz - BuildRequires: maven-local -BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +%if %{with tests} +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter) +BuildRequires: mvn(org.mockito:mockito-core) +BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform) +%endif + %description Commons-IO contains utility classes, stream implementations, file filters, and endian classes. It is a library of utilities to assist with developing IO functionality. -%{?javadoc_package} + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +API documentation for %{name}. + %prep -%setup -q -n commons-io-%{version}-src +%setup -q -n %{srcname}-%{version}-src sed -i 's/\r//' *.txt -%build +%if %{with tests} +# com.google.jimfs:jimfs is not packaged for fedora +%pom_remove_dep com.google.jimfs:jimfs +rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java + +# junit-pioneer is not packaged for fedora +%pom_remove_dep :junit-pioneer +rm src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java +rm src/test/java/org/apache/commons/io/output/XmlStreamWriterTest.java +%endif + %mvn_file : commons-io %{name} %mvn_alias : org.apache.commons: -# NOTE: tests *may* fail because commons-io is on surefire's classpath and causes -# tests to be run against the system version and not the one we just built + +%build +%if %{with tests} %mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.io +%else +%mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.io +%endif + %install %mvn_install + %files -f .mfiles %license LICENSE.txt NOTICE.txt %doc RELEASE-NOTES.txt +%files javadoc -f .mfiles-javadoc +%license LICENSE.txt NOTICE.txt + + %changelog +* Tue Aug 18 2020 Fabio Valentini - 1:2.7-1 +- Update to version 2.7. + * Mon Jul 27 2020 Fedora Release Engineering - 1:2.6-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild @@ -176,3 +217,4 @@ sed -i 's/\r//' *.txt * Tue May 11 2010 Stanislav Ochotnicky - 1:1.4-1 - Rename and rebase of jakarta-commons-io - Clean up whole spec + diff --git a/sources b/sources index 3dc47d1..3a7630f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-io-2.6-src.tar.gz) = fa22397631283726b85276d8fb367e10755351ef2c4c87c5519485ba68ab26ffa2bfe36ee686f53f82e3aeb9e423618d89ad97b02fb272a549e0d4769928e764 +SHA512 (commons-io-2.7-src.tar.gz) = 9898b59c2aebdc1c51a7f8aca14e3080a08b766404c2aff091b204ba55870129dd95643665a6d46e15e94cd9d4cb280488ab0a28a1c51f43d132f839b742edc3 From 3e3f235f4bdba7966942e08bdc11cccf741ccba3 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 29 Sep 2020 12:12:10 +0200 Subject: [PATCH 19/71] Update to upstream version 2.8.0 --- .gitignore | 1 + apache-commons-io.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cba945a..56b8577 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ commons-io-2.1-src.tar.gz /commons-io-2.5-src.tar.gz /commons-io-2.6-src.tar.gz /commons-io-2.7-src.tar.gz +/commons-io-2.8.0-src.tar.gz diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 3ab9e69..b3721cb 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,6 +1,6 @@ Name: apache-commons-io Epoch: 1 -Version: 2.7 +Version: 2.8.0 Release: 1%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 @@ -57,6 +57,9 @@ sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamRea %doc RELEASE-NOTES.txt %changelog +* Fri Sep 18 2020 Marian Koncek - 1:2.8.0-1 +- Update to upstream version 2.8.0 + * Wed Jul 29 2020 Marian Koncek - 1:2.7-1 - Update to upstream version 2.7 diff --git a/sources b/sources index 3a7630f..b605fe0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-io-2.7-src.tar.gz) = 9898b59c2aebdc1c51a7f8aca14e3080a08b766404c2aff091b204ba55870129dd95643665a6d46e15e94cd9d4cb280488ab0a28a1c51f43d132f839b742edc3 +SHA512 (commons-io-2.8.0-src.tar.gz) = 6189c72eff8661bfb8cfed95dd7ee32578b24b50f6586d4628a4dbfd3618853a72eb73da311729e55742ace47b2d38d3ce130ab87b684494d8ce33d1ccf14a2d From 0865b01d98d236a0d771f06abb76dc155609af6f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 5 Oct 2020 12:10:42 +0200 Subject: [PATCH 20/71] Disable tests for now --- apache-commons-io.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index b3721cb..a314798 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -47,7 +47,15 @@ sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamRea %build # See "-DcommonsIoVersion" in maven-surefire for the tested version -%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.io + +# The following tests fail on tmpfs/nfs: +# * PathUtilsDeleteDirectoryTest.testDeleteDirectory1FileSize0OverrideReadOnly:80->testDeleteDirectory1FileSize0:68 » FileSystem +# * PathUtilsDeleteFileTest.testDeleteReadOnlyFileDirectory1FileSize1:114 » FileSystem +# * PathUtilsDeleteFileTest.testSetReadOnlyFileDirectory1FileSize1:134 » FileSystem +# * PathUtilsDeleteTest.testDeleteDirectory1FileSize0OverrideReadonly:97->testDeleteDirectory1FileSize0:69 » FileSystem +# * PathUtilsDeleteTest.testDeleteDirectory1FileSize1OverrideReadOnly:145->testDeleteDirectory1FileSize1:117 » FileSystem + +%mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.io %install %mvn_install From 39c5d644ec6b2d5476601a7be44ac2b53d4fa072 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 16 Oct 2020 13:31:00 +0200 Subject: [PATCH 21/71] update to version 2.8.0 --- .gitignore | 1 + apache-commons-io.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 97f3ee3..9f47b50 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /commons-io-2.5-src.tar.gz /commons-io-2.6-src.tar.gz /commons-io-2.7-src.tar.gz +/commons-io-2.8.0-src.tar.gz diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 5903eef..fd3eccb 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,11 +1,11 @@ -# unit tests do not finish +# unit tests do not finish or crash the JVM %bcond_with tests %global srcname commons-io Name: apache-commons-io Epoch: 1 -Version: 2.7 +Version: 2.8.0 Release: 1%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 @@ -79,6 +79,9 @@ rm src/test/java/org/apache/commons/io/output/XmlStreamWriterTest.java %changelog +* Fri Oct 16 2020 Fabio Valentini - 1:2.8.0-1 +- Update to version 2.8.0. + * Tue Aug 18 2020 Fabio Valentini - 1:2.7-1 - Update to version 2.7. diff --git a/sources b/sources index 3a7630f..b605fe0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-io-2.7-src.tar.gz) = 9898b59c2aebdc1c51a7f8aca14e3080a08b766404c2aff091b204ba55870129dd95643665a6d46e15e94cd9d4cb280488ab0a28a1c51f43d132f839b742edc3 +SHA512 (commons-io-2.8.0-src.tar.gz) = 6189c72eff8661bfb8cfed95dd7ee32578b24b50f6586d4628a4dbfd3618853a72eb73da311729e55742ace47b2d38d3ce130ab87b684494d8ce33d1ccf14a2d From f529386b2dbec88a7b3d5b502ec8b90d5181d5a5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:14:20 +0000 Subject: [PATCH 22/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-io.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index fd3eccb..81e4f24 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -6,7 +6,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 @@ -79,6 +79,9 @@ rm src/test/java/org/apache/commons/io/output/XmlStreamWriterTest.java %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1:2.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Oct 16 2020 Fabio Valentini - 1:2.8.0-1 - Update to version 2.8.0. From ecb0785573de676a72bd3cfe70466e05135f46d8 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 3 Feb 2021 19:58:33 +0000 Subject: [PATCH 23/71] Add patch to fix Files.size() failing when symlink target is non-existant --- ...ailing-when-symlink-target-is-non-ex.patch | 25 +++++++++++++++++++ apache-commons-io.spec | 8 +++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-Files.size-failing-when-symlink-target-is-non-ex.patch diff --git a/0001-Fix-Files.size-failing-when-symlink-target-is-non-ex.patch b/0001-Fix-Files.size-failing-when-symlink-target-is-non-ex.patch new file mode 100644 index 0000000..336e7b5 --- /dev/null +++ b/0001-Fix-Files.size-failing-when-symlink-target-is-non-ex.patch @@ -0,0 +1,25 @@ +From 610065347bbbc8fea366de32e558de4977807e52 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Wed, 3 Feb 2021 19:45:13 +0000 +Subject: [PATCH] Fix Files.size failing when symlink target is non-existant + +--- + src/main/java/org/apache/commons/io/file/PathUtils.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main/java/org/apache/commons/io/file/PathUtils.java b/src/main/java/org/apache/commons/io/file/PathUtils.java +index d370ef0b..b38a46a0 100644 +--- a/src/main/java/org/apache/commons/io/file/PathUtils.java ++++ b/src/main/java/org/apache/commons/io/file/PathUtils.java +@@ -358,7 +358,7 @@ public static PathCounters deleteFile(final Path file, final DeleteOption... opt + } + final PathCounters pathCounts = Counters.longPathCounters(); + final boolean exists = Files.exists(file, LinkOption.NOFOLLOW_LINKS); +- final long size = exists ? Files.size(file) : 0; ++ final long size = exists && Files.exists(file) ? Files.size(file) : 0; + if (overrideReadOnly(options) && exists) { + setReadOnly(file, false, LinkOption.NOFOLLOW_LINKS); + } +-- +2.28.0 + diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 81e4f24..390bebc 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -6,13 +6,15 @@ Name: apache-commons-io Epoch: 1 Version: 2.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 URL: https://commons.apache.org/io Source0: https://archive.apache.org/dist/commons/io/source/%{srcname}-%{version}-src.tar.gz +Patch0: 0001-Fix-Files.size-failing-when-symlink-target-is-non-ex.patch + BuildArch: noarch BuildRequires: maven-local @@ -41,6 +43,7 @@ API documentation for %{name}. %prep %setup -q -n %{srcname}-%{version}-src +%patch0 -p1 sed -i 's/\r//' *.txt %if %{with tests} @@ -79,6 +82,9 @@ rm src/test/java/org/apache/commons/io/output/XmlStreamWriterTest.java %changelog +* Wed Feb 3 2021 Mat Booth - 1:2.8.0-3 +- Add patch to fix Files.size() failing when symlink target is non-existant + * Tue Jan 26 2021 Fedora Release Engineering - 1:2.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 09df2ef06f9405fd0bfcbf21ccc3df545a31bf04 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 24/71] Conditionalize buildrequires in bootstrap mode --- apache-commons-io.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index a314798..f3e69d2 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: apache-commons-io Epoch: 1 Version: 2.8.0 @@ -10,11 +12,15 @@ BuildArch: noarch Source0: https://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz BuildRequires: maven-local-openjdk8 +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.junit.jupiter:junit-jupiter) BuildRequires: mvn(org.mockito:mockito-core) +%endif %description Commons-IO contains utility classes, stream implementations, From 71b71d71809b9775cc258cc655441cf9759c1a32 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 25/71] Turn off bootstrap mode by default --- apache-commons-io.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 2ef0936..df6b7cc 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: apache-commons-io Epoch: 1 From 1cf0ca34c0c8d44c4acce9655a25a05027972d61 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 15:49:27 +0200 Subject: [PATCH 26/71] Bootstrap build --- apache-commons-io.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index df6b7cc..e95c85d 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,9 +1,9 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: apache-commons-io Epoch: 1 Version: 2.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 URL: https://commons.apache.org/io @@ -73,6 +73,9 @@ sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamRea %doc RELEASE-NOTES.txt %changelog +* Mon May 17 2021 Mikolaj Izdebski - 1:2.8.0-4 +- Bootstrap build + * Wed Feb 3 2021 Mat Booth - 1:2.8.0-3 - Add patch to fix Files.size() failing when symlink target is non-existant From 47b800071191ed7c586fed013c1ec962edf26cb0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 18:01:41 +0200 Subject: [PATCH 27/71] Non-bootstrap build --- apache-commons-io.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index e95c85d..2aa18e4 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: apache-commons-io Epoch: 1 @@ -75,6 +75,7 @@ sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamRea %changelog * Mon May 17 2021 Mikolaj Izdebski - 1:2.8.0-4 - Bootstrap build +- Non-bootstrap build * Wed Feb 3 2021 Mat Booth - 1:2.8.0-3 - Add patch to fix Files.size() failing when symlink target is non-existant From 0762d3e84fe3eb54d6f5a57334e053616cd44075 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:46:59 +0000 Subject: [PATCH 28/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From d437db04dcba15508c71f3dbebb3160105a7441e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:42:58 +0000 Subject: [PATCH 29/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-io.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 2aa18e4..c458676 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -3,7 +3,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.8.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 URL: https://commons.apache.org/io @@ -73,6 +73,9 @@ sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamRea %doc RELEASE-NOTES.txt %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1:2.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon May 17 2021 Mikolaj Izdebski - 1:2.8.0-4 - Bootstrap build - Non-bootstrap build From 2e0be5476664cea297a83c17925bb5346095cf5e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:24:58 +0000 Subject: [PATCH 30/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-io.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index c458676..01c121d 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -3,7 +3,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.8.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 URL: https://commons.apache.org/io @@ -73,6 +73,9 @@ sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamRea %doc RELEASE-NOTES.txt %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1:2.8.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 1:2.8.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 6e73feb2f17403280d0a6131f77e10862381a4a7 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 19:26:25 +0100 Subject: [PATCH 31/71] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- apache-commons-io.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 01c121d..a34c995 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -3,7 +3,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.8.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 URL: https://commons.apache.org/io @@ -73,6 +73,9 @@ sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamRea %doc RELEASE-NOTES.txt %changelog +* Sat Feb 05 2022 Jiri Vanek - 1:2.8.0-7 +- Rebuilt for java-17-openjdk as system jdk + * Wed Jan 19 2022 Fedora Release Engineering - 1:2.8.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 66a89c1d1a8a5f77ac2ca35b889da81767390178 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 24 Apr 2022 13:55:58 +0200 Subject: [PATCH 32/71] Update to upstream version 2.11.0 --- .gitignore | 1 + ...ailing-when-symlink-target-is-non-ex.patch | 25 ------------------- apache-commons-io.spec | 11 ++++---- sources | 2 +- 4 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 0001-Fix-Files.size-failing-when-symlink-target-is-non-ex.patch diff --git a/.gitignore b/.gitignore index 9f47b50..214c92f 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /commons-io-2.6-src.tar.gz /commons-io-2.7-src.tar.gz /commons-io-2.8.0-src.tar.gz +/commons-io-2.11.0-src.tar.gz diff --git a/0001-Fix-Files.size-failing-when-symlink-target-is-non-ex.patch b/0001-Fix-Files.size-failing-when-symlink-target-is-non-ex.patch deleted file mode 100644 index 336e7b5..0000000 --- a/0001-Fix-Files.size-failing-when-symlink-target-is-non-ex.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 610065347bbbc8fea366de32e558de4977807e52 Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Wed, 3 Feb 2021 19:45:13 +0000 -Subject: [PATCH] Fix Files.size failing when symlink target is non-existant - ---- - src/main/java/org/apache/commons/io/file/PathUtils.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/main/java/org/apache/commons/io/file/PathUtils.java b/src/main/java/org/apache/commons/io/file/PathUtils.java -index d370ef0b..b38a46a0 100644 ---- a/src/main/java/org/apache/commons/io/file/PathUtils.java -+++ b/src/main/java/org/apache/commons/io/file/PathUtils.java -@@ -358,7 +358,7 @@ public static PathCounters deleteFile(final Path file, final DeleteOption... opt - } - final PathCounters pathCounts = Counters.longPathCounters(); - final boolean exists = Files.exists(file, LinkOption.NOFOLLOW_LINKS); -- final long size = exists ? Files.size(file) : 0; -+ final long size = exists && Files.exists(file) ? Files.size(file) : 0; - if (overrideReadOnly(options) && exists) { - setReadOnly(file, false, LinkOption.NOFOLLOW_LINKS); - } --- -2.28.0 - diff --git a/apache-commons-io.spec b/apache-commons-io.spec index a34c995..9e99519 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -2,8 +2,8 @@ Name: apache-commons-io Epoch: 1 -Version: 2.8.0 -Release: 7%{?dist} +Version: 2.11.0 +Release: 1%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 URL: https://commons.apache.org/io @@ -11,8 +11,6 @@ BuildArch: noarch Source0: https://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz -Patch0: 0001-Fix-Files.size-failing-when-symlink-target-is-non-ex.patch - BuildRequires: maven-local-openjdk8 %if %{with bootstrap} BuildRequires: javapackages-bootstrap @@ -33,7 +31,6 @@ to assist with developing IO functionality. %prep %setup -q -n commons-io-%{version}-src -%patch0 -p1 sed -i 's/\r//' *.txt # Run tests in multiple reusable forks to improve test performance @@ -44,6 +41,7 @@ sed -i '//d' pom.xml %mvn_alias : org.apache.commons: %pom_remove_dep org.junit-pioneer:junit-pioneer +%pom_remove_dep :junit-bom %pom_remove_dep com.google.jimfs:jimfs # Test depends on com.google.jimfs:jimfs @@ -73,6 +71,9 @@ sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamRea %doc RELEASE-NOTES.txt %changelog +* Sun Apr 24 2022 Mikolaj Izdebski - 1:2.11.0-1 +- Update to upstream version 2.11.0 + * Sat Feb 05 2022 Jiri Vanek - 1:2.8.0-7 - Rebuilt for java-17-openjdk as system jdk diff --git a/sources b/sources index b605fe0..b54c9cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-io-2.8.0-src.tar.gz) = 6189c72eff8661bfb8cfed95dd7ee32578b24b50f6586d4628a4dbfd3618853a72eb73da311729e55742ace47b2d38d3ce130ab87b684494d8ce33d1ccf14a2d +SHA512 (commons-io-2.11.0-src.tar.gz) = e2ab8ebc9c328093a460f8f5f96c80bb45f5073ec7aaa0beabdcdeac2e97324292eab2e2cb8b64d8e78b2c5d89048ba84e50daa0965dffcbe2fd0da7ab789ee3 From 188885476003a93084385310e408cc1e31bc8116 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:23 +0200 Subject: [PATCH 33/71] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- apache-commons-io.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 9e99519..1075331 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -8,6 +8,7 @@ Summary: Utilities to assist with developing IO functionality License: ASL 2.0 URL: https://commons.apache.org/io BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Source0: https://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz From 20f0241b2f2eb13c641c66623c9370ca2e21278e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:03:17 +0200 Subject: [PATCH 34/71] Update build-requires in bootstrap mode --- apache-commons-io.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 1075331..a9cfac3 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -12,10 +12,10 @@ ExclusiveArch: %{java_arches} noarch Source0: https://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz -BuildRequires: maven-local-openjdk8 %if %{with bootstrap} -BuildRequires: javapackages-bootstrap +BuildRequires: javapackages-bootstrap-openjdk8 %else +BuildRequires: maven-local-openjdk8 BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) From b514d819a4608e3c07289c4cf49629d70fc137b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:59:43 +0000 Subject: [PATCH 35/71] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-io.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index a9cfac3..5cbcaba 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -3,7 +3,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.11.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 URL: https://commons.apache.org/io @@ -72,6 +72,9 @@ sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamRea %doc RELEASE-NOTES.txt %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1:2.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sun Apr 24 2022 Mikolaj Izdebski - 1:2.11.0-1 - Update to upstream version 2.11.0 From 0ec9e976db311730267b861c50f9afe5d6d0bb11 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:51 +0200 Subject: [PATCH 36/71] Onboard package into gating --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 7 +++++++ 4 files changed, 17 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..8f6c9cb --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f37 +execute: + how: tmt From 15151d22b0ccf2ffda8d543a5ab04b00e76b8e3b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:54:26 +0000 Subject: [PATCH 37/71] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-io.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 5cbcaba..52c68b4 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -3,7 +3,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.11.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 URL: https://commons.apache.org/io @@ -72,6 +72,9 @@ sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamRea %doc RELEASE-NOTES.txt %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1:2.11.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 1:2.11.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From a7a00442b688254956cde4e64f08d33e88bcabe3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:28:53 +0000 Subject: [PATCH 38/71] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-io.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 52c68b4..e2b12eb 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -3,7 +3,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.11.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Utilities to assist with developing IO functionality License: ASL 2.0 URL: https://commons.apache.org/io @@ -72,6 +72,9 @@ sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamRea %doc RELEASE-NOTES.txt %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1:2.11.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 1:2.11.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From f7590a042c7b6aa924fa25afeedd7c331b5323c3 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 9 Aug 2023 11:45:01 +0200 Subject: [PATCH 39/71] Update license field to SPDX format --- apache-commons-io.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index e2b12eb..a16f4b6 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -5,7 +5,7 @@ Epoch: 1 Version: 2.11.0 Release: 4%{?dist} Summary: Utilities to assist with developing IO functionality -License: ASL 2.0 +License: Apache-2.0 URL: https://commons.apache.org/io BuildArch: noarch ExclusiveArch: %{java_arches} noarch From 036b7674cce1e15f64256fe75129f3272eda1650 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 9 Aug 2023 11:44:08 +0200 Subject: [PATCH 40/71] Update to upstream version 2.13.0 --- .gitignore | 1 + apache-commons-io.spec | 25 +++++++++++++------------ sources | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 214c92f..0c67ce6 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /commons-io-2.7-src.tar.gz /commons-io-2.8.0-src.tar.gz /commons-io-2.11.0-src.tar.gz +/commons-io-2.13.0-src.tar.gz diff --git a/apache-commons-io.spec b/apache-commons-io.spec index a16f4b6..4864965 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -2,8 +2,8 @@ Name: apache-commons-io Epoch: 1 -Version: 2.11.0 -Release: 4%{?dist} +Version: 2.13.0 +Release: 1%{?dist} Summary: Utilities to assist with developing IO functionality License: Apache-2.0 URL: https://commons.apache.org/io @@ -12,10 +12,11 @@ ExclusiveArch: %{java_arches} noarch Source0: https://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz +BuildRequires: javapackages-extra %if %{with bootstrap} -BuildRequires: javapackages-bootstrap-openjdk8 +BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local-openjdk8 +BuildRequires: maven-local BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) @@ -32,26 +33,22 @@ to assist with developing IO functionality. %prep %setup -q -n commons-io-%{version}-src + sed -i 's/\r//' *.txt # Run tests in multiple reusable forks to improve test performance sed -i -e /reuseForks/d -e /forkCount/d pom.xml sed -i '//d' pom.xml -%mvn_file : commons-io %{name} +%mvn_file : commons-io %{name} %mvn_alias : org.apache.commons: %pom_remove_dep org.junit-pioneer:junit-pioneer -%pom_remove_dep :junit-bom +%java_remove_annotations src -s -n DefaultLocale + %pom_remove_dep com.google.jimfs:jimfs - -# Test depends on com.google.jimfs:jimfs rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java -# This annotation is part of junitpioneer -sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/output/XmlStreamWriterTest.java -sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java - %build # See "-DcommonsIoVersion" in maven-surefire for the tested version @@ -62,6 +59,7 @@ sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamRea # * PathUtilsDeleteTest.testDeleteDirectory1FileSize0OverrideReadonly:97->testDeleteDirectory1FileSize0:69 » FileSystem # * PathUtilsDeleteTest.testDeleteDirectory1FileSize1OverrideReadOnly:145->testDeleteDirectory1FileSize1:117 » FileSystem +# moditect profile generates module-info.class %mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.io %install @@ -72,6 +70,9 @@ sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamRea %doc RELEASE-NOTES.txt %changelog +* Wed Aug 09 2023 Marian Koncek - 1:2.13.0-1 +- Update to upstream version 2.13.0 + * Wed Jul 19 2023 Fedora Release Engineering - 1:2.11.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index b54c9cc..caf3ea3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-io-2.11.0-src.tar.gz) = e2ab8ebc9c328093a460f8f5f96c80bb45f5073ec7aaa0beabdcdeac2e97324292eab2e2cb8b64d8e78b2c5d89048ba84e50daa0965dffcbe2fd0da7ab789ee3 +SHA512 (commons-io-2.13.0-src.tar.gz) = 187df4b73ac20caa28de99381b32f46673ee5a3b519e6804e6cd8ced49412ba89dd6f5cf43e4cfb54c221331cefa1ed20a180d8c9f0e4c361b4b9a2e98b26017 From 26846ece4ffb45582dea5d05a36b1b7de8adde05 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 17 Aug 2023 15:58:52 +0200 Subject: [PATCH 41/71] Bootstrap build --- apache-commons-io.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 4864965..5afc10e 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,4 +1,4 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: apache-commons-io Epoch: 1 From 17ad44fdd16f28a371c32f081395edbbba58c083 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 17 Aug 2023 16:22:35 +0200 Subject: [PATCH 42/71] Non-bootstrap build --- apache-commons-io.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 5afc10e..4864965 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: apache-commons-io Epoch: 1 From 63d25732ad2a3f5609084d7a60186fb446691561 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 30 Aug 2023 06:58:26 +0200 Subject: [PATCH 43/71] Build with Jurand instead of deprecated javapackages-extra --- apache-commons-io.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 4864965..3e4482e 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -3,7 +3,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.13.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utilities to assist with developing IO functionality License: Apache-2.0 URL: https://commons.apache.org/io @@ -12,7 +12,6 @@ ExclusiveArch: %{java_arches} noarch Source0: https://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz -BuildRequires: javapackages-extra %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else @@ -23,6 +22,7 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.junit.jupiter:junit-jupiter) BuildRequires: mvn(org.mockito:mockito-core) %endif +BuildRequires: jurand %description Commons-IO contains utility classes, stream implementations, @@ -70,6 +70,9 @@ rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFil %doc RELEASE-NOTES.txt %changelog +* Wed Aug 30 2023 Mikolaj Izdebski - 1:2.13.0-2 +- Build with Jurand instead of deprecated javapackages-extra + * Wed Aug 09 2023 Marian Koncek - 1:2.13.0-1 - Update to upstream version 2.13.0 From 033e2efd535be00d3ae280ac9f226e5fec3603f0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 15:58:22 +0200 Subject: [PATCH 44/71] Rebuild --- apache-commons-io.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 3e4482e..1fa12d8 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -3,7 +3,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.13.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Utilities to assist with developing IO functionality License: Apache-2.0 URL: https://commons.apache.org/io @@ -70,6 +70,9 @@ rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFil %doc RELEASE-NOTES.txt %changelog +* Fri Sep 01 2023 Mikolaj Izdebski - 1:2.13.0-3 +- Rebuild + * Wed Aug 30 2023 Mikolaj Izdebski - 1:2.13.0-2 - Build with Jurand instead of deprecated javapackages-extra From 0bf5ad5922c0253e7eb03d8400ad3f842136eca2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 20 Sep 2023 18:07:17 +0200 Subject: [PATCH 45/71] Rebuild to regenerate auto-Requires on java --- apache-commons-io.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 1fa12d8..8709b83 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -3,7 +3,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.13.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Utilities to assist with developing IO functionality License: Apache-2.0 URL: https://commons.apache.org/io @@ -70,6 +70,9 @@ rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFil %doc RELEASE-NOTES.txt %changelog +* Wed Sep 20 2023 Mikolaj Izdebski - 1:2.13.0-4 +- Rebuild to regenerate auto-Requires on java + * Fri Sep 01 2023 Mikolaj Izdebski - 1:2.13.0-3 - Rebuild From 0bd19ac8fe77d88ac458577b2fbd24ec918a0dca Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:07 +0200 Subject: [PATCH 46/71] Update javapackages test plan to f40 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 8f6c9cb..a2cdaba 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f37 + ref: f40 execute: how: tmt From 2219bcd621264aac6ca6d0e32046c1764c4f7a0f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:13:11 +0000 Subject: [PATCH 47/71] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- apache-commons-io.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 8709b83..401b50e 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -3,7 +3,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.13.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Utilities to assist with developing IO functionality License: Apache-2.0 URL: https://commons.apache.org/io @@ -70,6 +70,9 @@ rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFil %doc RELEASE-NOTES.txt %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1:2.13.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Sep 20 2023 Mikolaj Izdebski - 1:2.13.0-4 - Rebuild to regenerate auto-Requires on java From 1a4e35d2eddc35b5b0abdcd7506edd49b5a2b563 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:13:48 +0000 Subject: [PATCH 48/71] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- apache-commons-io.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 401b50e..eafa4d9 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -3,7 +3,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.13.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Utilities to assist with developing IO functionality License: Apache-2.0 URL: https://commons.apache.org/io @@ -70,6 +70,9 @@ rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFil %doc RELEASE-NOTES.txt %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1:2.13.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1:2.13.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5434c9baae8c68cf0238dda5db9e783781bf874f Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:14:24 +0100 Subject: [PATCH 49/71] bump of release for for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 We are sorry, we messed a bit, and we have to bump release in this package --- apache-commons-io.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index eafa4d9..4821661 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -3,7 +3,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.13.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Utilities to assist with developing IO functionality License: Apache-2.0 URL: https://commons.apache.org/io @@ -70,6 +70,9 @@ rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFil %doc RELEASE-NOTES.txt %changelog +* Fri Feb 23 2024 Jiri Vanek - 1:2.13.0-7 +- bump of release for for java-21-openjdk as system jdk + * Mon Jan 22 2024 Fedora Release Engineering - 1:2.13.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From aff5b52a3cb967e1e1e6b1e57711860e94151c30 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 14:43:59 +0100 Subject: [PATCH 50/71] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- apache-commons-io.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 4821661..a173e22 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -3,7 +3,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.13.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Utilities to assist with developing IO functionality License: Apache-2.0 URL: https://commons.apache.org/io @@ -70,6 +70,9 @@ rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFil %doc RELEASE-NOTES.txt %changelog +* Tue Feb 27 2024 Jiri Vanek - 1:2.13.0-8 +- Rebuilt for java-21-openjdk as system jdk + * Fri Feb 23 2024 Jiri Vanek - 1:2.13.0-7 - bump of release for for java-21-openjdk as system jdk From 04f478bb8723a6882a49d90a1fc958bf4169d292 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 18 Dec 2023 12:29:37 +0100 Subject: [PATCH 51/71] Update to upstream version 2.16.1 --- .gitignore | 2 ++ apache-commons-io.spec | 7 +++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0c67ce6..f25ff83 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ /commons-io-2.8.0-src.tar.gz /commons-io-2.11.0-src.tar.gz /commons-io-2.13.0-src.tar.gz +/commons-io-2.15.1-src.tar.gz +/commons-io-2.16.1-src.tar.gz diff --git a/apache-commons-io.spec b/apache-commons-io.spec index a173e22..24915b4 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -2,8 +2,8 @@ Name: apache-commons-io Epoch: 1 -Version: 2.13.0 -Release: 8%{?dist} +Version: 2.16.1 +Release: 1%{?dist} Summary: Utilities to assist with developing IO functionality License: Apache-2.0 URL: https://commons.apache.org/io @@ -70,6 +70,9 @@ rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFil %doc RELEASE-NOTES.txt %changelog +* Fri May 17 2024 Marian Koncek - 1:2.16.1-1 +- Update to upstream version 2.16.1 + * Tue Feb 27 2024 Jiri Vanek - 1:2.13.0-8 - Rebuilt for java-21-openjdk as system jdk diff --git a/sources b/sources index caf3ea3..3beb6f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-io-2.13.0-src.tar.gz) = 187df4b73ac20caa28de99381b32f46673ee5a3b519e6804e6cd8ced49412ba89dd6f5cf43e4cfb54c221331cefa1ed20a180d8c9f0e4c361b4b9a2e98b26017 +SHA512 (commons-io-2.16.1-src.tar.gz) = 07298e3af85726f2ec07a660fbb743f82cd88f8043a57e2e1063b758c81429dfafd77a024e2cdd48efe5d403299c20e898f5b3dd729f52bd55b8a6fb50c9a13a From 94c302b31d857ba114c4b3e034768822fba27b0b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:11:09 +0000 Subject: [PATCH 52/71] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- apache-commons-io.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 24915b4..00514a2 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -3,7 +3,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.16.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utilities to assist with developing IO functionality License: Apache-2.0 URL: https://commons.apache.org/io @@ -70,6 +70,9 @@ rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFil %doc RELEASE-NOTES.txt %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1:2.16.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri May 17 2024 Marian Koncek - 1:2.16.1-1 - Update to upstream version 2.16.1 From 8b8c2ac2193d8a5746994c8e8e8c0639f2850fa5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 53/71] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt From 5176a86914fc3428e3272ba4873b0ea608bf6864 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 54/71] Switch from %setup to %autosetup --- apache-commons-io.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 00514a2..16261da 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -32,7 +32,7 @@ to assist with developing IO functionality. %{?javadoc_package} %prep -%setup -q -n commons-io-%{version}-src +%autosetup -p1 -n commons-io-%{version}-src sed -i 's/\r//' *.txt From 0e54b74652707910032f21d7cbc6956915121770 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:00 +0200 Subject: [PATCH 55/71] Convert to %autorelease and %autochangelog --- apache-commons-io.spec | 220 +---------------------------------------- changelog | 217 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 219 insertions(+), 218 deletions(-) create mode 100644 changelog diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 16261da..0ab4c4f 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -3,7 +3,7 @@ Name: apache-commons-io Epoch: 1 Version: 2.16.1 -Release: 2%{?dist} +Release: %autorelease Summary: Utilities to assist with developing IO functionality License: Apache-2.0 URL: https://commons.apache.org/io @@ -70,220 +70,4 @@ rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFil %doc RELEASE-NOTES.txt %changelog -* Wed Jul 17 2024 Fedora Release Engineering - 1:2.16.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri May 17 2024 Marian Koncek - 1:2.16.1-1 -- Update to upstream version 2.16.1 - -* Tue Feb 27 2024 Jiri Vanek - 1:2.13.0-8 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 1:2.13.0-7 -- bump of release for for java-21-openjdk as system jdk - -* Mon Jan 22 2024 Fedora Release Engineering - 1:2.13.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1:2.13.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Sep 20 2023 Mikolaj Izdebski - 1:2.13.0-4 -- Rebuild to regenerate auto-Requires on java - -* Fri Sep 01 2023 Mikolaj Izdebski - 1:2.13.0-3 -- Rebuild - -* Wed Aug 30 2023 Mikolaj Izdebski - 1:2.13.0-2 -- Build with Jurand instead of deprecated javapackages-extra - -* Wed Aug 09 2023 Marian Koncek - 1:2.13.0-1 -- Update to upstream version 2.13.0 - -* Wed Jul 19 2023 Fedora Release Engineering - 1:2.11.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 1:2.11.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 1:2.11.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sun Apr 24 2022 Mikolaj Izdebski - 1:2.11.0-1 -- Update to upstream version 2.11.0 - -* Sat Feb 05 2022 Jiri Vanek - 1:2.8.0-7 -- Rebuilt for java-17-openjdk as system jdk - -* Wed Jan 19 2022 Fedora Release Engineering - 1:2.8.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 1:2.8.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 1:2.8.0-4 -- Bootstrap build -- Non-bootstrap build - -* Wed Feb 3 2021 Mat Booth - 1:2.8.0-3 -- Add patch to fix Files.size() failing when symlink target is non-existant - -* Tue Jan 26 2021 Fedora Release Engineering - 1:2.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Oct 16 2020 Fabio Valentini - 1:2.8.0-1 -- Update to version 2.8.0. - -* Fri Sep 18 2020 Marian Koncek - 1:2.8.0-1 -- Update to upstream version 2.8.0 - -* Tue Aug 18 2020 Fabio Valentini - 1:2.7-1 -- Update to version 2.7. - -* Wed Jul 29 2020 Marian Koncek - 1:2.7-1 -- Update to upstream version 2.7 - -* Mon Jul 27 2020 Fedora Release Engineering - 1:2.6-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 1:2.6-9 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Tue Jan 28 2020 Fedora Release Engineering - 1:2.6-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jan 25 2020 Mikolaj Izdebski - 1:2.6-6 -- Build with OpenJDK 8 - -* Tue Nov 05 2019 Mikolaj Izdebski - 1:2.6-5 -- Mass rebuild for javapackages-tools 201902 - -* Wed Jul 24 2019 Fedora Release Engineering - 1:2.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 1:2.6-4 -- Mass rebuild for javapackages-tools 201901 - -* Thu Feb 07 2019 Mat Booth - 1:2.6-6 -- Rebuild to regenerate OSGi metadata - -* Thu Jan 31 2019 Fedora Release Engineering - 1:2.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 1:2.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 1:2.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Jan 29 2018 Mikolaj Izdebski - 1:2.6-2 -- Cleanup spec file - -* Sun Oct 22 2017 Michael Simacek - 1:2.6-1 -- Update to upstream version 2.6 - -* Wed Jul 26 2017 Fedora Release Engineering - 1:2.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1:2.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Jun 23 2016 Michael Simacek - 1:2.5-1 -- Update to upstream version 2.5 - -* Wed Feb 03 2016 Fedora Release Engineering - 1:2.4-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1:2.4-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Oct 14 2014 Mikolaj Izdebski - 1:2.4-13 -- Remove legacy Obsoletes/Provides for jakarta-commons - -* Sat Jun 07 2014 Fedora Release Engineering - 1:2.4-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Mar 04 2014 Stanislav Ochotnicky - 1:2.4-11 -- Use Requires: java-headless rebuild (#1067528) - -* Sat Aug 03 2013 Fedora Release Engineering - 1:2.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Apr 22 2013 Michal Srb - 1:2.4-9 -- Rebuild - -* Mon Apr 15 2013 Mikolaj Izdebski - 1:2.4-8 -- Update to current packaging guidelines - -* Wed Feb 13 2013 Fedora Release Engineering - 1:2.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 1:2.4-6 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Wed Jan 9 2013 Mikolaj Izdebski - 1:2.4-5 -- Bump release tag - -* Tue Jan 8 2013 Mikolaj Izdebski - 1:2.4-4 -- Build with xmvn - -* Mon Nov 19 2012 Mikolaj Izdebski - 1:2.4-3 -- Add Provides/Obsoletes for jakarta-commons-io - -* Wed Jul 18 2012 Fedora Release Engineering - 1:2.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jun 19 2012 Mikolaj Izdebski - 1:2.4-1 -- Updae to 2.4 - -* Mon Apr 16 2012 Mikolaj Izdebski - 1:2.3-1 -- Update to 2.3 - -* Wed Apr 4 2012 Mikolaj Izdebski - 1:2.2-1 -- Update to 2.2 -- Remove rpm bug workaround -- Finalize renaming from jakarta-comons-io - -* Thu Jan 12 2012 Fedora Release Engineering - 1:2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Dec 7 2011 Alexander Kurtakov 1:2.1-1 -- Update to latest upstream (2.1). - -* Thu Jun 23 2011 Stanislav Ochotnicky - 1:2.0.1-3 -- Fix build with maven3 -- Use new add_maven_depmap macro - -* Mon Feb 07 2011 Fedora Release Engineering - 1:2.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 18 2011 Stanislav Ochotnicky - 1:2.0.1-1 -- Update to 2.0.1 -- Versionless jars & javadocs -- Use maven 3 to build -- Use apache-commons-parent for BR - -* Fri Oct 22 2010 Chris Spike 1:2.0-1 -- Updated to 2.0 -- Cleaned up BRs - -* Thu Jul 8 2010 Stanislav Ochotnicky - 1:1.4-6 -- Add license to javadoc subpackage - -* Fri May 21 2010 Stanislav Ochotnicky - 1:1.4-5 -- Correct depmap filename for backward compatibility - -* Mon May 17 2010 Stanislav Ochotnicky - 1:1.4-4 -- Fix maven depmap JPP name to short_name - -* Wed May 12 2010 Stanislav Ochotnicky - 1:1.4-3 -- Add obsoletes to javadoc sub-package - -* Wed May 12 2010 Stanislav Ochotnicky - 1:1.4-2 -- Add symlink to short_name.jar -- Fix mavendepmapfragdir wildcard - -* Tue May 11 2010 Stanislav Ochotnicky - 1:1.4-1 -- Rename and rebase of jakarta-commons-io -- Clean up whole spec +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..4ec0e9c --- /dev/null +++ b/changelog @@ -0,0 +1,217 @@ +* Wed Jul 17 2024 Fedora Release Engineering - 1:2.16.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri May 17 2024 Marian Koncek - 1:2.16.1-1 +- Update to upstream version 2.16.1 + +* Tue Feb 27 2024 Jiri Vanek - 1:2.13.0-8 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 1:2.13.0-7 +- bump of release for for java-21-openjdk as system jdk + +* Mon Jan 22 2024 Fedora Release Engineering - 1:2.13.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1:2.13.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Sep 20 2023 Mikolaj Izdebski - 1:2.13.0-4 +- Rebuild to regenerate auto-Requires on java + +* Fri Sep 01 2023 Mikolaj Izdebski - 1:2.13.0-3 +- Rebuild + +* Wed Aug 30 2023 Mikolaj Izdebski - 1:2.13.0-2 +- Build with Jurand instead of deprecated javapackages-extra + +* Wed Aug 09 2023 Marian Koncek - 1:2.13.0-1 +- Update to upstream version 2.13.0 + +* Wed Jul 19 2023 Fedora Release Engineering - 1:2.11.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 1:2.11.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 1:2.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun Apr 24 2022 Mikolaj Izdebski - 1:2.11.0-1 +- Update to upstream version 2.11.0 + +* Sat Feb 05 2022 Jiri Vanek - 1:2.8.0-7 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 1:2.8.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 1:2.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1:2.8.0-4 +- Bootstrap build +- Non-bootstrap build + +* Wed Feb 3 2021 Mat Booth - 1:2.8.0-3 +- Add patch to fix Files.size() failing when symlink target is non-existant + +* Tue Jan 26 2021 Fedora Release Engineering - 1:2.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Oct 16 2020 Fabio Valentini - 1:2.8.0-1 +- Update to version 2.8.0. + +* Fri Sep 18 2020 Marian Koncek - 1:2.8.0-1 +- Update to upstream version 2.8.0 + +* Tue Aug 18 2020 Fabio Valentini - 1:2.7-1 +- Update to version 2.7. + +* Wed Jul 29 2020 Marian Koncek - 1:2.7-1 +- Update to upstream version 2.7 + +* Mon Jul 27 2020 Fedora Release Engineering - 1:2.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1:2.6-9 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Tue Jan 28 2020 Fedora Release Engineering - 1:2.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jan 25 2020 Mikolaj Izdebski - 1:2.6-6 +- Build with OpenJDK 8 + +* Tue Nov 05 2019 Mikolaj Izdebski - 1:2.6-5 +- Mass rebuild for javapackages-tools 201902 + +* Wed Jul 24 2019 Fedora Release Engineering - 1:2.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 1:2.6-4 +- Mass rebuild for javapackages-tools 201901 + +* Thu Feb 07 2019 Mat Booth - 1:2.6-6 +- Rebuild to regenerate OSGi metadata + +* Thu Jan 31 2019 Fedora Release Engineering - 1:2.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 1:2.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1:2.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Jan 29 2018 Mikolaj Izdebski - 1:2.6-2 +- Cleanup spec file + +* Sun Oct 22 2017 Michael Simacek - 1:2.6-1 +- Update to upstream version 2.6 + +* Wed Jul 26 2017 Fedora Release Engineering - 1:2.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1:2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Jun 23 2016 Michael Simacek - 1:2.5-1 +- Update to upstream version 2.5 + +* Wed Feb 03 2016 Fedora Release Engineering - 1:2.4-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1:2.4-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Oct 14 2014 Mikolaj Izdebski - 1:2.4-13 +- Remove legacy Obsoletes/Provides for jakarta-commons + +* Sat Jun 07 2014 Fedora Release Engineering - 1:2.4-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1:2.4-11 +- Use Requires: java-headless rebuild (#1067528) + +* Sat Aug 03 2013 Fedora Release Engineering - 1:2.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Apr 22 2013 Michal Srb - 1:2.4-9 +- Rebuild + +* Mon Apr 15 2013 Mikolaj Izdebski - 1:2.4-8 +- Update to current packaging guidelines + +* Wed Feb 13 2013 Fedora Release Engineering - 1:2.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 1:2.4-6 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Wed Jan 9 2013 Mikolaj Izdebski - 1:2.4-5 +- Bump release tag + +* Tue Jan 8 2013 Mikolaj Izdebski - 1:2.4-4 +- Build with xmvn + +* Mon Nov 19 2012 Mikolaj Izdebski - 1:2.4-3 +- Add Provides/Obsoletes for jakarta-commons-io + +* Wed Jul 18 2012 Fedora Release Engineering - 1:2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jun 19 2012 Mikolaj Izdebski - 1:2.4-1 +- Updae to 2.4 + +* Mon Apr 16 2012 Mikolaj Izdebski - 1:2.3-1 +- Update to 2.3 + +* Wed Apr 4 2012 Mikolaj Izdebski - 1:2.2-1 +- Update to 2.2 +- Remove rpm bug workaround +- Finalize renaming from jakarta-comons-io + +* Thu Jan 12 2012 Fedora Release Engineering - 1:2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Dec 7 2011 Alexander Kurtakov 1:2.1-1 +- Update to latest upstream (2.1). + +* Thu Jun 23 2011 Stanislav Ochotnicky - 1:2.0.1-3 +- Fix build with maven3 +- Use new add_maven_depmap macro + +* Mon Feb 07 2011 Fedora Release Engineering - 1:2.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Jan 18 2011 Stanislav Ochotnicky - 1:2.0.1-1 +- Update to 2.0.1 +- Versionless jars & javadocs +- Use maven 3 to build +- Use apache-commons-parent for BR + +* Fri Oct 22 2010 Chris Spike 1:2.0-1 +- Updated to 2.0 +- Cleaned up BRs + +* Thu Jul 8 2010 Stanislav Ochotnicky - 1:1.4-6 +- Add license to javadoc subpackage + +* Fri May 21 2010 Stanislav Ochotnicky - 1:1.4-5 +- Correct depmap filename for backward compatibility + +* Mon May 17 2010 Stanislav Ochotnicky - 1:1.4-4 +- Fix maven depmap JPP name to short_name + +* Wed May 12 2010 Stanislav Ochotnicky - 1:1.4-3 +- Add obsoletes to javadoc sub-package + +* Wed May 12 2010 Stanislav Ochotnicky - 1:1.4-2 +- Add symlink to short_name.jar +- Fix mavendepmapfragdir wildcard + +* Tue May 11 2010 Stanislav Ochotnicky - 1:1.4-1 +- Rename and rebase of jakarta-commons-io +- Clean up whole spec From 8b30fdf8b8328cbb515c7ac58656c9cb7305dfb2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 56/71] Use %autosetup -C --- apache-commons-io.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 0ab4c4f..f1fb8ed 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -32,7 +32,7 @@ to assist with developing IO functionality. %{?javadoc_package} %prep -%autosetup -p1 -n commons-io-%{version}-src +%autosetup -p1 -C sed -i 's/\r//' *.txt From 597d264461ba08bf610f3e718f5e2e72af1168bd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 57/71] Update javapackages test plan to f42 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From a328e203e5acf1630d81e573de2003360c5822de Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 17:01:09 +0100 Subject: [PATCH 58/71] Sort dependencies [skip changelog] --- apache-commons-io.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index f1fb8ed..6af74b2 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -12,6 +12,7 @@ ExclusiveArch: %{java_arches} noarch Source0: https://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz +BuildRequires: jurand %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else @@ -22,7 +23,6 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.junit.jupiter:junit-jupiter) BuildRequires: mvn(org.mockito:mockito-core) %endif -BuildRequires: jurand %description Commons-IO contains utility classes, stream implementations, From 9fb0776c40610b93b5637808b4ff5908c9fbb1e5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 18:06:35 +0100 Subject: [PATCH 59/71] Explicitly declare javadoc subpackage [skip changelog] --- apache-commons-io.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 6af74b2..962932d 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -29,7 +29,11 @@ Commons-IO contains utility classes, stream implementations, file filters, and endian classes. It is a library of utilities to assist with developing IO functionality. -%{?javadoc_package} +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +API documentation for %{name}. %prep %autosetup -p1 -C @@ -69,5 +73,7 @@ rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFil %license LICENSE.txt NOTICE.txt %doc RELEASE-NOTES.txt +%files javadoc -f .mfiles-javadoc + %changelog %autochangelog From 6af47c0d0bbcef5359bc4a3bfb40e5e21f6f07c8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 Jan 2025 10:53:08 +0100 Subject: [PATCH 60/71] Update upstream URL --- apache-commons-io.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 962932d..1a0ffa8 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -6,7 +6,7 @@ Version: 2.16.1 Release: %autorelease Summary: Utilities to assist with developing IO functionality License: Apache-2.0 -URL: https://commons.apache.org/io +URL: https://commons.apache.org/proper/commons-io/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch From 84f009312163d5dc736274d9595dddf58f755fa3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:15:54 +0000 Subject: [PATCH 61/71] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e04c0d0c62d3171b9f6bc05cdb01f32a8ad202e0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 62/71] Remove javadoc subpackage --- apache-commons-io.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 1a0ffa8..a98a53e 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -23,18 +23,14 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.junit.jupiter:junit-jupiter) BuildRequires: mvn(org.mockito:mockito-core) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 2.16.1-13 %description Commons-IO contains utility classes, stream implementations, file filters, and endian classes. It is a library of utilities to assist with developing IO functionality. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -64,7 +60,7 @@ rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFil # * PathUtilsDeleteTest.testDeleteDirectory1FileSize1OverrideReadOnly:145->testDeleteDirectory1FileSize1:117 » FileSystem # moditect profile generates module-info.class -%mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.io +%mvn_build -j -f -- -Dcommons.osgi.symbolicName=org.apache.commons.io %install %mvn_install @@ -73,7 +69,5 @@ rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFil %license LICENSE.txt NOTICE.txt %doc RELEASE-NOTES.txt -%files javadoc -f .mfiles-javadoc - %changelog %autochangelog From 7dda3bb96ff6dd6c7f2a9c7f87ee4f80a53de37f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 5 Mar 2025 13:48:26 +0100 Subject: [PATCH 63/71] Fix javadoc obsoletes version --- apache-commons-io.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index a98a53e..e16a110 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -24,7 +24,7 @@ BuildRequires: mvn(org.junit.jupiter:junit-jupiter) BuildRequires: mvn(org.mockito:mockito-core) %endif # TODO Remove in Fedora 46 -Obsoletes: %{name}-javadoc < 2.16.1-13 +Obsoletes: %{name}-javadoc < 1:2.16.1-13 %description Commons-IO contains utility classes, stream implementations, From 35da5db875c3f60864961fd26fb9a4ebb80f6053 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:18 +0100 Subject: [PATCH 64/71] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From 48798d9d89d4aedc6af749cba27a2b21eab15556 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 65/71] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From 97cb913d7c0b978998385079d07305f384a67ea3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 66/71] Build with OpenJDK 25 --- apache-commons-io.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-io.spec b/apache-commons-io.spec index e16a110..3830ce9 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -16,7 +16,7 @@ BuildRequires: jurand %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) From 7dff49c9713d3faba6c22e590277894bd1133636 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 16 Jul 2025 20:48:52 +0200 Subject: [PATCH 67/71] Update to upstream version 2.19.0 --- .gitignore | 1 + apache-commons-io.spec | 5 +++-- sources | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f25ff83..4708db2 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /commons-io-2.13.0-src.tar.gz /commons-io-2.15.1-src.tar.gz /commons-io-2.16.1-src.tar.gz +/commons-io-2.19.0-src.tar.gz diff --git a/apache-commons-io.spec b/apache-commons-io.spec index 3830ce9..c6cceac 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -2,7 +2,7 @@ Name: apache-commons-io Epoch: 1 -Version: 2.16.1 +Version: 2.19.0 Release: %autorelease Summary: Utilities to assist with developing IO functionality License: Apache-2.0 @@ -47,7 +47,8 @@ sed -i '//d' pom.xml %java_remove_annotations src -s -n DefaultLocale %pom_remove_dep com.google.jimfs:jimfs -rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java +rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderParamFileTest.java +rm src/test/java/org/apache/commons/io/file/PathUtilsContentEqualsTest.java %build # See "-DcommonsIoVersion" in maven-surefire for the tested version diff --git a/sources b/sources index 3beb6f6..d370df1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-io-2.16.1-src.tar.gz) = 07298e3af85726f2ec07a660fbb743f82cd88f8043a57e2e1063b758c81429dfafd77a024e2cdd48efe5d403299c20e898f5b3dd729f52bd55b8a6fb50c9a13a +SHA512 (commons-io-2.19.0-src.tar.gz) = 217e711d2d0716b0b1fb858322a041b3d7ffb50e32adfad02681db966e453adb254b3d41123070d07a1883d050f250e253c084275af7782223ad7e48932be7e8 From 76996233b5c139d29395226587cc6e6a28729cbb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:05:53 +0000 Subject: [PATCH 68/71] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 7359d76c9c56c09cf645c467e4b0eaef5c470081 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 19:04:50 +0200 Subject: [PATCH 69/71] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. From 6a6256ac5d4b0922dfcd23feb9b2864ed7525890 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 10 Oct 2025 15:37:19 +0200 Subject: [PATCH 70/71] Update to upstream version 2.20.0 --- .gitignore | 1 + apache-commons-io.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4708db2..c262825 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /commons-io-2.15.1-src.tar.gz /commons-io-2.16.1-src.tar.gz /commons-io-2.19.0-src.tar.gz +/commons-io-2.20.0-src.tar.gz diff --git a/apache-commons-io.spec b/apache-commons-io.spec index c6cceac..f7890fd 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -2,7 +2,7 @@ Name: apache-commons-io Epoch: 1 -Version: 2.19.0 +Version: 2.20.0 Release: %autorelease Summary: Utilities to assist with developing IO functionality License: Apache-2.0 diff --git a/sources b/sources index d370df1..68e5151 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-io-2.19.0-src.tar.gz) = 217e711d2d0716b0b1fb858322a041b3d7ffb50e32adfad02681db966e453adb254b3d41123070d07a1883d050f250e253c084275af7782223ad7e48932be7e8 +SHA512 (commons-io-2.20.0-src.tar.gz) = 4c05970ad34e2aa32dc07de3b3335f46bb069dcb6f28fc6ed82867d890d4f31d6dfb5edb03ec3333f789f9ac0a57d84b5ffa782bd715ccffed41b1a9004217fb From 105ed21d16047f81f74cd7406b5d6535feb7a513 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:47:06 +0000 Subject: [PATCH 71/71] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild