diff --git a/SOURCES/0003-Port-to-OpenJDK-21.patch b/SOURCES/0003-Port-to-OpenJDK-21.patch new file mode 100644 index 0000000..5cda095 --- /dev/null +++ b/SOURCES/0003-Port-to-OpenJDK-21.patch @@ -0,0 +1,47 @@ +From 086878cf280edc7c88d6fc990fefea2ffda4556f Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Tue, 20 Feb 2024 18:23:57 +0100 +Subject: [PATCH] Port to OpenJDK 21 + +--- + .../collections/TestExtendedProperties.java | 26 ------------------- + 1 file changed, 26 deletions(-) + +diff --git a/src/test/org/apache/commons/collections/TestExtendedProperties.java b/src/test/org/apache/commons/collections/TestExtendedProperties.java +index f64812f..13f623a 100644 +--- a/src/test/org/apache/commons/collections/TestExtendedProperties.java ++++ b/src/test/org/apache/commons/collections/TestExtendedProperties.java +@@ -315,30 +315,4 @@ public class TestExtendedProperties extends TestCase { + assertEquals("class", extended.getString("resource.loader")); + } + +- public void testActiveSecurityManager() { +- SecurityManager manager = new SecurityManager() { +- +- public void checkPropertyAccess(String key) { +- if ("file.separator".equals(key)) { +- throw new SecurityException(); +- } +- } +- +- public void checkPermission(Permission perm) { +- } +- +- }; +- +- System.setSecurityManager(manager); +- +- try { +- ExtendedProperties properties = new ExtendedProperties(); +- assertNotNull(properties); +- } catch (Exception ex) { +- fail("failed to instantiate ExtendedProperties"); +- } finally { +- System.setSecurityManager(null); +- } +- } +- + } +-- +2.43.0 + diff --git a/SPECS/apache-commons-collections.spec b/SPECS/apache-commons-collections.spec index 2de2465..fe11e3f 100644 --- a/SPECS/apache-commons-collections.spec +++ b/SPECS/apache-commons-collections.spec @@ -1,20 +1,28 @@ +%bcond_with bootstrap + Name: apache-commons-collections Version: 3.2.2 -Release: 13%{?dist} +Release: 53%{?dist} Summary: Provides new interfaces, implementations and utilities for Java Collections -License: ASL 2.0 +License: Apache-2.0 URL: http://commons.apache.org/collections/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Source0: http://www.apache.org/dist/commons/collections/source/commons-collections-%{version}-src.tar.gz -Patch0: 0001-Port-to-Java-8.patch -Patch1: 0002-Port-to-OpenJDK-11.patch +Patch: 0001-Port-to-Java-8.patch +Patch: 0002-Port-to-OpenJDK-11.patch +Patch: 0003-Port-to-OpenJDK-21.patch +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +%endif %description The introduction of the Collections API by Sun in JDK 1.2 has been a @@ -39,20 +47,21 @@ Requires: %{name} = %{version}-%{release} %{summary}. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc -%{summary}. +API documentation for %{name}. %prep -%setup -q -n commons-collections-%{version}-src +%autosetup -p1 -n commons-collections-%{version}-src # remove all binary libs find . -name "*.jar" -exec rm -f {} \; find . -name "*.class" -exec rm -f {} \; -%patch0 -p1 -%patch1 -p1 + +# Port to maven-antrun-plugin 3.0.0 +sed -i s/tasks/target/ pom.xml # Fix file eof sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt @@ -61,7 +70,7 @@ sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt %mvn_file ':commons-collections{,-testframework}' %{name}@1 commons-collections@1 %build -%mvn_build -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 +%mvn_build -- -Dcommons.packageId=collections %install %mvn_artifact commons-collections:commons-collections-testframework:%{version} target/commons-collections-testframework-%{version}.jar @@ -77,15 +86,103 @@ sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt %license LICENSE.txt NOTICE.txt %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 3.2.2-52 +- Update javapackages test plan to f42 + +* Tue Sep 03 2024 Mikolaj Izdebski - 3.2.2-51 +- Use %%autosetup -C + +* Wed Jul 17 2024 Fedora Release Engineering - 3.2.2-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 3.2.2-36 +- Rebuilt for java-21-openjdk as system jdk + +* Tue Feb 20 2024 Marian Koncek - 3.2.2-35 +- Port to OpenJDK 21 + +* Mon Jan 22 2024 Fedora Release Engineering - 3.2.2-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 3.2.2-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 04 2023 Mikolaj Izdebski - 3.2.2-32 +- Port to apache-commons-parent 65 + +* Fri Sep 01 2023 Mikolaj Izdebski - 3.2.2-31 +- Convert License tag to SPDX format + +* Wed Jul 19 2023 Fedora Release Engineering - 3.2.2-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 3.2.2-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 3.2.2-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 3.2.2-27 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 3.2.2-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 3.2.2-25 +- Bump Java compiler source/target levels to 1.7 + +* Wed Jul 21 2021 Fedora Release Engineering - 3.2.2-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 3.2.2-23 +- Bootstrap build +- Non-bootstrap build + +* Fri Mar 05 2021 Mat Booth - 3.2.2-22 +- Backport fix to build with maven-antrun-plugin 3.0.0 + +* Tue Jan 26 2021 Fedora Release Engineering - 3.2.2-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 3.2.2-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 3.2.2-19 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Fri Jun 26 2020 Alexander Kurtakov 3.2.2-18 +- Rebuild to verify xmvn/maven switch to jakarta-annotations. + +* Thu Jun 25 2020 Roland Grunberg - 3.2.2-17 +- Fix ambiguous reference in AbstractTestCollection to build on Java 11. + +* Tue Jan 28 2020 Fedora Release Engineering - 3.2.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Nov 15 2019 Fabio Valentini - 3.2.2-15 +- Adapt build and install scriptlets to fix issues in dependencies. + +* Tue Nov 05 2019 Fabio Valentini - 3.2.2-14 +- Really actually skip tests to fix builds with xmvn 3.1.0. + * Tue Nov 05 2019 Mikolaj Izdebski - 3.2.2-13 - Mass rebuild for javapackages-tools 201902 +* Wed Jul 24 2019 Fedora Release Engineering - 3.2.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Jun 28 2019 Mikolaj Izdebski - 3.2.2-12 - Enable tests * Fri May 24 2019 Mikolaj Izdebski - 3.2.2-11 - Mass rebuild for javapackages-tools 201901 +* Fri Feb 08 2019 Mat Booth - 3.2.2-12 +- Rebuild to regenerate OSGi metadata + +* Thu Jan 31 2019 Fedora Release Engineering - 3.2.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 3.2.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild