From 8d0958413e0c77390d6a4aa30e360591959a271b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:17 +0200 Subject: [PATCH 01/14] 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 5af75e86a49077ca46cae4ca07551c6373a32cbb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 25 Jun 2019 08:53:26 +0200 Subject: [PATCH 02/14] 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 0d053aecb77741e11a79a4886b2aeecaf72699d1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 25 Jun 2019 09:15:21 +0200 Subject: [PATCH 03/14] 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 1be85f2d9e9956f8a9988ae11758d2f670832302 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 27 Jun 2019 14:36:26 +0200 Subject: [PATCH 04/14] Revert "Use standard artifact installation location" This reverts commit 0d053aecb77741e11a79a4886b2aeecaf72699d1. --- 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 7b1c57107883d290eaf31acec680c494ee6f14c5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 1 Jul 2019 13:15:12 +0200 Subject: [PATCH 05/14] 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 063122600af941c1a6264e5d3c5636ab3f87a59f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 06/14] 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 8f28b935c1f84c640b307b2a51d0943133af4d57 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 11 Dec 2019 17:34:22 +0100 Subject: [PATCH 07/14] 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 e04116c78e318181149cebcf6ad48a037baf72fe Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 25 Jan 2020 14:40:08 +0100 Subject: [PATCH 08/14] 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 488b5d702275711b0f077f70b723ecabc2fcbaf3 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 29 Jul 2020 16:28:04 +0200 Subject: [PATCH 09/14] 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 80b209c90ffecc933b98208d0529fa90322ba5ac Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 29 Jul 2020 16:56:10 +0200 Subject: [PATCH 10/14] 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 8b6f38feaf04977cf74a4ff1a60d04e6c03976e9 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 4 Aug 2020 15:35:07 +0200 Subject: [PATCH 11/14] 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 cf8fa1b71b1351667099ef3452bf7dcbac3b10fd Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 29 Sep 2020 12:12:10 +0200 Subject: [PATCH 12/14] 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 6d94c3f475e5785298c9d41702f6aac9c4357e97 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 5 Oct 2020 12:10:42 +0200 Subject: [PATCH 13/14] 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 4802dbf7a284cd996e51874eb31bcffdeea2b911 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 14/14] 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,