diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index c262825..3843a9b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,9 @@ -/results_* -/*.src.rpm - -/commons-io-1.4-src.tar.gz +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 -/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 -/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 f7890fd..b1bc6f2 100644 --- a/apache-commons-io.spec +++ b/apache-commons-io.spec @@ -1,67 +1,37 @@ -%bcond_with bootstrap - Name: apache-commons-io Epoch: 1 -Version: 2.20.0 -Release: %autorelease +Version: 2.6 +Release: 3%{?dist} Summary: Utilities to assist with developing IO functionality -License: Apache-2.0 -URL: https://commons.apache.org/proper/commons-io/ +License: ASL 2.0 +URL: http://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 +Source0: http://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz -BuildRequires: jurand -%if %{with bootstrap} -BuildRequires: javapackages-bootstrap -%else -BuildRequires: maven-local-openjdk25 -BuildRequires: mvn(org.apache.commons:commons-lang3) +BuildRequires: maven-local +BuildRequires: mvn(junit:junit) 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 -# TODO Remove in Fedora 46 -Obsoletes: %{name}-javadoc < 1: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. -%prep -%autosetup -p1 -C +%{?javadoc_package} +%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} +%build +%mvn_file : commons-io %{name} %mvn_alias : org.apache.commons: -%pom_remove_dep org.junit-pioneer:junit-pioneer -%java_remove_annotations src -s -n DefaultLocale - -%pom_remove_dep com.google.jimfs:jimfs -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 - -# 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 - -# moditect profile generates module-info.class -%mvn_build -j -f -- -Dcommons.osgi.symbolicName=org.apache.commons.io +# 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 %install %mvn_install @@ -71,4 +41,117 @@ rm src/test/java/org/apache/commons/io/file/PathUtilsContentEqualsTest.java %doc RELEASE-NOTES.txt %changelog -%autochangelog +* 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 diff --git a/changelog b/changelog deleted file mode 100644 index 4ec0e9c..0000000 --- a/changelog +++ /dev/null @@ -1,217 +0,0 @@ -* 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 diff --git a/ci.fmf b/ci.fmf deleted file mode 100644 index c5aa0e0..0000000 --- a/ci.fmf +++ /dev/null @@ -1 +0,0 @@ -resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 0d484d7..0000000 --- a/gating.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- !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 deleted file mode 100644 index ae17c0c..0000000 --- a/plans/javapackages.fmf +++ /dev/null @@ -1,7 +0,0 @@ -summary: Run javapackages-specific tests -discover: - how: fmf - url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f43 -execute: - how: tmt diff --git a/sources b/sources index 68e5151..3dc47d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-io-2.20.0-src.tar.gz) = 4c05970ad34e2aa32dc07de3b3335f46bb069dcb6f28fc6ed82867d890d4f31d6dfb5edb03ec3333f789f9ac0a57d84b5ffa782bd715ccffed41b1a9004217fb +SHA512 (commons-io-2.6-src.tar.gz) = fa22397631283726b85276d8fb367e10755351ef2c4c87c5519485ba68ab26ffa2bfe36ee686f53f82e3aeb9e423618d89ad97b02fb272a549e0d4769928e764