From 42c3ed79bcadd1786ac6d9b2726a5eddc5d93196 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 18:08:42 +0000 Subject: [PATCH 01/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 1477436..5181552 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: https://www.easymock.org @@ -127,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From c3e1ea63e94bfeca68248ad17fdc1d72e0b7f7fa Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 13:20:32 +0200 Subject: [PATCH 02/26] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- easymock.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/easymock.spec b/easymock.spec index 5181552..32a8720 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,9 +2,9 @@ Name: easymock Version: 4.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Easy mock objects -License: ASL 2.0 +License: Apache-2.0 URL: https://www.easymock.org # ./generate-tarball.sh @@ -127,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Fri Sep 01 2023 Mikolaj Izdebski - 4.3-4 +- Convert License tag to SPDX format + * Wed Jul 19 2023 Fedora Release Engineering - 4.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From b48cf830df6d196152c7ca3281bd0aabc3c7e152 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:07 +0200 Subject: [PATCH 03/26] 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 ba422e29d20440ebf735a9457d20e959180e45ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 17:47:01 +0000 Subject: [PATCH 04/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 32a8720..f8ae245 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Easy mock objects License: Apache-2.0 URL: https://www.easymock.org @@ -127,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 4.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Sep 01 2023 Mikolaj Izdebski - 4.3-4 - Convert License tag to SPDX format From 97db8edf9a504cf1df15a459ad990553e0ffcce8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 10:03:56 +0000 Subject: [PATCH 05/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index f8ae245..63cceb9 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Easy mock objects License: Apache-2.0 URL: https://www.easymock.org @@ -127,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 4.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 4.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 02b370541c0a3e568b887547dc8ac2c61857c46a Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:18:32 +0100 Subject: [PATCH 06/26] 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 --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 63cceb9..c0c443f 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Easy mock objects License: Apache-2.0 URL: https://www.easymock.org @@ -127,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Fri Feb 23 2024 Jiri Vanek - 4.3-7 +- bump of release for for java-21-openjdk as system jdk + * Wed Jan 24 2024 Fedora Release Engineering - 4.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From fc120c89808a6453d6ddee4015198184dade09a2 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 15:20:03 +0100 Subject: [PATCH 07/26] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index c0c443f..3a8271a 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Easy mock objects License: Apache-2.0 URL: https://www.easymock.org @@ -127,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Tue Feb 27 2024 Jiri Vanek - 4.3-8 +- Rebuilt for java-21-openjdk as system jdk + * Fri Feb 23 2024 Jiri Vanek - 4.3-7 - bump of release for for java-21-openjdk as system jdk From 8e19929592a3240725e9da012b6d21c96981cbb0 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 08/26] Eliminate use of obsolete %patchN syntax (#2283636) --- easymock.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/easymock.spec b/easymock.spec index 3a8271a..6b78140 100644 --- a/easymock.spec +++ b/easymock.spec @@ -59,10 +59,10 @@ Javadoc for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 +%patch -P4 -p1 %pom_remove_plugin :license-maven-plugin %pom_remove_plugin :maven-enforcer-plugin From 1df286a387fce19a836ada51bb6b543fad02835f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 31 May 2024 05:41:47 +0200 Subject: [PATCH 09/26] Switch to a newer %patch syntax --- easymock.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/easymock.spec b/easymock.spec index 6b78140..2599c67 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Easy mock objects License: Apache-2.0 URL: https://www.easymock.org @@ -59,10 +59,10 @@ Javadoc for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} -%patch -P1 -p1 -%patch -P2 -p1 -%patch -P3 -p1 -%patch -P4 -p1 +%patch 1 -p1 +%patch 2 -p1 +%patch 3 -p1 +%patch 4 -p1 %pom_remove_plugin :license-maven-plugin %pom_remove_plugin :maven-enforcer-plugin @@ -127,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Fri May 31 2024 Mikolaj Izdebski - 4.3-9 +- Switch to a newer patch macro syntax + * Tue Feb 27 2024 Jiri Vanek - 4.3-8 - Rebuilt for java-21-openjdk as system jdk From dbdee2d3a5d710aaf6e39b01ec3c38e1e4d4c825 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 21:38:40 +0000 Subject: [PATCH 10/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index 2599c67..8b5643e 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Easy mock objects License: Apache-2.0 URL: https://www.easymock.org @@ -127,6 +127,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 4.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri May 31 2024 Mikolaj Izdebski - 4.3-9 - Switch to a newer patch macro syntax From 7e35fcf43d5dabe86e9dd8cc7892f92b07927fa0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 11/26] 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 50591cdbc24715fcf99d6aba2d53beae04a18847 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 12/26] Switch from %setup to %autosetup --- easymock.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/easymock.spec b/easymock.spec index 8b5643e..c90b38e 100644 --- a/easymock.spec +++ b/easymock.spec @@ -57,12 +57,8 @@ Summary: Javadoc for %{name} Javadoc for %{name}. %prep -%setup -q -n %{name}-%{name}-%{version} +%autosetup -p1 -C -%patch 1 -p1 -%patch 2 -p1 -%patch 3 -p1 -%patch 4 -p1 %pom_remove_plugin :license-maven-plugin %pom_remove_plugin :maven-enforcer-plugin From 59b360672d64081a9f01b6ce046c7a716b01d8ac Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Aug 2024 22:13:18 +0200 Subject: [PATCH 13/26] Switch to non-numdered patches --- easymock.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/easymock.spec b/easymock.spec index c90b38e..6632f1f 100644 --- a/easymock.spec +++ b/easymock.spec @@ -12,10 +12,10 @@ Source0: %{name}-%{version}.tar.gz # Remove bundled binaries which cannot be easily verified for licensing Source1: generate-tarball.sh -Patch1: 0001-Disable-android-support.patch -Patch2: 0002-Unshade-cglib-and-asm.patch -Patch3: 0003-Fix-OSGi-manifest.patch -Patch4: 0004-Port-to-hamcrest-2.1.patch +Patch: 0001-Disable-android-support.patch +Patch: 0002-Unshade-cglib-and-asm.patch +Patch: 0003-Fix-OSGi-manifest.patch +Patch: 0004-Port-to-hamcrest-2.1.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch From 6291ac457495599a00dbc146b0cdd51972512a2a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:03 +0200 Subject: [PATCH 14/26] Convert to %autorelease and %autochangelog --- changelog | 230 +++++++++++++++++++++++++++++++++++++++++++++++++ easymock.spec | 233 +------------------------------------------------- 2 files changed, 232 insertions(+), 231 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..946e90d --- /dev/null +++ b/changelog @@ -0,0 +1,230 @@ +* Wed Jul 17 2024 Fedora Release Engineering - 4.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri May 31 2024 Mikolaj Izdebski - 4.3-9 +- Switch to a newer patch macro syntax + +* Tue Feb 27 2024 Jiri Vanek - 4.3-8 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 4.3-7 +- bump of release for for java-21-openjdk as system jdk + +* Wed Jan 24 2024 Fedora Release Engineering - 4.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 4.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 4.3-4 +- Convert License tag to SPDX format + +* Wed Jul 19 2023 Fedora Release Engineering - 4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Sep 08 2022 Marian Koncek - 4.3-1 +- Update to upstream version 4.3 + +* Thu Jul 21 2022 Fedora Release Engineering - 4.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 4.2-7 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 4.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 4.2-5 +- Workaround build issue with OpenJDK 17 + +* Wed Jul 21 2021 Fedora Release Engineering - 4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 4.2-3 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Aug 31 2020 Fabio Valentini - 4.2-1 +- Update to version 4.2. + +* Mon Jul 27 2020 Fedora Release Engineering - 3.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 3.6-6 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Mar 04 2020 Marian Koncek - 4.2-1 +- Update to upstream version 4.2 + +* Tue Jan 28 2020 Fedora Release Engineering - 3.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 4.0.2-2 +- Mass rebuild for javapackages-tools 201902 + +* Wed Jul 24 2019 Fedora Release Engineering - 3.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jul 18 2019 Marian Koncek - 4.0.2-1 +- Update to upstream version 4.0.2 + +* Fri May 24 2019 Mikolaj Izdebski - 3.5-5 +- Mass rebuild for javapackages-tools 201901 + +* Thu Jan 31 2019 Fedora Release Engineering - 3.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Nov 30 2018 Mat Booth - 3.6-2 +- Rebuild to fix OSGi dependency on ASM 7 + +* Mon Oct 8 2018 Mikolaj Izdebski - 3.6-1 +- Update to upstream version 3.6 + +* Tue Jul 31 2018 Michael Simacek - 3.5-4 +- Repack the tarball without binaries + +* Thu Jul 12 2018 Fedora Release Engineering - 3.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Sep 18 2017 Mikolaj Izdebski - 3.5-1 +- Update to upstream version 3.5 + +* Fri Sep 15 2017 Mat Booth - 3.4-6 +- Regenerate OSGi metadata due to Objectweb ASM upgrade + +* Wed Jul 26 2017 Fedora Release Engineering - 3.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Feb 23 2017 Mikolaj Izdebski - 3.4-4 +- Add missing BR on apache-resource-bundles + +* Tue Feb 07 2017 Michael Simacek - 3.4-3 +- Remove useless license-plugin + +* Wed Jun 1 2016 Mikolaj Izdebski - 3.4-2 +- Fix OSGi manifest +- Resolves: rhbz#1341052 + +* Mon May 30 2016 Michael Simacek - 3.4-1 +- Update to upstream version 3.4 + +* Mon May 30 2016 Mikolaj Izdebski - 3.3.1-5 +- Port to maven-jar-plugin 3.0.0 + +* Wed Feb 03 2016 Fedora Release Engineering - 3.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jul 13 2015 Mikolaj Izdebski - 3.3.1-3 +- Obsolete easymock2 +- Resolves: rhbz#1172958 + +* Wed Jun 17 2015 Fedora Release Engineering - 3.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue May 5 2015 Alexander Kurtakov 3.3.1-1 +- Update to upstream 3.3.1 release. + +* Sat Mar 07 2015 Michael Simacek - 3.3-2 +- Remove retired maven-timestamp-plugin + +* Tue Nov 25 2014 Mikolaj Izdebski - 3.3-1 +- Update to upstream version 3.3 + +* Sat Jun 07 2014 Fedora Release Engineering - 3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 04 2014 Stanislav Ochotnicky - 3.2-2 +- Use Requires: java-headless rebuild (#1067528) + +* Fri Aug 30 2013 Mikolaj Izdebski - 0:3.2-1 +- Update to upstream version 3.2 + +* Sat Aug 03 2013 Fedora Release Engineering - 0:1.2-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Feb 18 2013 Tomas Radej - 0:1.2-20 +- Fixed sources (bz #905973) + +* Wed Feb 13 2013 Fedora Release Engineering - 0:1.2-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Nov 27 2012 Tomas Radej - 0:1.2-18 +- Removed ownership of _mavenpomdir + +* Thu Aug 16 2012 Mikolaj Izdebski - 0:1.2-17 +- Add LICENSE file +- Remove rpm bug workaround +- Update to current packaging guidelines + +* Wed Jul 18 2012 Fedora Release Engineering - 0:1.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Feb 21 2012 Tomas Radej - 0:1.2-15 +- Removed test + +* Fri Jan 13 2012 Fedora Release Engineering - 0:1.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 0:1.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Nov 26 2010 Stanislav Ochotnicky - 0:1.2-12 +- Fix pom filename (Resolves rhbz#655795) +- Remove clean section and buildroot declaration +- Remove versioned jars and pom files + +* Thu Aug 20 2009 Alexander Kurtakov 0:1.2-11 +- Bump release for rebuild. + +* Thu Aug 20 2009 Alexander Kurtakov 0:1.2-10 +- Disable tests. + +* Mon May 18 2009 Fernando Nasser 0:1.2-9 +- Update instructions for obtaining source tar ball + +* Mon May 04 2009 Yong Yang 0:1.2-8 +- Rebuild with maven2-2.0.8 built in non-bootstrap mode + +* Wed Mar 18 2009 Yong Yang 0:1.2-7 +- merge from JPP-6 +- rebuild with new maven2 2.0.8 built in bootstrap mode + +* Mon Feb 02 2009 David Walluck 0:1.2-6 +- fix component-info.xml + +* Mon Feb 02 2009 David Walluck 0:1.2-5 +- remove unneeded maven flag + +* Mon Feb 02 2009 David Walluck 0:1.2-4 +- add repolib + +* Fri Jan 30 2009 Will Tatam 1.2-3.jpp5 +- Inital JPP-5 Build + +* Fri Jan 09 2009 Yong Yang 1.2-2jpp.1 +- Imported from dbhole's maven 2.0.8 packages, initial building on jpp6 + +* Fri Apr 11 2008 Deepak Bhole 1.2-1jpp.1 +- Import from JPackage +- Add pom file + +* Fri Feb 24 2006 Ralph Apel - 0:1.2-1jpp +- Update to 1.2 keeping only java 1.4 requirement + +* Fri Feb 24 2006 Ralph Apel - 0:1.1-3jpp +- drop java-1.3.1 requirement + +* Mon Oct 04 2004 Ralph Apel - 0:1.1-2jpp +- Fixed Url, Summary, Description and License + +* Mon Oct 04 2004 Ralph Apel - 0:1.1-1jpp +- First JPackage release diff --git a/easymock.spec b/easymock.spec index 6632f1f..2a7fbb9 100644 --- a/easymock.spec +++ b/easymock.spec @@ -2,7 +2,7 @@ Name: easymock Version: 4.3 -Release: 10%{?dist} +Release: %autorelease Summary: Easy mock objects License: Apache-2.0 URL: https://www.easymock.org @@ -123,233 +123,4 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog -* Wed Jul 17 2024 Fedora Release Engineering - 4.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri May 31 2024 Mikolaj Izdebski - 4.3-9 -- Switch to a newer patch macro syntax - -* Tue Feb 27 2024 Jiri Vanek - 4.3-8 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 4.3-7 -- bump of release for for java-21-openjdk as system jdk - -* Wed Jan 24 2024 Fedora Release Engineering - 4.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 4.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Sep 01 2023 Mikolaj Izdebski - 4.3-4 -- Convert License tag to SPDX format - -* Wed Jul 19 2023 Fedora Release Engineering - 4.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 4.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Sep 08 2022 Marian Koncek - 4.3-1 -- Update to upstream version 4.3 - -* Thu Jul 21 2022 Fedora Release Engineering - 4.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 05 2022 Jiri Vanek - 4.2-7 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 4.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Nov 02 2021 Mikolaj Izdebski - 4.2-5 -- Workaround build issue with OpenJDK 17 - -* Wed Jul 21 2021 Fedora Release Engineering - 4.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 4.2-3 -- Bootstrap build -- Non-bootstrap build - -* Tue Jan 26 2021 Fedora Release Engineering - 4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Aug 31 2020 Fabio Valentini - 4.2-1 -- Update to version 4.2. - -* Mon Jul 27 2020 Fedora Release Engineering - 3.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 3.6-6 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Wed Mar 04 2020 Marian Koncek - 4.2-1 -- Update to upstream version 4.2 - -* Tue Jan 28 2020 Fedora Release Engineering - 3.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 05 2019 Mikolaj Izdebski - 4.0.2-2 -- Mass rebuild for javapackages-tools 201902 - -* Wed Jul 24 2019 Fedora Release Engineering - 3.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jul 18 2019 Marian Koncek - 4.0.2-1 -- Update to upstream version 4.0.2 - -* Fri May 24 2019 Mikolaj Izdebski - 3.5-5 -- Mass rebuild for javapackages-tools 201901 - -* Thu Jan 31 2019 Fedora Release Engineering - 3.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Nov 30 2018 Mat Booth - 3.6-2 -- Rebuild to fix OSGi dependency on ASM 7 - -* Mon Oct 8 2018 Mikolaj Izdebski - 3.6-1 -- Update to upstream version 3.6 - -* Tue Jul 31 2018 Michael Simacek - 3.5-4 -- Repack the tarball without binaries - -* Thu Jul 12 2018 Fedora Release Engineering - 3.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 3.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Sep 18 2017 Mikolaj Izdebski - 3.5-1 -- Update to upstream version 3.5 - -* Fri Sep 15 2017 Mat Booth - 3.4-6 -- Regenerate OSGi metadata due to Objectweb ASM upgrade - -* Wed Jul 26 2017 Fedora Release Engineering - 3.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Feb 23 2017 Mikolaj Izdebski - 3.4-4 -- Add missing BR on apache-resource-bundles - -* Tue Feb 07 2017 Michael Simacek - 3.4-3 -- Remove useless license-plugin - -* Wed Jun 1 2016 Mikolaj Izdebski - 3.4-2 -- Fix OSGi manifest -- Resolves: rhbz#1341052 - -* Mon May 30 2016 Michael Simacek - 3.4-1 -- Update to upstream version 3.4 - -* Mon May 30 2016 Mikolaj Izdebski - 3.3.1-5 -- Port to maven-jar-plugin 3.0.0 - -* Wed Feb 03 2016 Fedora Release Engineering - 3.3.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Jul 13 2015 Mikolaj Izdebski - 3.3.1-3 -- Obsolete easymock2 -- Resolves: rhbz#1172958 - -* Wed Jun 17 2015 Fedora Release Engineering - 3.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue May 5 2015 Alexander Kurtakov 3.3.1-1 -- Update to upstream 3.3.1 release. - -* Sat Mar 07 2015 Michael Simacek - 3.3-2 -- Remove retired maven-timestamp-plugin - -* Tue Nov 25 2014 Mikolaj Izdebski - 3.3-1 -- Update to upstream version 3.3 - -* Sat Jun 07 2014 Fedora Release Engineering - 3.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Mar 04 2014 Stanislav Ochotnicky - 3.2-2 -- Use Requires: java-headless rebuild (#1067528) - -* Fri Aug 30 2013 Mikolaj Izdebski - 0:3.2-1 -- Update to upstream version 3.2 - -* Sat Aug 03 2013 Fedora Release Engineering - 0:1.2-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Feb 18 2013 Tomas Radej - 0:1.2-20 -- Fixed sources (bz #905973) - -* Wed Feb 13 2013 Fedora Release Engineering - 0:1.2-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Nov 27 2012 Tomas Radej - 0:1.2-18 -- Removed ownership of _mavenpomdir - -* Thu Aug 16 2012 Mikolaj Izdebski - 0:1.2-17 -- Add LICENSE file -- Remove rpm bug workaround -- Update to current packaging guidelines - -* Wed Jul 18 2012 Fedora Release Engineering - 0:1.2-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Feb 21 2012 Tomas Radej - 0:1.2-15 -- Removed test - -* Fri Jan 13 2012 Fedora Release Engineering - 0:1.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 0:1.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Nov 26 2010 Stanislav Ochotnicky - 0:1.2-12 -- Fix pom filename (Resolves rhbz#655795) -- Remove clean section and buildroot declaration -- Remove versioned jars and pom files - -* Thu Aug 20 2009 Alexander Kurtakov 0:1.2-11 -- Bump release for rebuild. - -* Thu Aug 20 2009 Alexander Kurtakov 0:1.2-10 -- Disable tests. - -* Mon May 18 2009 Fernando Nasser 0:1.2-9 -- Update instructions for obtaining source tar ball - -* Mon May 04 2009 Yong Yang 0:1.2-8 -- Rebuild with maven2-2.0.8 built in non-bootstrap mode - -* Wed Mar 18 2009 Yong Yang 0:1.2-7 -- merge from JPP-6 -- rebuild with new maven2 2.0.8 built in bootstrap mode - -* Mon Feb 02 2009 David Walluck 0:1.2-6 -- fix component-info.xml - -* Mon Feb 02 2009 David Walluck 0:1.2-5 -- remove unneeded maven flag - -* Mon Feb 02 2009 David Walluck 0:1.2-4 -- add repolib - -* Fri Jan 30 2009 Will Tatam 1.2-3.jpp5 -- Inital JPP-5 Build - -* Fri Jan 09 2009 Yong Yang 1.2-2jpp.1 -- Imported from dbhole's maven 2.0.8 packages, initial building on jpp6 - -* Fri Apr 11 2008 Deepak Bhole 1.2-1jpp.1 -- Import from JPackage -- Add pom file - -* Fri Feb 24 2006 Ralph Apel - 0:1.2-1jpp -- Update to 1.2 keeping only java 1.4 requirement - -* Fri Feb 24 2006 Ralph Apel - 0:1.1-3jpp -- drop java-1.3.1 requirement - -* Mon Oct 04 2004 Ralph Apel - 0:1.1-2jpp -- Fixed Url, Summary, Description and License - -* Mon Oct 04 2004 Ralph Apel - 0:1.1-1jpp -- First JPackage release +%autochangelog From 2429a6b5cad0a2b1a456b0de8d608f93a1676925 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 15/26] 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 0e32c5c5768f46c1c0a27e239e0560f1dbf12b98 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:01:18 +0100 Subject: [PATCH 16/26] Unify spec style with the rest of Java/Maven packages [skip changelog] --- easymock.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/easymock.spec b/easymock.spec index 2a7fbb9..5655bc0 100644 --- a/easymock.spec +++ b/easymock.spec @@ -16,7 +16,6 @@ Patch: 0001-Disable-android-support.patch Patch: 0002-Unshade-cglib-and-asm.patch Patch: 0003-Fix-OSGi-manifest.patch Patch: 0004-Port-to-hamcrest-2.1.patch - BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -37,11 +36,10 @@ BuildRequires: mvn(org.objenesis:objenesis) BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.testng:testng) %endif -# xmvn-builddep misses this: %if %{without bootstrap} +# xmvn-builddep misses this: BuildRequires: mvn(org.apache:apache-jar-resource-bundle) %endif - Provides: %{name}3 = %{version}-%{release} %description From 7da5066474d75845ff68593e7f0f853e9e7f8d1e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:40:57 +0100 Subject: [PATCH 17/26] Reorder spec file tags [skip changelog] --- easymock.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easymock.spec b/easymock.spec index 5655bc0..4aa54b0 100644 --- a/easymock.spec +++ b/easymock.spec @@ -6,6 +6,8 @@ Release: %autorelease Summary: Easy mock objects License: Apache-2.0 URL: https://www.easymock.org +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz @@ -16,8 +18,6 @@ Patch: 0001-Disable-android-support.patch Patch: 0002-Unshade-cglib-and-asm.patch Patch: 0003-Fix-OSGi-manifest.patch Patch: 0004-Port-to-hamcrest-2.1.patch -BuildArch: noarch -ExclusiveArch: %{java_arches} noarch %if %{with bootstrap} BuildRequires: javapackages-bootstrap From 9c3ea43b9150aa6932d1c8bffb715873834182a7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:10 +0100 Subject: [PATCH 18/26] Update javadoc package description [skip changelog] --- easymock.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easymock.spec b/easymock.spec index 4aa54b0..ece6ca1 100644 --- a/easymock.spec +++ b/easymock.spec @@ -49,10 +49,10 @@ of recording expectations, most refactorings will not affect the Mock Objects. So EasyMock is a perfect fit for Test-Driven Development. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc -Javadoc for %{name}. +API documentation for %{name}. %prep %autosetup -p1 -C From 3ee30f735b24575b55b666746488a8d2bbc1fe0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 16:32:59 +0000 Subject: [PATCH 19/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 66510002e192a65f4228152af90d40dd060f276f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 20/26] Remove javadoc subpackage --- easymock.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/easymock.spec b/easymock.spec index ece6ca1..fb5d195 100644 --- a/easymock.spec +++ b/easymock.spec @@ -40,6 +40,8 @@ BuildRequires: mvn(org.testng:testng) # xmvn-builddep misses this: BuildRequires: mvn(org.apache:apache-jar-resource-bundle) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 4.3-23 Provides: %{name}3 = %{version}-%{release} %description @@ -48,12 +50,6 @@ them on the fly using Java's proxy mechanism. Due to EasyMock's unique style of recording expectations, most refactorings will not affect the Mock Objects. So EasyMock is a perfect fit for Test-Driven Development. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -109,7 +105,7 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java --add-opens=java.base/java.lang=ALL-UNNAMED" %build -%mvn_build +%mvn_build -j %install %mvn_install @@ -117,8 +113,5 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %files -f .mfiles %license core/LICENSE.txt -%files javadoc -f .mfiles-javadoc -%license core/LICENSE.txt - %changelog %autochangelog From a83653b270b9ed5ceec97f979fc9ee83231e1673 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 21/26] 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 fed37692862a3e935094d4d0ab173d9a5f4272cd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 22/26] 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 cfacf1236ae2e531078c1069ceb3e21e7edabbc2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 23/26] Build with OpenJDK 25 --- easymock.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index fb5d195..eadbda3 100644 --- a/easymock.spec +++ b/easymock.spec @@ -22,7 +22,7 @@ Patch: 0004-Port-to-hamcrest-2.1.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(cglib:cglib) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) From ee8f8637d4b0f367cd6c1751a64535fcf475df3d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 19:40:19 +0000 Subject: [PATCH 24/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 17eb67e965875beea1f49e3dc6dfdb4687fde11d Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 20:09:13 +0200 Subject: [PATCH 25/26] 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 368a7189b3cc094775b9ac7fec7045b36964f33e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 23 Sep 2025 09:09:05 +0200 Subject: [PATCH 26/26] Update to upstream version 5.6.0 --- .gitignore | 1 + 0001-Disable-android-support.patch | 10 +- ...e-from-deprecated-Hamcrest-is-to-isA.patch | 94 +++++++++++++++++++ 0002-Unshade-cglib-and-asm.patch | 27 ------ 0003-Fix-OSGi-manifest.patch | 28 ------ 0004-Port-to-hamcrest-2.1.patch | 75 --------------- easymock.spec | 15 ++- sources | 2 +- 8 files changed, 107 insertions(+), 145 deletions(-) create mode 100644 0002-Migrate-from-deprecated-Hamcrest-is-to-isA.patch delete mode 100644 0002-Unshade-cglib-and-asm.patch delete mode 100644 0003-Fix-OSGi-manifest.patch delete mode 100644 0004-Port-to-hamcrest-2.1.patch diff --git a/.gitignore b/.gitignore index d66b93d..7d16d25 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /easymock-4.0.2.tar.gz /easymock-4.2.tar.gz /easymock-4.3.tar.gz +/easymock-5.6.0.tar.gz diff --git a/0001-Disable-android-support.patch b/0001-Disable-android-support.patch index 208e85b..fddb078 100644 --- a/0001-Disable-android-support.patch +++ b/0001-Disable-android-support.patch @@ -1,17 +1,17 @@ -From 57501046dc32012210433444543c513b20c5d517 Mon Sep 17 00:00:00 2001 +From 3458c2cd3d453dbb866c9515568b288529af05a5 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 30 May 2016 14:24:43 +0200 -Subject: [PATCH 1/3] Disable android support +Subject: [PATCH 1/2] Disable android support --- core/src/main/java/org/easymock/internal/MocksControl.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/core/src/main/java/org/easymock/internal/MocksControl.java b/core/src/main/java/org/easymock/internal/MocksControl.java -index fb2a5dc..356b1c4 100644 +index b86f1a1..cfa0fa1 100644 --- a/core/src/main/java/org/easymock/internal/MocksControl.java +++ b/core/src/main/java/org/easymock/internal/MocksControl.java -@@ -147,12 +147,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters, +@@ -154,12 +154,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters, return cached; } @@ -25,5 +25,5 @@ index fb2a5dc..356b1c4 100644 } -- -2.13.5 +2.51.0 diff --git a/0002-Migrate-from-deprecated-Hamcrest-is-to-isA.patch b/0002-Migrate-from-deprecated-Hamcrest-is-to-isA.patch new file mode 100644 index 0000000..0a1e070 --- /dev/null +++ b/0002-Migrate-from-deprecated-Hamcrest-is-to-isA.patch @@ -0,0 +1,94 @@ +From 9c100b4d67397bd096de6caaef58cd8c9f49c692 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Tue, 23 Sep 2025 12:03:42 +0200 +Subject: [PATCH 2/2] Migrate from deprecated Hamcrest `is` to `isA` + +Replace usages of `is(Class)` with `isA(Class)` in +`EasyMockSupportClassTest` to avoid relying on the deprecated +`org.hamcrest.core.Is.is` method. This removes the need for +`@SuppressWarnings("deprecation")` and keeps the tests aligned with +current Hamcrest best practices. +--- + .../tests2/EasyMockSupportClassTest.java | 21 +++++++++---------- + 1 file changed, 10 insertions(+), 11 deletions(-) + +diff --git a/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java b/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java +index cbe9e01..9b89ed5 100644 +--- a/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java ++++ b/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java +@@ -25,12 +25,11 @@ import org.junit.jupiter.api.Test; + import java.lang.reflect.Method; + + import static org.easymock.EasyMock.*; +-import static org.hamcrest.core.Is.*; ++import static org.hamcrest.core.Is.isA; + + /** + * @author Henri Tremblay + */ +-@SuppressWarnings("deprecation") + class EasyMockSupportClassTest extends EasyMockSupport { + + public static class ToMock { +@@ -49,49 +48,49 @@ class EasyMockSupportClassTest extends EasyMockSupport { + @Test + void testCreateStrictControl() { + IMocksControl ctrl = createStrictControl(); +- MatcherAssert.assertThat(ctrl.createMock(ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(ctrl.createMock(ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateControl() { + IMocksControl ctrl = createControl(); +- MatcherAssert.assertThat(ctrl.createMock(ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(ctrl.createMock(ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateNiceControl() { + IMocksControl ctrl = createNiceControl(); +- MatcherAssert.assertThat(ctrl.createMock(ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(ctrl.createMock(ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateStrictMockClassOfT() { +- MatcherAssert.assertThat(createStrictMock(ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(createStrictMock(ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateStrictMockStringClassOfT() { +- MatcherAssert.assertThat(createStrictMock("myMock", ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(createStrictMock("myMock", ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateMockClassOfT() { +- MatcherAssert.assertThat(createMock(ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(createMock(ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateMockStringClassOfT() { +- MatcherAssert.assertThat(createMock("myMock", ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(createMock("myMock", ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateNiceMockClassOfT() { +- MatcherAssert.assertThat(createNiceMock(ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(createNiceMock(ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateNiceMockStringClassOfT() { +- MatcherAssert.assertThat(createNiceMock("myMock", ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(createNiceMock("myMock", ToMock.class), isA(ToMock.class)); + } + + @Test +-- +2.51.0 + diff --git a/0002-Unshade-cglib-and-asm.patch b/0002-Unshade-cglib-and-asm.patch deleted file mode 100644 index 93d3367..0000000 --- a/0002-Unshade-cglib-and-asm.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2ad2e79989f64072d8437ada55b12eaa8c23834d Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Mon, 30 May 2016 15:14:40 +0200 -Subject: [PATCH 2/3] Unshade cglib and asm - ---- - core/pom.xml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/core/pom.xml b/core/pom.xml -index 1ca847a..5ed6adb 100644 ---- a/core/pom.xml -+++ b/core/pom.xml -@@ -100,8 +100,8 @@ - true - - -- org.easymock.internal.*;poweruser=true;mandatory:=poweruser,org.easymock,org.easymock.cglib.core,org.easymock.cglib.proxy,org.easymock.cglib.reflect,org.easymock.asm -- org.easymock,org.easymock.internal;poweruser=true,org.easymock.cglib.core,org.easymock.cglib.proxy,org.easymock.cglib.reflect,org.easymock.asm,org.objenesis;resolution:=optional -+ org.easymock.internal.*;poweruser=true;mandatory:=poweruser -+ org.easymock,org.easymock.internal;poweruser=true,net.sf.cglib.core,net.sf.cglib.proxy,net.sf.cglib.reflect,org.objectweb.asm,org.objenesis;resolution:=optional - - - --- -2.13.5 - diff --git a/0003-Fix-OSGi-manifest.patch b/0003-Fix-OSGi-manifest.patch deleted file mode 100644 index d4b3263..0000000 --- a/0003-Fix-OSGi-manifest.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fa908a1748cb3090d677a63db4986ffc57acbf1e Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Wed, 1 Jun 2016 09:31:44 +0200 -Subject: [PATCH 3/3] Fix OSGi manifest - -Resolves: rhbz#1341052 ---- - core/pom.xml | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/core/pom.xml b/core/pom.xml -index 5ed6adb..ea6d015 100644 ---- a/core/pom.xml -+++ b/core/pom.xml -@@ -100,8 +100,9 @@ - true - - -- org.easymock.internal.*;poweruser=true;mandatory:=poweruser -+ org.easymock,org.easymock.internal.*;poweruser=true;mandatory:=poweruser - org.easymock,org.easymock.internal;poweruser=true,net.sf.cglib.core,net.sf.cglib.proxy,net.sf.cglib.reflect,org.objectweb.asm,org.objenesis;resolution:=optional -+ <_nouses>true - - - --- -2.13.5 - diff --git a/0004-Port-to-hamcrest-2.1.patch b/0004-Port-to-hamcrest-2.1.patch deleted file mode 100644 index 542db7e..0000000 --- a/0004-Port-to-hamcrest-2.1.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 5393d71f7bf9de06efd763c501486bf14413ab4a Mon Sep 17 00:00:00 2001 -From: Marian Koncek -Date: Thu, 29 Aug 2019 15:18:53 +0200 -Subject: [PATCH] Port to hamcrest 2.1 - ---- - .../tests2/EasyMockSupportClassTest.java | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java b/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java -index c5dd63b..b8be307 100644 ---- a/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java -+++ b/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java -@@ -48,49 +48,49 @@ public class EasyMockSupportClassTest extends EasyMockSupport { - @Test - public void testCreateStrictControl() { - IMocksControl ctrl = createStrictControl(); -- assertThat(ctrl.createMock(ToMock.class), is(ToMock.class)); -+ assertThat(ctrl.createMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); - } - - @Test - public void testCreateControl() { - IMocksControl ctrl = createControl(); -- assertThat(ctrl.createMock(ToMock.class), is(ToMock.class)); -+ assertThat(ctrl.createMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); - } - - @Test - public void testCreateNiceControl() { - IMocksControl ctrl = createNiceControl(); -- assertThat(ctrl.createMock(ToMock.class), is(ToMock.class)); -+ assertThat(ctrl.createMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); - } - - @Test - public void testCreateStrictMockClassOfT() { -- assertThat(createStrictMock(ToMock.class), is(ToMock.class)); -+ assertThat(createStrictMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); - } - - @Test - public void testCreateStrictMockStringClassOfT() { -- assertThat(createStrictMock("myMock", ToMock.class), is(ToMock.class)); -+ assertThat(createStrictMock("myMock", ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); - } - - @Test - public void testCreateMockClassOfT() { -- assertThat(createMock(ToMock.class), is(ToMock.class)); -+ assertThat(createMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); - } - - @Test - public void testCreateMockStringClassOfT() { -- assertThat(createMock("myMock", ToMock.class), is(ToMock.class)); -+ assertThat(createMock("myMock", ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); - } - - @Test - public void testCreateNiceMockClassOfT() { -- assertThat(createNiceMock(ToMock.class), is(ToMock.class)); -+ assertThat(createNiceMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); - } - - @Test - public void testCreateNiceMockStringClassOfT() { -- assertThat(createNiceMock("myMock", ToMock.class), is(ToMock.class)); -+ assertThat(createNiceMock("myMock", ToMock.class), org.hamcrest.core.Is.isA(ToMock.class)); - } - - @Test --- -2.21.0 - diff --git a/easymock.spec b/easymock.spec index eadbda3..20ee9a9 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: easymock -Version: 4.3 +Version: 5.6.0 Release: %autorelease Summary: Easy mock objects License: Apache-2.0 @@ -15,16 +15,15 @@ Source0: %{name}-%{version}.tar.gz Source1: generate-tarball.sh Patch: 0001-Disable-android-support.patch -Patch: 0002-Unshade-cglib-and-asm.patch -Patch: 0003-Fix-OSGi-manifest.patch -Patch: 0004-Port-to-hamcrest-2.1.patch +# Forwarded: https://github.com/easymock/easymock/pull/807 +Patch: 0002-Migrate-from-deprecated-Hamcrest-is-to-isA.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local-openjdk25 -BuildRequires: mvn(cglib:cglib) BuildRequires: mvn(junit:junit) +BuildRequires: mvn(net.bytebuddy:byte-buddy) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform) @@ -54,6 +53,8 @@ So EasyMock is a perfect fit for Test-Driven Development. %autosetup -p1 -C +%pom_remove_plugin -r :maven-javadoc-plugin +%pom_remove_plugin -r :maven-source-plugin %pom_remove_plugin :license-maven-plugin %pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :animal-sniffer-maven-plugin @@ -71,7 +72,6 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java # unbundle asm and cglib %pom_disable_module test-nodeps -%pom_remove_plugin :maven-shade-plugin core # missing test deps %pom_disable_module test-integration @@ -80,9 +80,6 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java # remove some warning caused by unavailable plugin %pom_remove_plugin org.codehaus.mojo:versions-maven-plugin -# retired -%pom_remove_plugin :maven-timestamp-plugin - # For compatibility reasons %mvn_file ":easymock{*}" easymock@1 easymock3@1 diff --git a/sources b/sources index 5f72e52..65a1be4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (easymock-4.3.tar.gz) = 694219c948e3db85d75bd368440d24ddb575cc8bf7b436a2ef8cd7eeb8c9d173edfd2bf28bde2aea38587f7df4e50b290003b03e50f069520e5f474dec574fa7 +SHA512 (easymock-5.6.0.tar.gz) = a285cbfbd80eb6dad50f92a6bce7a494a06f8da33350bca41d5e7ead5a76219f5bbcf579e89be34525628bdc6c81b266db697ea2b1d6bf023759c294fd375329