From 78bd25cfb8408b3cefc9bd5f09670a953c51c4fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:17:29 +0000 Subject: [PATCH 01/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 267f20c..4d7ccb9 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 1.9.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -54,6 +54,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1.9.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.9.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 53a59938c2ad79ca71ff99f3d9f21073ab9a9fa7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:43 +0000 Subject: [PATCH 02/56] Switch to SHA512 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 347e140..f0a133e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -624442c0c25f2ede8226e4459c3a1b7e commons-beanutils-1.9.3-src.tar.gz +SHA512 (commons-beanutils-1.9.3-src.tar.gz) = 01cccfe7fca5fdf0d6cea83e4d1701ba9cfa40c6b5e516adc9e49998a3535db813b02bec724efeedfc2f8a774fcbb4ed9500eea56ab73f9002e081e090318ea2 From 719d73629abba9f72d468122c12465fa769d759f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:25:07 +0000 Subject: [PATCH 03/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 4d7ccb9..059ffd5 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 1.9.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -54,6 +54,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.9.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 1.9.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 9a8580b01ad77934de0f7ccd366934bd1369e8ce Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:14 +0200 Subject: [PATCH 04/56] Mass rebuild for javapackages-tools 201901 --- apache-commons-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 267f20c..c71f4ba 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 1.9.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -54,6 +54,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.9.3-5 +- Mass rebuild for javapackages-tools 201901 + * Wed Feb 07 2018 Fedora Release Engineering - 1.9.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From c325f1d2a210165530af8a63e19b3a9e8c0ede6e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 18:00:53 +0000 Subject: [PATCH 05/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 059ffd5..4a1d8e1 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 1.9.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -54,6 +54,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.9.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1.9.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From ed3642f91355da0a9b73801348527d5c507ce146 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 15 Aug 2019 09:19:54 +0200 Subject: [PATCH 06/56] Update to upstream version 1.9.4 --- .gitignore | 1 + apache-commons-beanutils.spec | 20 ++++++++++---------- sources | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index ac1dec2..001f6e7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ commons-beanutils-1.8.3-src.tar.gz /commons-beanutils-1.9.1-src.tar.gz /commons-beanutils-1.9.2-src.tar.gz /commons-beanutils-1.9.3-src.tar.gz +/commons-beanutils-1.9.4-src.tar.gz diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index c71f4ba..c351000 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -1,14 +1,11 @@ -%global base_name beanutils -%global short_name commons-%{base_name} - -Name: apache-%{short_name} -Version: 1.9.3 -Release: 5%{?dist} +Name: apache-commons-beanutils +Version: 1.9.4 +Release: 1%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 -URL: http://commons.apache.org/%{base_name} +URL: http://commons.apache.org/beanutils BuildArch: noarch -Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz +Source0: http://archive.apache.org/dist/commons/beanutils/source/commons-beanutils-%{version}-src.tar.gz BuildRequires: maven-local BuildRequires: mvn(commons-collections:commons-collections) @@ -29,7 +26,7 @@ Summary: Javadoc for %{name} %{summary}. %prep -%setup -q -n %{short_name}-%{version}-src +%setup -q -n commons-beanutils-%{version}-src sed -i 's/\r//' *.txt %pom_remove_plugin :maven-assembly-plugin @@ -37,7 +34,7 @@ sed -i 's/\r//' *.txt %mvn_alias :{*} :@1-core :@1-bean-collections %mvn_alias :{*} org.apache.commons:@1 org.apache.commons:@1-core org.apache.commons:@1-bean-collections %mvn_file : %{name} %{name}-core %{name}-bean-collections -%mvn_file : %{short_name} %{short_name}-core %{short_name}-bean-collections +%mvn_file : commons-beanutils commons-beanutils-core commons-beanutils-bean-collections %build # Some tests fail in Koji @@ -54,6 +51,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Thu Aug 15 2019 Marian Koncek - 1.9.4-1 +- Update to upstream version 1.9.4 + * Fri May 24 2019 Mikolaj Izdebski - 1.9.3-5 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index f0a133e..bbd675e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-beanutils-1.9.3-src.tar.gz) = 01cccfe7fca5fdf0d6cea83e4d1701ba9cfa40c6b5e516adc9e49998a3535db813b02bec724efeedfc2f8a774fcbb4ed9500eea56ab73f9002e081e090318ea2 +SHA512 (commons-beanutils-1.9.4-src.tar.gz) = 6f3d30d02b9a66cf20509bd868c6e2dadb44bb27da1e6b9af7275675e0f3826845a5d4005509dd1eb77a5b2937820c4770a3753daaab072785dcdab0caa69e73 From 982e3969d44351d7824438d8c0f42237f46eab67 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 4 Oct 2019 12:31:27 +0200 Subject: [PATCH 07/56] update to version 1.9.4 --- .gitignore | 6 +++++- apache-commons-beanutils.spec | 13 +++++++++---- commons-beanutils.depmap | 14 -------------- sources | 2 +- 4 files changed, 15 insertions(+), 20 deletions(-) delete mode 100644 commons-beanutils.depmap diff --git a/.gitignore b/.gitignore index ac1dec2..805a6ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,9 @@ -commons-beanutils-1.8.3-src.tar.gz +/results_* +/*.src.rpm + +/commons-beanutils-1.8.3-src.tar.gz /commons-beanutils-1.9.0-src.tar.gz /commons-beanutils-1.9.1-src.tar.gz /commons-beanutils-1.9.2-src.tar.gz /commons-beanutils-1.9.3-src.tar.gz +/commons-beanutils-1.9.4-src.tar.gz diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 4a1d8e1..3ed07a6 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -2,8 +2,8 @@ %global short_name commons-%{base_name} Name: apache-%{short_name} -Version: 1.9.3 -Release: 7%{?dist} +Version: 1.9.4 +Release: 1%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -14,7 +14,9 @@ BuildRequires: maven-local BuildRequires: mvn(commons-collections:commons-collections) BuildRequires: mvn(commons-collections:commons-collections-testframework) BuildRequires: mvn(commons-logging:commons-logging) +BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) +BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) %description The scope of this package is to create a package of Java utility methods @@ -40,8 +42,7 @@ sed -i 's/\r//' *.txt %mvn_file : %{short_name} %{short_name}-core %{short_name}-bean-collections %build -# Some tests fail in Koji -%mvn_build -f +%mvn_build %install %mvn_install @@ -54,6 +55,10 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Fri Oct 04 2019 Fabio Valentini - 1.9.4-1 +- Update to version 1.9.4. +- Re-enable test suite. + * Wed Jul 24 2019 Fedora Release Engineering - 1.9.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/commons-beanutils.depmap b/commons-beanutils.depmap deleted file mode 100644 index f2e1e89..0000000 --- a/commons-beanutils.depmap +++ /dev/null @@ -1,14 +0,0 @@ - - - - commons-collections - commons-collections-testframework - 3.2.1 - - - JPP - commons-collections-testframework - 3.2.1 - - - diff --git a/sources b/sources index 347e140..bbd675e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -624442c0c25f2ede8226e4459c3a1b7e commons-beanutils-1.9.3-src.tar.gz +SHA512 (commons-beanutils-1.9.4-src.tar.gz) = 6f3d30d02b9a66cf20509bd868c6e2dadb44bb27da1e6b9af7275675e0f3826845a5d4005509dd1eb77a5b2937820c4770a3753daaab072785dcdab0caa69e73 From 26f0e537150107630af50376790a0d374c2f728d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 08/56] Mass rebuild for javapackages-tools 201902 --- apache-commons-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index c351000..886ad71 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -1,6 +1,6 @@ Name: apache-commons-beanutils Version: 1.9.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 URL: http://commons.apache.org/beanutils @@ -51,6 +51,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.9.4-2 +- Mass rebuild for javapackages-tools 201902 + * Thu Aug 15 2019 Marian Koncek - 1.9.4-1 - Update to upstream version 1.9.4 From d72e7be2c12f89c8a6393ca268cebf457614c5e1 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 11 Dec 2019 16:36:46 +0100 Subject: [PATCH 09/56] Fix OSGi bundle symbolic name --- apache-commons-beanutils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 886ad71..fc94034 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -38,7 +38,7 @@ sed -i 's/\r//' *.txt %build # Some tests fail in Koji -%mvn_build -f +%mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.beanutils %install %mvn_install From bcb3b11ee17e48ec61c09553e6ab093733bb7d40 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:41:59 +0000 Subject: [PATCH 10/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 3ed07a6..c76464f 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 1.9.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -55,6 +55,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.9.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Oct 04 2019 Fabio Valentini - 1.9.4-1 - Update to version 1.9.4. - Re-enable test suite. From c935029edc5b7c03b3672047b56c129c405e8009 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 8 Jul 2020 08:33:08 +0200 Subject: [PATCH 11/56] Remove unneeded BR on commons-collections-testframework --- apache-commons-beanutils.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index fc94034..1d90c0c 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -9,7 +9,6 @@ Source0: http://archive.apache.org/dist/commons/beanutils/source/commons- BuildRequires: maven-local BuildRequires: mvn(commons-collections:commons-collections) -BuildRequires: mvn(commons-collections:commons-collections-testframework) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) From b500d8429adaa42fde864833413726eafac77e3c Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 14:39:50 +0200 Subject: [PATCH 12/56] Rebuilt for JDK-11 --- apache-commons-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index c76464f..995c846 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 1.9.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -55,6 +55,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Fri Jul 10 2020 Jiri Vanek - 1.9.4-3 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Tue Jan 28 2020 Fedora Release Engineering - 1.9.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From df6b44a81997454527d533328166ab4bfbb6c076 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:08:51 +0000 Subject: [PATCH 13/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 995c846..f5d48e9 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 1.9.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -55,6 +55,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.9.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 10 2020 Jiri Vanek - 1.9.4-3 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From df57dc91c99ba230b1915cdad2b997fe0537cffd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:12:55 +0000 Subject: [PATCH 14/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index f5d48e9..4ffdeb7 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 1.9.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -55,6 +55,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.9.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.9.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From c78e7cb3fdc04ce2bcb8b58b90c932a65ef154a4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 15/56] Conditionalize buildrequires in bootstrap mode --- apache-commons-beanutils.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 1d90c0c..187a185 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: apache-commons-beanutils Version: 1.9.4 Release: 2%{?dist} @@ -8,9 +10,13 @@ BuildArch: noarch Source0: http://archive.apache.org/dist/commons/beanutils/source/commons-beanutils-%{version}-src.tar.gz BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(commons-collections:commons-collections) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) +%endif %description The scope of this package is to create a package of Java utility methods From 31ea8a4dcdf8f8fcc681e2079c15d14a024add5e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 16/56] Turn off bootstrap mode by default --- apache-commons-beanutils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 38e3e53..38aad98 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: apache-commons-beanutils Version: 1.9.4 From d81d42b5ef724b00302e2d8eba242652f291cc3c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 15:49:23 +0200 Subject: [PATCH 17/56] Bootstrap build --- apache-commons-beanutils.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 38aad98..0d7fbc1 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -1,8 +1,8 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: apache-commons-beanutils Version: 1.9.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 URL: http://commons.apache.org/beanutils @@ -56,6 +56,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Mon May 17 2021 Mikolaj Izdebski - 1.9.4-6 +- Bootstrap build + * Tue Jan 26 2021 Fedora Release Engineering - 1.9.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 22cb45e8daa7ab3ba76f09aa0a5783c488e0586a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 18:01:40 +0200 Subject: [PATCH 18/56] Non-bootstrap build --- apache-commons-beanutils.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 0d7fbc1..edd99e8 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: apache-commons-beanutils Version: 1.9.4 @@ -58,6 +58,7 @@ sed -i 's/\r//' *.txt %changelog * Mon May 17 2021 Mikolaj Izdebski - 1.9.4-6 - Bootstrap build +- Non-bootstrap build * Tue Jan 26 2021 Fedora Release Engineering - 1.9.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From e4f866f441fd18f8170f5b76e46486df044886e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:45:44 +0000 Subject: [PATCH 19/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From bc7713279570a5486aea15815ba72a50a1767343 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:41:40 +0000 Subject: [PATCH 20/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index edd99e8..e6a155c 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -2,7 +2,7 @@ Name: apache-commons-beanutils Version: 1.9.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 URL: http://commons.apache.org/beanutils @@ -56,6 +56,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.9.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon May 17 2021 Mikolaj Izdebski - 1.9.4-6 - Bootstrap build - Non-bootstrap build From 87528e21d18eda32a6acc916a4f8665b1ad25091 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Nov 2021 15:53:36 +0100 Subject: [PATCH 21/56] Bump Java compiler source/target levels to 1.7 --- apache-commons-beanutils.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index e6a155c..d710738 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -2,7 +2,7 @@ Name: apache-commons-beanutils Version: 1.9.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 URL: http://commons.apache.org/beanutils @@ -43,7 +43,7 @@ sed -i 's/\r//' *.txt %build # Some tests fail in Koji -%mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.beanutils +%mvn_build -f -- -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7 -Dcommons.osgi.symbolicName=org.apache.commons.beanutils %install %mvn_install @@ -56,6 +56,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Tue Nov 02 2021 Mikolaj Izdebski - 1.9.4-8 +- Bump Java compiler source/target levels to 1.7 + * Wed Jul 21 2021 Fedora Release Engineering - 1.9.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From c743467d91aae865fb89274cb0dbbeb22edadf9e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:23:35 +0000 Subject: [PATCH 22/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index d710738..3167af9 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -2,7 +2,7 @@ Name: apache-commons-beanutils Version: 1.9.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 URL: http://commons.apache.org/beanutils @@ -56,6 +56,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1.9.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Nov 02 2021 Mikolaj Izdebski - 1.9.4-8 - Bump Java compiler source/target levels to 1.7 From f38ffc7df8845f8894df7924ad921beaffa4a9e5 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 19:20:59 +0100 Subject: [PATCH 23/56] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- apache-commons-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 3167af9..c7a45b4 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -2,7 +2,7 @@ Name: apache-commons-beanutils Version: 1.9.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 URL: http://commons.apache.org/beanutils @@ -56,6 +56,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Sat Feb 05 2022 Jiri Vanek - 1.9.4-10 +- Rebuilt for java-17-openjdk as system jdk + * Wed Jan 19 2022 Fedora Release Engineering - 1.9.4-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 6e50e56f865c850878e240081a5f621459992a54 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:23 +0200 Subject: [PATCH 24/56] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- apache-commons-beanutils.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index c7a45b4..db92c70 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -7,6 +7,7 @@ Summary: Java utility methods for accessing and modifying the properties License: ASL 2.0 URL: http://commons.apache.org/beanutils BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Source0: http://archive.apache.org/dist/commons/beanutils/source/commons-beanutils-%{version}-src.tar.gz BuildRequires: maven-local From d5f6e76703b91f9817ee7d0243d1701f5e40226b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:03:17 +0200 Subject: [PATCH 25/56] Update build-requires in bootstrap mode --- apache-commons-beanutils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index db92c70..23c6d47 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -10,10 +10,10 @@ BuildArch: noarch ExclusiveArch: %{java_arches} noarch Source0: http://archive.apache.org/dist/commons/beanutils/source/commons-beanutils-%{version}-src.tar.gz -BuildRequires: maven-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else +BuildRequires: maven-local BuildRequires: mvn(commons-collections:commons-collections) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) From 68119a8d8b804a8dd6c5ce61a2ad07c176abbf99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:58:04 +0000 Subject: [PATCH 26/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 23c6d47..347340f 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -2,7 +2,7 @@ Name: apache-commons-beanutils Version: 1.9.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 URL: http://commons.apache.org/beanutils @@ -57,6 +57,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.9.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Feb 05 2022 Jiri Vanek - 1.9.4-10 - Rebuilt for java-17-openjdk as system jdk From c852d59b3f4121e6f844a6168abaec143fedab46 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:51 +0200 Subject: [PATCH 27/56] 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 991359c433428b48d5b7b4104da0f25236ba8b62 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:52:59 +0000 Subject: [PATCH 28/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 347340f..51cb1d2 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -2,7 +2,7 @@ Name: apache-commons-beanutils Version: 1.9.4 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 URL: http://commons.apache.org/beanutils @@ -57,6 +57,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1.9.4-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 1.9.4-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 6d337bd41ec45f6091c24a9561b059240da3a8ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:27:07 +0000 Subject: [PATCH 29/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 51cb1d2..62a3e93 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -2,7 +2,7 @@ Name: apache-commons-beanutils Version: 1.9.4 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: ASL 2.0 URL: http://commons.apache.org/beanutils @@ -57,6 +57,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.9.4-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 1.9.4-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 47f4232da645b6927a98f48040be6f9fcaa722b9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 13:20:30 +0200 Subject: [PATCH 30/56] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- apache-commons-beanutils.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 62a3e93..09189ae 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -2,9 +2,9 @@ Name: apache-commons-beanutils Version: 1.9.4 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans -License: ASL 2.0 +License: Apache-2.0 URL: http://commons.apache.org/beanutils BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -57,6 +57,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Fri Sep 01 2023 Mikolaj Izdebski - 1.9.4-14 +- Convert License tag to SPDX format + * Wed Jul 19 2023 Fedora Release Engineering - 1.9.4-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 4f6b53fad81d624bc3b2aa5c2fe3974a488d665f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 4 Dec 2023 20:22:40 +0100 Subject: [PATCH 31/56] Port to apache-commons-parent 65 --- apache-commons-beanutils.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 09189ae..ca3cb7c 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -2,7 +2,7 @@ Name: apache-commons-beanutils Version: 1.9.4 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: Apache-2.0 URL: http://commons.apache.org/beanutils @@ -44,7 +44,7 @@ sed -i 's/\r//' *.txt %build # Some tests fail in Koji -%mvn_build -f -- -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7 -Dcommons.osgi.symbolicName=org.apache.commons.beanutils +%mvn_build -f -- -Dcommons.packageId=beanutils %install %mvn_install @@ -57,6 +57,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Mon Dec 04 2023 Mikolaj Izdebski - 1.9.4-15 +- Port to apache-commons-parent 65 + * Fri Sep 01 2023 Mikolaj Izdebski - 1.9.4-14 - Convert License tag to SPDX format From d60dae820ddededfb472d92b94314e3319077b97 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:07 +0200 Subject: [PATCH 32/56] 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 9ae16c91cec6765c27340534b8fd84c041e1b07b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:10:54 +0000 Subject: [PATCH 33/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- apache-commons-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index ca3cb7c..9c96c9a 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -2,7 +2,7 @@ Name: apache-commons-beanutils Version: 1.9.4 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: Apache-2.0 URL: http://commons.apache.org/beanutils @@ -57,6 +57,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.9.4-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Dec 04 2023 Mikolaj Izdebski - 1.9.4-15 - Port to apache-commons-parent 65 From 89176e52c4129713eb3f68ef078a9705ca3a036e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:12:20 +0000 Subject: [PATCH 34/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- apache-commons-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 9c96c9a..7585960 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -2,7 +2,7 @@ Name: apache-commons-beanutils Version: 1.9.4 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: Apache-2.0 URL: http://commons.apache.org/beanutils @@ -57,6 +57,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.9.4-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.9.4-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 59a5f11eee06c6a5746caebc2ccbf40ef23322f6 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:13:13 +0100 Subject: [PATCH 35/56] 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-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 7585960..d093f24 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -2,7 +2,7 @@ Name: apache-commons-beanutils Version: 1.9.4 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: Apache-2.0 URL: http://commons.apache.org/beanutils @@ -57,6 +57,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Fri Feb 23 2024 Jiri Vanek - 1.9.4-18 +- bump of release for for java-21-openjdk as system jdk + * Mon Jan 22 2024 Fedora Release Engineering - 1.9.4-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b4ecdbb9982eb0cafaed8cfcbe44fac20358626d Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 14:39:01 +0100 Subject: [PATCH 36/56] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- apache-commons-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index d093f24..eee5066 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -2,7 +2,7 @@ Name: apache-commons-beanutils Version: 1.9.4 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: Apache-2.0 URL: http://commons.apache.org/beanutils @@ -57,6 +57,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Tue Feb 27 2024 Jiri Vanek - 1.9.4-19 +- Rebuilt for java-21-openjdk as system jdk + * Fri Feb 23 2024 Jiri Vanek - 1.9.4-18 - bump of release for for java-21-openjdk as system jdk From 2fb1197314ea2f8456adb5713400c7e2e6870508 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:09:38 +0000 Subject: [PATCH 37/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- apache-commons-beanutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index eee5066..84f1913 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -2,7 +2,7 @@ Name: apache-commons-beanutils Version: 1.9.4 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: Apache-2.0 URL: http://commons.apache.org/beanutils @@ -57,6 +57,9 @@ sed -i 's/\r//' *.txt %doc LICENSE.txt NOTICE.txt %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.9.4-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 1.9.4-19 - Rebuilt for java-21-openjdk as system jdk From cc00da070e1ab790bc781f2b0d718a7b7a4b9c15 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 24 Jul 2024 10:41:55 +0200 Subject: [PATCH 38/56] Install license files in licensedir instead of docdir --- apache-commons-beanutils.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 84f1913..7c09bb0 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -2,7 +2,7 @@ Name: apache-commons-beanutils Version: 1.9.4 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: Apache-2.0 URL: http://commons.apache.org/beanutils @@ -51,12 +51,15 @@ sed -i 's/\r//' *.txt %files -f .mfiles %doc RELEASE-NOTES.txt -%doc LICENSE.txt NOTICE.txt +%license LICENSE.txt NOTICE.txt %files javadoc -f .mfiles-javadoc -%doc LICENSE.txt NOTICE.txt +%license LICENSE.txt NOTICE.txt %changelog +* Wed Jul 24 2024 Mikolaj Izdebski - 1.9.4-21 +- Install license files in licensedir instead of docdir + * Wed Jul 17 2024 Fedora Release Engineering - 1.9.4-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b0eca1d53ae6074f6827ecfe99fe3c7f5229bf47 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 39/56] 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 82a70e501ce09b9181508d762d41713abc3f8ef7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 40/56] Switch from %setup to %autosetup --- apache-commons-beanutils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 7c09bb0..8d049e1 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -32,7 +32,7 @@ Summary: Javadoc for %{name} %{summary}. %prep -%setup -q -n commons-beanutils-%{version}-src +%autosetup -p1 -n commons-beanutils-%{version}-src sed -i 's/\r//' *.txt %pom_remove_plugin :maven-assembly-plugin From 54ddcaf79d474c063bd3e61aaf18d69c378c6b72 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:00 +0200 Subject: [PATCH 41/56] Convert to %autorelease and %autochangelog --- apache-commons-beanutils.spec | 301 +--------------------------------- changelog | 298 +++++++++++++++++++++++++++++++++ 2 files changed, 300 insertions(+), 299 deletions(-) create mode 100644 changelog diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 8d049e1..04f6c15 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -2,7 +2,7 @@ Name: apache-commons-beanutils Version: 1.9.4 -Release: 21%{?dist} +Release: %autorelease Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: Apache-2.0 URL: http://commons.apache.org/beanutils @@ -57,301 +57,4 @@ sed -i 's/\r//' *.txt %license LICENSE.txt NOTICE.txt %changelog -* Wed Jul 24 2024 Mikolaj Izdebski - 1.9.4-21 -- Install license files in licensedir instead of docdir - -* Wed Jul 17 2024 Fedora Release Engineering - 1.9.4-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 1.9.4-19 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 1.9.4-18 -- bump of release for for java-21-openjdk as system jdk - -* Mon Jan 22 2024 Fedora Release Engineering - 1.9.4-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.9.4-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Dec 04 2023 Mikolaj Izdebski - 1.9.4-15 -- Port to apache-commons-parent 65 - -* Fri Sep 01 2023 Mikolaj Izdebski - 1.9.4-14 -- Convert License tag to SPDX format - -* Wed Jul 19 2023 Fedora Release Engineering - 1.9.4-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 1.9.4-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 1.9.4-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 05 2022 Jiri Vanek - 1.9.4-10 -- Rebuilt for java-17-openjdk as system jdk - -* Wed Jan 19 2022 Fedora Release Engineering - 1.9.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Nov 02 2021 Mikolaj Izdebski - 1.9.4-8 -- Bump Java compiler source/target levels to 1.7 - -* Wed Jul 21 2021 Fedora Release Engineering - 1.9.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 1.9.4-6 -- Bootstrap build -- Non-bootstrap build - -* Tue Jan 26 2021 Fedora Release Engineering - 1.9.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.9.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 1.9.4-3 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Tue Jan 28 2020 Fedora Release Engineering - 1.9.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 05 2019 Mikolaj Izdebski - 1.9.4-2 -- Mass rebuild for javapackages-tools 201902 - -* Fri Oct 04 2019 Fabio Valentini - 1.9.4-1 -- Update to version 1.9.4. -- Re-enable test suite. - -* Thu Aug 15 2019 Marian Koncek - 1.9.4-1 -- Update to upstream version 1.9.4 - -* Wed Jul 24 2019 Fedora Release Engineering - 1.9.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 1.9.3-5 -- Mass rebuild for javapackages-tools 201901 - -* Thu Jan 31 2019 Fedora Release Engineering - 1.9.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 1.9.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 1.9.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.9.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.9.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Nov 01 2016 Michael Simacek - 1.9.3-1 -- Update to upstream version 1.9.3 - -* Wed Feb 03 2016 Fedora Release Engineering - 1.9.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.9.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Oct 14 2014 Mikolaj Izdebski - 1.9.2-3 -- Remove Provides/Obsoletes for javadoc package - -* Wed Jul 30 2014 Mikolaj Izdebski - 1.9.2-2 -- Fix build-requires on apache-commons-parent - -* Fri Jun 6 2014 Mikolaj Izdebski - 1.9.2-1 -- Update to upstream version 1.9.2 -- Remove legacy Provides/Obsoletes for jakarta-commons-beanutils -- Remove RPM bug workaround - -* Tue Mar 04 2014 Stanislav Ochotnicky - 1.9.1-2 -- Use Requires: java-headless rebuild (#1067528) - -* Mon Jan 13 2014 Mikolaj Izdebski - 1.9.1-1 -- Update to upstream version 1.9.1 - -* Mon Jan 6 2014 Mikolaj Izdebski - 1.9.0-1 -- Update to upstream version 1.9.0 - -* Sat Aug 03 2013 Fedora Release Engineering - 1.8.3-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Apr 29 2013 Mikolaj Izdebski - 1.8.3-10 -- Build with xmvn -- Don't generate extra JARs -- Simplify build dependencies -- Update to current packaging guidelines - -* Wed Feb 13 2013 Fedora Release Engineering - 1.8.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 1.8.3-8 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Wed Jul 18 2012 Fedora Release Engineering - 1.8.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 1.8.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Nov 22 2011 Stanislav Ochotnicky - 1.8.3-5 -- Packaging fixes -- Remove unneeded depmap -- Remove versioned jars and javadocs -- Use maven 3 to build - -* Mon Feb 07 2011 Fedora Release Engineering - 1.8.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Jul 8 2010 Stanislav Ochotnicky - 1.8.3-3 -- Add license to javadoc subpackage - -* Mon May 24 2010 Stanislav Ochotnicky - 1.8.3-2 -- Added provides to javadoc subpackage - -* Fri May 21 2010 Stanislav Ochotnicky - 1.8.3-1 -- Re-did whole spec file, dropped gcj support -- Rename package (jakarta-commons-beanutils->apache-commons-beanutils) - -* Fri Jul 24 2009 Fedora Release Engineering - 0:1.7.0-12.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 0:1.7.0-11.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Oct 23 2008 David Walluck 0:1.7.0-10.3 -- Fedora-specific: enable GCJ support - -* Thu Oct 23 2008 David Walluck 0:1.7.0-10.2 -- Fedora-specific: BuildRequires: java-1.6.0-devel - -* Thu Oct 23 2008 David Walluck 0:1.7.0-10.1 -- Fedora-specific: remove repolib -- Fedora-specific: enable JDK6 support - -* Mon Oct 20 2008 David Walluck 0:1.7.0-10 -- add flag to build with maven - -* Fri Sep 19 2008 David Walluck 0:1.7.0-9 -- add jdk6 patch -- fix repolib - -* Sun Jun 15 2008 David Walluck 0:1.7.0-8.jpp5 -- fix duplicate files -- correctly unpack sources -- remove spurious gnu-crypto requirement -- remove spurious javadoc package requirements -- fix javadoc directory -- fix build-classpath call -- use macros - -* Fri May 30 2008 Permaine Cheung - 0:1.7.0-7 -- First JPP5 build - -* Tue Jul 24 2007 Ralph Apel - 0:1.7.0-6jpp -- Make Vendor, Distribution based on macro -- Fix aot build -- Add poms and depmap frags -- Build with maven1 by default -- Add manual subpackage when built with maven - -* Tue Mar 13 2007 Vivek Lakshmanan - 0:1.7.0-2jpp.ep1.2 -- Fix repolib location - -* Tue Mar 13 2007 Fernando Nasser - 0:1.7.0-2jpp.ep1.1 -- New repolib location - -* Mon Mar 05 2007 Fernando Nasser - 0:1.7.0-2jpp.el4ep1.3 -- Remove pre section used for RHUG cleanup - -* Tue Feb 20 2007 Vivek Lakshmanan - 0:1.7.0-2jpp.el4ep1.2 -- Add -brew suffix - -* Fri Feb 17 2007 Vivek Lakshmanan - 0:1.7.0-2jpp.el4ep1.1 -- Add repolib support - -* Thu Aug 17 2006 Fernando Nasser - 0:1.7.0-5jpp -- Require what is used in post/postun for javadoc - -* Fri Jul 14 2006 Fernando Nasser - 0:1.7.0-4jpp -- Add AOT bits - -* Thu May 11 2006 Fernando Nasser - 0:1.7.0-3jpp -- Add header -- Remove unecessary macro definitions - -* Wed Feb 22 2006 Fernando Nasser - 0:1.7.0-2jpp_1rh -- Merge with upstream - -* Wed Apr 27 2005 Fernando Nasser - 0:1.7.0-1jpp_3rh -- Fix build so that collections jar is created - -* Sat Jan 29 2005 Ralph Apel - 0:1.7.0-2jpp -- Use the "dist" target to get a full build, including bean-collections - -* Thu Oct 21 2004 Fernando Nasser - 0:1.7.0-1jpp_1rh -- Import from upstream - -* Thu Oct 21 2004 Fernando Nasser - 0:1.7.0-1jpp -- Upgrade to 1.7.0 - -* Fri Oct 1 2004 Andrew Overholt 0:1.6.1-4jpp_6rh -- add coreutils BuildRequires - -* Sun Aug 23 2004 Randy Watler - 0:1.6.1-5jpp -- Rebuild with ant-1.6.2 - -* Fri Jul 2 2004 Aizaz Ahmed 0:1.6.1-4jpp_5rh -- Added trigger to restore symlinks that are removed if ugrading - from a commons-beanutils rhug package - -* Fri Apr 2 2004 Frank Ch. Eigler 0:1.6.1-4jpp_4rh -- more of the same, for version-suffixed .jar files - -* Fri Mar 26 2004 Frank Ch. Eigler 0:1.6.1-4jpp_3rh -- add RHUG upgrade cleanup - -* Fri Mar 5 2004 Frank Ch. Eigler 0:1.6.1-4jpp_2rh -- RH vacuuming part II - -* Thu Mar 4 2004 Frank Ch. Eigler 0:1.6.1-4jpp_1rh -- RH vacuuming - -* Fri May 09 2003 David Walluck 0:1.6.1-4jpp -- update for JPackage 1.5 - -* Thu Feb 27 2003 Henri Gomez 1.6.1-2jpp -- fix ASF license and add packager name - -* Wed Feb 19 2003 Henri Gomez 1.6.1-1jpp -- 1.6.1 - -* Thu Feb 13 2003 Henri Gomez 1.6-1jpp -- 1.6 - -* Thu Oct 24 2002 Henri Gomez 1.5-1jpp -- 1.5 - -* Fri Aug 23 2002 Henri Gomez 1.4.1-1jpp -- 1.4.1 - -* Tue Aug 20 2002 Henri Gomez 1.4-1jpp -- 1.4 - -* Fri Jul 12 2002 Henri Gomez 1.3-3jpp -- change to commons-xxx.jar instead of commons-xxx.home in ant parameters - -* Mon Jun 10 2002 Henri Gomez 1.3-2jpp -- use sed instead of bash 2.x extension in link area to make spec compatible - with distro using bash 1.1x - -* Fri Jun 07 2002 Henri Gomez 1.3-1jpp -- 1.3 -- added short names in %%{_javadir}, as does jakarta developpers -- first jPackage release +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..9bb43e4 --- /dev/null +++ b/changelog @@ -0,0 +1,298 @@ +* Wed Jul 24 2024 Mikolaj Izdebski - 1.9.4-21 +- Install license files in licensedir instead of docdir + +* Wed Jul 17 2024 Fedora Release Engineering - 1.9.4-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 1.9.4-19 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 1.9.4-18 +- bump of release for for java-21-openjdk as system jdk + +* Mon Jan 22 2024 Fedora Release Engineering - 1.9.4-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.9.4-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 04 2023 Mikolaj Izdebski - 1.9.4-15 +- Port to apache-commons-parent 65 + +* Fri Sep 01 2023 Mikolaj Izdebski - 1.9.4-14 +- Convert License tag to SPDX format + +* Wed Jul 19 2023 Fedora Release Engineering - 1.9.4-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 1.9.4-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 1.9.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1.9.4-10 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 1.9.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 1.9.4-8 +- Bump Java compiler source/target levels to 1.7 + +* Wed Jul 21 2021 Fedora Release Engineering - 1.9.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.9.4-6 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 1.9.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.9.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1.9.4-3 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Tue Jan 28 2020 Fedora Release Engineering - 1.9.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 1.9.4-2 +- Mass rebuild for javapackages-tools 201902 + +* Fri Oct 04 2019 Fabio Valentini - 1.9.4-1 +- Update to version 1.9.4. +- Re-enable test suite. + +* Thu Aug 15 2019 Marian Koncek - 1.9.4-1 +- Update to upstream version 1.9.4 + +* Wed Jul 24 2019 Fedora Release Engineering - 1.9.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 1.9.3-5 +- Mass rebuild for javapackages-tools 201901 + +* Thu Jan 31 2019 Fedora Release Engineering - 1.9.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 1.9.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1.9.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.9.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.9.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Nov 01 2016 Michael Simacek - 1.9.3-1 +- Update to upstream version 1.9.3 + +* Wed Feb 03 2016 Fedora Release Engineering - 1.9.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.9.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Oct 14 2014 Mikolaj Izdebski - 1.9.2-3 +- Remove Provides/Obsoletes for javadoc package + +* Wed Jul 30 2014 Mikolaj Izdebski - 1.9.2-2 +- Fix build-requires on apache-commons-parent + +* Fri Jun 6 2014 Mikolaj Izdebski - 1.9.2-1 +- Update to upstream version 1.9.2 +- Remove legacy Provides/Obsoletes for jakarta-commons-beanutils +- Remove RPM bug workaround + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1.9.1-2 +- Use Requires: java-headless rebuild (#1067528) + +* Mon Jan 13 2014 Mikolaj Izdebski - 1.9.1-1 +- Update to upstream version 1.9.1 + +* Mon Jan 6 2014 Mikolaj Izdebski - 1.9.0-1 +- Update to upstream version 1.9.0 + +* Sat Aug 03 2013 Fedora Release Engineering - 1.8.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Apr 29 2013 Mikolaj Izdebski - 1.8.3-10 +- Build with xmvn +- Don't generate extra JARs +- Simplify build dependencies +- Update to current packaging guidelines + +* Wed Feb 13 2013 Fedora Release Engineering - 1.8.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 1.8.3-8 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Wed Jul 18 2012 Fedora Release Engineering - 1.8.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 12 2012 Fedora Release Engineering - 1.8.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Nov 22 2011 Stanislav Ochotnicky - 1.8.3-5 +- Packaging fixes +- Remove unneeded depmap +- Remove versioned jars and javadocs +- Use maven 3 to build + +* Mon Feb 07 2011 Fedora Release Engineering - 1.8.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Jul 8 2010 Stanislav Ochotnicky - 1.8.3-3 +- Add license to javadoc subpackage + +* Mon May 24 2010 Stanislav Ochotnicky - 1.8.3-2 +- Added provides to javadoc subpackage + +* Fri May 21 2010 Stanislav Ochotnicky - 1.8.3-1 +- Re-did whole spec file, dropped gcj support +- Rename package (jakarta-commons-beanutils->apache-commons-beanutils) + +* Fri Jul 24 2009 Fedora Release Engineering - 0:1.7.0-12.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 0:1.7.0-11.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Oct 23 2008 David Walluck 0:1.7.0-10.3 +- Fedora-specific: enable GCJ support + +* Thu Oct 23 2008 David Walluck 0:1.7.0-10.2 +- Fedora-specific: BuildRequires: java-1.6.0-devel + +* Thu Oct 23 2008 David Walluck 0:1.7.0-10.1 +- Fedora-specific: remove repolib +- Fedora-specific: enable JDK6 support + +* Mon Oct 20 2008 David Walluck 0:1.7.0-10 +- add flag to build with maven + +* Fri Sep 19 2008 David Walluck 0:1.7.0-9 +- add jdk6 patch +- fix repolib + +* Sun Jun 15 2008 David Walluck 0:1.7.0-8.jpp5 +- fix duplicate files +- correctly unpack sources +- remove spurious gnu-crypto requirement +- remove spurious javadoc package requirements +- fix javadoc directory +- fix build-classpath call +- use macros + +* Fri May 30 2008 Permaine Cheung - 0:1.7.0-7 +- First JPP5 build + +* Tue Jul 24 2007 Ralph Apel - 0:1.7.0-6jpp +- Make Vendor, Distribution based on macro +- Fix aot build +- Add poms and depmap frags +- Build with maven1 by default +- Add manual subpackage when built with maven + +* Tue Mar 13 2007 Vivek Lakshmanan - 0:1.7.0-2jpp.ep1.2 +- Fix repolib location + +* Tue Mar 13 2007 Fernando Nasser - 0:1.7.0-2jpp.ep1.1 +- New repolib location + +* Mon Mar 05 2007 Fernando Nasser - 0:1.7.0-2jpp.el4ep1.3 +- Remove pre section used for RHUG cleanup + +* Tue Feb 20 2007 Vivek Lakshmanan - 0:1.7.0-2jpp.el4ep1.2 +- Add -brew suffix + +* Fri Feb 17 2007 Vivek Lakshmanan - 0:1.7.0-2jpp.el4ep1.1 +- Add repolib support + +* Thu Aug 17 2006 Fernando Nasser - 0:1.7.0-5jpp +- Require what is used in post/postun for javadoc + +* Fri Jul 14 2006 Fernando Nasser - 0:1.7.0-4jpp +- Add AOT bits + +* Thu May 11 2006 Fernando Nasser - 0:1.7.0-3jpp +- Add header +- Remove unecessary macro definitions + +* Wed Feb 22 2006 Fernando Nasser - 0:1.7.0-2jpp_1rh +- Merge with upstream + +* Wed Apr 27 2005 Fernando Nasser - 0:1.7.0-1jpp_3rh +- Fix build so that collections jar is created + +* Sat Jan 29 2005 Ralph Apel - 0:1.7.0-2jpp +- Use the "dist" target to get a full build, including bean-collections + +* Thu Oct 21 2004 Fernando Nasser - 0:1.7.0-1jpp_1rh +- Import from upstream + +* Thu Oct 21 2004 Fernando Nasser - 0:1.7.0-1jpp +- Upgrade to 1.7.0 + +* Fri Oct 1 2004 Andrew Overholt 0:1.6.1-4jpp_6rh +- add coreutils BuildRequires + +* Sun Aug 23 2004 Randy Watler - 0:1.6.1-5jpp +- Rebuild with ant-1.6.2 + +* Fri Jul 2 2004 Aizaz Ahmed 0:1.6.1-4jpp_5rh +- Added trigger to restore symlinks that are removed if ugrading + from a commons-beanutils rhug package + +* Fri Apr 2 2004 Frank Ch. Eigler 0:1.6.1-4jpp_4rh +- more of the same, for version-suffixed .jar files + +* Fri Mar 26 2004 Frank Ch. Eigler 0:1.6.1-4jpp_3rh +- add RHUG upgrade cleanup + +* Fri Mar 5 2004 Frank Ch. Eigler 0:1.6.1-4jpp_2rh +- RH vacuuming part II + +* Thu Mar 4 2004 Frank Ch. Eigler 0:1.6.1-4jpp_1rh +- RH vacuuming + +* Fri May 09 2003 David Walluck 0:1.6.1-4jpp +- update for JPackage 1.5 + +* Thu Feb 27 2003 Henri Gomez 1.6.1-2jpp +- fix ASF license and add packager name + +* Wed Feb 19 2003 Henri Gomez 1.6.1-1jpp +- 1.6.1 + +* Thu Feb 13 2003 Henri Gomez 1.6-1jpp +- 1.6 + +* Thu Oct 24 2002 Henri Gomez 1.5-1jpp +- 1.5 + +* Fri Aug 23 2002 Henri Gomez 1.4.1-1jpp +- 1.4.1 + +* Tue Aug 20 2002 Henri Gomez 1.4-1jpp +- 1.4 + +* Fri Jul 12 2002 Henri Gomez 1.3-3jpp +- change to commons-xxx.jar instead of commons-xxx.home in ant parameters + +* Mon Jun 10 2002 Henri Gomez 1.3-2jpp +- use sed instead of bash 2.x extension in link area to make spec compatible + with distro using bash 1.1x + +* Fri Jun 07 2002 Henri Gomez 1.3-1jpp +- 1.3 +- added short names in %%{_javadir}, as does jakarta developpers +- first jPackage release From 6e11a071a07289d2876268263c31d927b958ee8f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 42/56] Use %autosetup -C --- apache-commons-beanutils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 04f6c15..26040bb 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -32,7 +32,7 @@ Summary: Javadoc for %{name} %{summary}. %prep -%autosetup -p1 -n commons-beanutils-%{version}-src +%autosetup -p1 -C sed -i 's/\r//' *.txt %pom_remove_plugin :maven-assembly-plugin From 8a67965db2eadc0c79056f5fdceb6de553342b2d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 43/56] 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 e8e2edd0fc84cc1bdb2a5075e913d3eff5de1183 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:01:18 +0100 Subject: [PATCH 44/56] Unify spec style with the rest of Java/Maven packages [skip changelog] --- apache-commons-beanutils.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 26040bb..0988978 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -8,6 +8,7 @@ License: Apache-2.0 URL: http://commons.apache.org/beanutils BuildArch: noarch ExclusiveArch: %{java_arches} noarch + Source0: http://archive.apache.org/dist/commons/beanutils/source/commons-beanutils-%{version}-src.tar.gz %if %{with bootstrap} From d3707887ba7f0f605bca8587991cd0b4f298e627 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:10 +0100 Subject: [PATCH 45/56] Update javadoc package description [skip changelog] --- apache-commons-beanutils.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 0988978..3694ca2 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -27,10 +27,10 @@ dependencies outside of the JDK are required, so the use of this package is very lightweight. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc -%{summary}. +API documentation for %{name}. %prep %autosetup -p1 -C From 891aa04f0c16bc73dbc0aa53d16548d00208eeb3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 Jan 2025 10:53:08 +0100 Subject: [PATCH 46/56] Update upstream URL --- apache-commons-beanutils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 3694ca2..34f48f6 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -5,7 +5,7 @@ Version: 1.9.4 Release: %autorelease Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: Apache-2.0 -URL: http://commons.apache.org/beanutils +URL: https://commons.apache.org/proper/commons-beanutils/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch From cfdd20fe15dd72e263158bd437af649d06fda265 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:14:10 +0000 Subject: [PATCH 47/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 5e4de27c8e23bf53785f43e8e3cbabd8b9b8e6f8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 48/56] Remove javadoc subpackage --- apache-commons-beanutils.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 34f48f6..9476470 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -19,6 +19,8 @@ BuildRequires: mvn(commons-collections:commons-collections) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 1.9.4-40 %description The scope of this package is to create a package of Java utility methods @@ -26,12 +28,6 @@ for accessing and modifying the properties of arbitrary JavaBeans. No dependencies outside of the JDK are required, so the use of this package is very lightweight. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C sed -i 's/\r//' *.txt @@ -45,7 +41,7 @@ sed -i 's/\r//' *.txt %build # Some tests fail in Koji -%mvn_build -f -- -Dcommons.packageId=beanutils +%mvn_build -j -f -- -Dcommons.packageId=beanutils %install %mvn_install @@ -54,8 +50,5 @@ sed -i 's/\r//' *.txt %doc RELEASE-NOTES.txt %license LICENSE.txt NOTICE.txt -%files javadoc -f .mfiles-javadoc -%license LICENSE.txt NOTICE.txt - %changelog %autochangelog From 8c6396f63c1e29340faf13893b0cf3969b4a739d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:18 +0100 Subject: [PATCH 49/56] 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 e758f7dab24ad0061a0a0c9c8fa2ad6274cb8747 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 50/56] 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 d82ea6e799a41ec570f775d98ba8884c0bef34b0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 13 Jun 2025 10:19:16 +0200 Subject: [PATCH 51/56] Fix improper access control vulnerability Resolves: CVE-2025-48734 --- 0001-Fix-CVE-2025-48734.patch | 66 +++++++++++++++++++++++++++++++++++ apache-commons-beanutils.spec | 2 ++ 2 files changed, 68 insertions(+) create mode 100644 0001-Fix-CVE-2025-48734.patch diff --git a/0001-Fix-CVE-2025-48734.patch b/0001-Fix-CVE-2025-48734.patch new file mode 100644 index 0000000..f4f5816 --- /dev/null +++ b/0001-Fix-CVE-2025-48734.patch @@ -0,0 +1,66 @@ +From 50e55ddeda5b26730a74f1a00871a8e0bf5a2131 Mon Sep 17 00:00:00 2001 +From: Gary Gregory +Date: Sun, 25 May 2025 09:07:32 -0400 +Subject: [PATCH] Fix CVE-2025-48734 + +Backported from upstream commit 28ad955a1613ed5885870cc7da52093c1ce739dc +--- + .../apache/commons/beanutils/PropertyUtilsBean.java | 1 + + .../beanutils/SuppressPropertiesBeanIntrospector.java | 11 +++++++++++ + .../org/apache/commons/beanutils/package-info.java | 6 ++++++ + 3 files changed, 18 insertions(+) + +diff --git a/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java b/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java +index 36eb7f57..04d99576 100644 +--- a/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java ++++ b/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java +@@ -189,6 +189,7 @@ public class PropertyUtilsBean { + introspectors.clear(); + introspectors.add(DefaultBeanIntrospector.INSTANCE); + introspectors.add(SuppressPropertiesBeanIntrospector.SUPPRESS_CLASS); ++ introspectors.add(SuppressPropertiesBeanIntrospector.SUPPRESS_DECLARING_CLASS); + } + + /** +diff --git a/src/main/java/org/apache/commons/beanutils/SuppressPropertiesBeanIntrospector.java b/src/main/java/org/apache/commons/beanutils/SuppressPropertiesBeanIntrospector.java +index bd6b2cdc..cff34969 100644 +--- a/src/main/java/org/apache/commons/beanutils/SuppressPropertiesBeanIntrospector.java ++++ b/src/main/java/org/apache/commons/beanutils/SuppressPropertiesBeanIntrospector.java +@@ -48,6 +48,17 @@ public class SuppressPropertiesBeanIntrospector implements BeanIntrospector { + public static final SuppressPropertiesBeanIntrospector SUPPRESS_CLASS = + new SuppressPropertiesBeanIntrospector(Collections.singleton("class")); + ++ /** ++ * A specialized instance which is configured to suppress the special {@code class} properties of Java beans. Unintended access to the call for ++ * {@code declaringClass} (which is common to all Java {@code enum}) can be a security risk because it also allows access to the class loader. Adding this ++ * instance as {@code BeanIntrospector} to an instance of {@code PropertyUtilsBean} suppresses the {@code class} property; it can then no longer be ++ * accessed. ++ * ++ * @since 1.11.0 ++ */ ++ public static final SuppressPropertiesBeanIntrospector SUPPRESS_DECLARING_CLASS = new SuppressPropertiesBeanIntrospector( ++ Collections.singleton("declaringClass")); ++ + /** A set with the names of the properties to be suppressed. */ + private final Set propertyNames; + +diff --git a/src/main/java/org/apache/commons/beanutils/package-info.java b/src/main/java/org/apache/commons/beanutils/package-info.java +index 3cb9d34c..ac8d2a1f 100644 +--- a/src/main/java/org/apache/commons/beanutils/package-info.java ++++ b/src/main/java/org/apache/commons/beanutils/package-info.java +@@ -444,6 +444,12 @@ + * SUPPRESS_CLASS constant of + * SuppressPropertiesBeanIntrospector.

+ * ++ *

Another problematic property is the {@code enum} "declaredClass" property, ++ * through which you can also access that class' class loader. The {@code SuppressPropertiesBeanIntrospector} ++ * provides {@code SUPPRESS_DECLARING_CLASS} to workaround this issue.

++ * ++ *

Both {@code SUPPRESS_CLASS} and {@code SUPPRESS_DECLARING_CLASS} are enabled by default.

++ * + * + *

3. Dynamic Beans (DynaBeans)

+ * +-- +2.49.0 + diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 9476470..042d66c 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -11,6 +11,8 @@ ExclusiveArch: %{java_arches} noarch Source0: http://archive.apache.org/dist/commons/beanutils/source/commons-beanutils-%{version}-src.tar.gz +Patch: 0001-Fix-CVE-2025-48734.patch + %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else From cfa03076a34c048a0dbd03422e7ca90d43a7e939 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 52/56] Build with OpenJDK 25 --- apache-commons-beanutils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 042d66c..3bdefa8 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -16,7 +16,7 @@ Patch: 0001-Fix-CVE-2025-48734.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(commons-collections:commons-collections) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) From 8fc9de4aa2aba722e86b86f396b3e125a8b2a5c3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 16 Jul 2025 20:47:06 +0200 Subject: [PATCH 53/56] Update to upstream version 1.11.0 --- .gitignore | 1 + 0001-Fix-CVE-2025-48734.patch | 66 ----------------------------------- apache-commons-beanutils.spec | 4 +-- sources | 2 +- 4 files changed, 3 insertions(+), 70 deletions(-) delete mode 100644 0001-Fix-CVE-2025-48734.patch diff --git a/.gitignore b/.gitignore index 805a6ba..ee29c7b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /commons-beanutils-1.9.2-src.tar.gz /commons-beanutils-1.9.3-src.tar.gz /commons-beanutils-1.9.4-src.tar.gz +/commons-beanutils-1.11.0-src.tar.gz diff --git a/0001-Fix-CVE-2025-48734.patch b/0001-Fix-CVE-2025-48734.patch deleted file mode 100644 index f4f5816..0000000 --- a/0001-Fix-CVE-2025-48734.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 50e55ddeda5b26730a74f1a00871a8e0bf5a2131 Mon Sep 17 00:00:00 2001 -From: Gary Gregory -Date: Sun, 25 May 2025 09:07:32 -0400 -Subject: [PATCH] Fix CVE-2025-48734 - -Backported from upstream commit 28ad955a1613ed5885870cc7da52093c1ce739dc ---- - .../apache/commons/beanutils/PropertyUtilsBean.java | 1 + - .../beanutils/SuppressPropertiesBeanIntrospector.java | 11 +++++++++++ - .../org/apache/commons/beanutils/package-info.java | 6 ++++++ - 3 files changed, 18 insertions(+) - -diff --git a/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java b/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java -index 36eb7f57..04d99576 100644 ---- a/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java -+++ b/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java -@@ -189,6 +189,7 @@ public class PropertyUtilsBean { - introspectors.clear(); - introspectors.add(DefaultBeanIntrospector.INSTANCE); - introspectors.add(SuppressPropertiesBeanIntrospector.SUPPRESS_CLASS); -+ introspectors.add(SuppressPropertiesBeanIntrospector.SUPPRESS_DECLARING_CLASS); - } - - /** -diff --git a/src/main/java/org/apache/commons/beanutils/SuppressPropertiesBeanIntrospector.java b/src/main/java/org/apache/commons/beanutils/SuppressPropertiesBeanIntrospector.java -index bd6b2cdc..cff34969 100644 ---- a/src/main/java/org/apache/commons/beanutils/SuppressPropertiesBeanIntrospector.java -+++ b/src/main/java/org/apache/commons/beanutils/SuppressPropertiesBeanIntrospector.java -@@ -48,6 +48,17 @@ public class SuppressPropertiesBeanIntrospector implements BeanIntrospector { - public static final SuppressPropertiesBeanIntrospector SUPPRESS_CLASS = - new SuppressPropertiesBeanIntrospector(Collections.singleton("class")); - -+ /** -+ * A specialized instance which is configured to suppress the special {@code class} properties of Java beans. Unintended access to the call for -+ * {@code declaringClass} (which is common to all Java {@code enum}) can be a security risk because it also allows access to the class loader. Adding this -+ * instance as {@code BeanIntrospector} to an instance of {@code PropertyUtilsBean} suppresses the {@code class} property; it can then no longer be -+ * accessed. -+ * -+ * @since 1.11.0 -+ */ -+ public static final SuppressPropertiesBeanIntrospector SUPPRESS_DECLARING_CLASS = new SuppressPropertiesBeanIntrospector( -+ Collections.singleton("declaringClass")); -+ - /** A set with the names of the properties to be suppressed. */ - private final Set propertyNames; - -diff --git a/src/main/java/org/apache/commons/beanutils/package-info.java b/src/main/java/org/apache/commons/beanutils/package-info.java -index 3cb9d34c..ac8d2a1f 100644 ---- a/src/main/java/org/apache/commons/beanutils/package-info.java -+++ b/src/main/java/org/apache/commons/beanutils/package-info.java -@@ -444,6 +444,12 @@ - * SUPPRESS_CLASS constant of - * SuppressPropertiesBeanIntrospector.

- * -+ *

Another problematic property is the {@code enum} "declaredClass" property, -+ * through which you can also access that class' class loader. The {@code SuppressPropertiesBeanIntrospector} -+ * provides {@code SUPPRESS_DECLARING_CLASS} to workaround this issue.

-+ * -+ *

Both {@code SUPPRESS_CLASS} and {@code SUPPRESS_DECLARING_CLASS} are enabled by default.

-+ * - * - *

3. Dynamic Beans (DynaBeans)

- * --- -2.49.0 - diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 3bdefa8..bec5454 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: apache-commons-beanutils -Version: 1.9.4 +Version: 1.11.0 Release: %autorelease Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans License: Apache-2.0 @@ -11,8 +11,6 @@ ExclusiveArch: %{java_arches} noarch Source0: http://archive.apache.org/dist/commons/beanutils/source/commons-beanutils-%{version}-src.tar.gz -Patch: 0001-Fix-CVE-2025-48734.patch - %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else diff --git a/sources b/sources index bbd675e..3e3bede 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-beanutils-1.9.4-src.tar.gz) = 6f3d30d02b9a66cf20509bd868c6e2dadb44bb27da1e6b9af7275675e0f3826845a5d4005509dd1eb77a5b2937820c4770a3753daaab072785dcdab0caa69e73 +SHA512 (commons-beanutils-1.11.0-src.tar.gz) = edd930e7f8118d0cceb8647666fe1d5f873f939f858f433cd19985a75c4575455f2a2d339e4bcbf08b3f586c785a60429d4bb33ff6239da8f2c6183c8c318f18 From 6703cb136a7cbce59fd64be3bfa27987cda6b770 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:05:06 +0000 Subject: [PATCH 54/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 92b1573ffb16acf28f8fb650ba5b18bcae703645 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 19:00:14 +0200 Subject: [PATCH 55/56] 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 9e12dfe850fed63563adcbee80695e05548fd4fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:46:17 +0000 Subject: [PATCH 56/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild