Compare commits
No commits in common. "stream-javapackages-bootstrap-202501-rhel-9.7.0" and "c8-stream-201902" have entirely different histories.
stream-jav
...
c8-stream-
1
.apache-commons-collections.metadata
Normal file
1
.apache-commons-collections.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
52c16551286bd9749616b2c44a95193953858959 SOURCES/commons-collections-3.2.2-src.tar.gz
|
@ -1 +0,0 @@
|
|||||||
1
|
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
/commons-collections-3.2.2-src.tar.gz
|
SOURCES/commons-collections-3.2.2-src.tar.gz
|
||||||
|
@ -1,47 +0,0 @@
|
|||||||
From 086878cf280edc7c88d6fc990fefea2ffda4556f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Marian Koncek <mkoncek@redhat.com>
|
|
||||||
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
|
|
||||||
|
|
@ -1,28 +1,20 @@
|
|||||||
%bcond_with bootstrap
|
|
||||||
|
|
||||||
Name: apache-commons-collections
|
Name: apache-commons-collections
|
||||||
Version: 3.2.2
|
Version: 3.2.2
|
||||||
Release: 53%{?dist}
|
Release: 13%{?dist}
|
||||||
Summary: Provides new interfaces, implementations and utilities for Java Collections
|
Summary: Provides new interfaces, implementations and utilities for Java Collections
|
||||||
License: Apache-2.0
|
License: ASL 2.0
|
||||||
URL: http://commons.apache.org/collections/
|
URL: http://commons.apache.org/collections/
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
ExclusiveArch: %{java_arches} noarch
|
|
||||||
|
|
||||||
Source0: http://www.apache.org/dist/commons/collections/source/commons-collections-%{version}-src.tar.gz
|
Source0: http://www.apache.org/dist/commons/collections/source/commons-collections-%{version}-src.tar.gz
|
||||||
|
|
||||||
Patch: 0001-Port-to-Java-8.patch
|
Patch0: 0001-Port-to-Java-8.patch
|
||||||
Patch: 0002-Port-to-OpenJDK-11.patch
|
Patch1: 0002-Port-to-OpenJDK-11.patch
|
||||||
Patch: 0003-Port-to-OpenJDK-21.patch
|
|
||||||
|
|
||||||
%if %{with bootstrap}
|
|
||||||
BuildRequires: javapackages-bootstrap
|
|
||||||
%else
|
|
||||||
BuildRequires: maven-local
|
BuildRequires: maven-local
|
||||||
BuildRequires: mvn(junit:junit)
|
BuildRequires: mvn(junit:junit)
|
||||||
BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
|
BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
|
||||||
BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
|
BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
|
||||||
%endif
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The introduction of the Collections API by Sun in JDK 1.2 has been a
|
The introduction of the Collections API by Sun in JDK 1.2 has been a
|
||||||
@ -47,21 +39,20 @@ Requires: %{name} = %{version}-%{release}
|
|||||||
%{summary}.
|
%{summary}.
|
||||||
|
|
||||||
%package javadoc
|
%package javadoc
|
||||||
Summary: API documentation for %{name}
|
Summary: Javadoc for %{name}
|
||||||
|
|
||||||
%description javadoc
|
%description javadoc
|
||||||
API documentation for %{name}.
|
%{summary}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n commons-collections-%{version}-src
|
%setup -q -n commons-collections-%{version}-src
|
||||||
|
|
||||||
# remove all binary libs
|
# remove all binary libs
|
||||||
find . -name "*.jar" -exec rm -f {} \;
|
find . -name "*.jar" -exec rm -f {} \;
|
||||||
find . -name "*.class" -exec rm -f {} \;
|
find . -name "*.class" -exec rm -f {} \;
|
||||||
|
|
||||||
|
%patch0 -p1
|
||||||
# Port to maven-antrun-plugin 3.0.0
|
%patch1 -p1
|
||||||
sed -i s/tasks/target/ pom.xml
|
|
||||||
|
|
||||||
# Fix file eof
|
# Fix file eof
|
||||||
sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt
|
sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt
|
||||||
@ -70,7 +61,7 @@ sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt
|
|||||||
%mvn_file ':commons-collections{,-testframework}' %{name}@1 commons-collections@1
|
%mvn_file ':commons-collections{,-testframework}' %{name}@1 commons-collections@1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%mvn_build -- -Dcommons.packageId=collections
|
%mvn_build -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%mvn_artifact commons-collections:commons-collections-testframework:%{version} target/commons-collections-testframework-%{version}.jar
|
%mvn_artifact commons-collections:commons-collections-testframework:%{version} target/commons-collections-testframework-%{version}.jar
|
||||||
@ -86,103 +77,15 @@ sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt
|
|||||||
%license LICENSE.txt NOTICE.txt
|
%license LICENSE.txt NOTICE.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Nov 29 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.2-52
|
|
||||||
- Update javapackages test plan to f42
|
|
||||||
|
|
||||||
* Tue Sep 03 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.2-51
|
|
||||||
- Use %%autosetup -C
|
|
||||||
|
|
||||||
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-37
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 3.2.2-36
|
|
||||||
- Rebuilt for java-21-openjdk as system jdk
|
|
||||||
|
|
||||||
* Tue Feb 20 2024 Marian Koncek <mkoncek@redhat.com> - 3.2.2-35
|
|
||||||
- Port to OpenJDK 21
|
|
||||||
|
|
||||||
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-34
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-33
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Dec 04 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.2-32
|
|
||||||
- Port to apache-commons-parent 65
|
|
||||||
|
|
||||||
* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.2-31
|
|
||||||
- Convert License tag to SPDX format
|
|
||||||
|
|
||||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-30
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-29
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-28
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.2.2-27
|
|
||||||
- Rebuilt for java-17-openjdk as system jdk
|
|
||||||
|
|
||||||
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-26
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.2-25
|
|
||||||
- Bump Java compiler source/target levels to 1.7
|
|
||||||
|
|
||||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-24
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.2-23
|
|
||||||
- Bootstrap build
|
|
||||||
- Non-bootstrap build
|
|
||||||
|
|
||||||
* Fri Mar 05 2021 Mat Booth <mat.booth@redhat.com> - 3.2.2-22
|
|
||||||
- Backport fix to build with maven-antrun-plugin 3.0.0
|
|
||||||
|
|
||||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-21
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-20
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.2.2-19
|
|
||||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
|
||||||
|
|
||||||
* Fri Jun 26 2020 Alexander Kurtakov <akurtako@redhat.com> 3.2.2-18
|
|
||||||
- Rebuild to verify xmvn/maven switch to jakarta-annotations.
|
|
||||||
|
|
||||||
* Thu Jun 25 2020 Roland Grunberg <rgrunber@redhat.com> - 3.2.2-17
|
|
||||||
- Fix ambiguous reference in AbstractTestCollection to build on Java 11.
|
|
||||||
|
|
||||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-16
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Nov 15 2019 Fabio Valentini <decathorpe@gmail.com> - 3.2.2-15
|
|
||||||
- Adapt build and install scriptlets to fix issues in dependencies.
|
|
||||||
|
|
||||||
* Tue Nov 05 2019 Fabio Valentini <decathorpe@gmail.com> - 3.2.2-14
|
|
||||||
- Really actually skip tests to fix builds with xmvn 3.1.0.
|
|
||||||
|
|
||||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.2-13
|
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.2-13
|
||||||
- Mass rebuild for javapackages-tools 201902
|
- Mass rebuild for javapackages-tools 201902
|
||||||
|
|
||||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-13
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jun 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.2-12
|
* Fri Jun 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.2-12
|
||||||
- Enable tests
|
- Enable tests
|
||||||
|
|
||||||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.2-11
|
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.2-11
|
||||||
- Mass rebuild for javapackages-tools 201901
|
- Mass rebuild for javapackages-tools 201901
|
||||||
|
|
||||||
* Fri Feb 08 2019 Mat Booth <mat.booth@redhat.com> - 3.2.2-12
|
|
||||||
- Rebuild to regenerate OSGi metadata
|
|
||||||
|
|
||||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-11
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-10
|
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-10
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
@ -1,7 +0,0 @@
|
|||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- rhel-9
|
|
||||||
decision_contexts:
|
|
||||||
- osci_compose_gate
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}
|
|
@ -1,7 +0,0 @@
|
|||||||
summary: Run javapackages-specific tests
|
|
||||||
discover:
|
|
||||||
how: fmf
|
|
||||||
url: https://src.fedoraproject.org/tests/javapackages
|
|
||||||
ref: c9s
|
|
||||||
execute:
|
|
||||||
how: tmt
|
|
Loading…
Reference in New Issue
Block a user