.gitignore

@@ -12,4 +12,3 @@
 /easymock-4.0.2.tar.gz
 /easymock-4.2.tar.gz
 /easymock-4.3.tar.gz
-/easymock-5.6.0.tar.gz

0001-Disable-android-support.patch

@@ -1,17 +1,17 @@
-From 3458c2cd3d453dbb866c9515568b288529af05a5 Mon Sep 17 00:00:00 2001
+From 57501046dc32012210433444543c513b20c5d517 Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Mon, 30 May 2016 14:24:43 +0200
-Subject: [PATCH 1/2] Disable android support
+Subject: [PATCH 1/3] 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 b86f1a1..cfa0fa1 100644
+index fb2a5dc..356b1c4 100644
 --- a/core/src/main/java/org/easymock/internal/MocksControl.java
 +++ b/core/src/main/java/org/easymock/internal/MocksControl.java
-@@ -154,12 +154,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters<Object>,
+@@ -147,12 +147,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters<Object>,
              return cached;
          }
  
@@ -25,5 +25,5 @@ index b86f1a1..cfa0fa1 100644
      }
  
 -- 
-2.51.0
+2.13.5
 

0002-Migrate-from-deprecated-Hamcrest-is-to-isA.patch

@@ -1,94 +0,0 @@
-From 9c100b4d67397bd096de6caaef58cd8c9f49c692 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-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
-

0002-Unshade-cglib-and-asm.patch

@@ -0,0 +1,27 @@
+From 2ad2e79989f64072d8437ada55b12eaa8c23834d Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek@redhat.com>
+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 @@
+         <extensions>true</extensions>
+         <configuration>
+           <instructions>
+-            <Export-Package>org.easymock.internal.*;poweruser=true;mandatory:=poweruser,org.easymock,org.easymock.cglib.core,org.easymock.cglib.proxy,org.easymock.cglib.reflect,org.easymock.asm</Export-Package>
+-            <Import-Package>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</Import-Package>
++            <Export-Package>org.easymock.internal.*;poweruser=true;mandatory:=poweruser</Export-Package>
++            <Import-Package>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</Import-Package>
+           </instructions>
+         </configuration>
+         <executions>
+-- 
+2.13.5
+

0003-Fix-OSGi-manifest.patch

@@ -0,0 +1,28 @@
+From fa908a1748cb3090d677a63db4986ffc57acbf1e Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+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 @@
+         <extensions>true</extensions>
+         <configuration>
+           <instructions>
+-            <Export-Package>org.easymock.internal.*;poweruser=true;mandatory:=poweruser</Export-Package>
++            <Export-Package>org.easymock,org.easymock.internal.*;poweruser=true;mandatory:=poweruser</Export-Package>
+             <Import-Package>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</Import-Package>
++	    <_nouses>true</_nouses>
+           </instructions>
+         </configuration>
+         <executions>
+-- 
+2.13.5
+

0004-Port-to-hamcrest-2.1.patch

@@ -0,0 +1,75 @@
+From 5393d71f7bf9de06efd763c501486bf14413ab4a Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+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
+

changelog

@@ -1,230 +0,0 @@
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.3-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Fri May 31 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.3-9
-- Switch to a newer patch macro syntax
-
-* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 4.3-8
-- Rebuilt for java-21-openjdk as system jdk
-
-* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 4.3-7
-- bump of release for for java-21-openjdk as system jdk
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.3-4
-- Convert License tag to SPDX format
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Sep 08 2022 Marian Koncek <mkoncek@redhat.com> - 4.3-1
-- Update to upstream version 4.3
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 4.2-7
-- Rebuilt for java-17-openjdk as system jdk
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2-5
-- Workaround build issue with OpenJDK 17
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2-3
-- Bootstrap build
-- Non-bootstrap build
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Aug 31 2020 Fabio Valentini <decathorpe@gmail.com> - 4.2-1
-- Update to version 4.2.
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.6-6
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Wed Mar 04 2020 Marian Koncek <mkoncek@redhat.com> - 4.2-1
-- Update to upstream version 4.2
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.0.2-2
-- Mass rebuild for javapackages-tools 201902
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jul 18 2019 Marian Koncek <mkoncek@redhat.com> - 4.0.2-1
-- Update to upstream version 4.0.2
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5-5
-- Mass rebuild for javapackages-tools 201901
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Nov 30 2018 Mat Booth <mat.booth@redhat.com> - 3.6-2
-- Rebuild to fix OSGi dependency on ASM 7
-
-* Mon Oct  8 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6-1
-- Update to upstream version 3.6
-
-* Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 3.5-4
-- Repack the tarball without binaries
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Sep 18 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5-1
-- Update to upstream version 3.5
-
-* Fri Sep 15 2017 Mat Booth <mat.booth@redhat.com> - 3.4-6
-- Regenerate OSGi metadata due to Objectweb ASM upgrade
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Thu Feb 23 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4-4
-- Add missing BR on apache-resource-bundles
-
-* Tue Feb 07 2017 Michael Simacek <msimacek@redhat.com> - 3.4-3
-- Remove useless license-plugin
-
-* Wed Jun  1 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4-2
-- Fix OSGi manifest
-- Resolves: rhbz#1341052
-
-* Mon May 30 2016 Michael Simacek <msimacek@redhat.com> - 3.4-1
-- Update to upstream version 3.4
-
-* Mon May 30 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.1-5
-- Port to maven-jar-plugin 3.0.0
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Jul 13 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.1-3
-- Obsolete easymock2
-- Resolves: rhbz#1172958
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue May 5 2015 Alexander Kurtakov <akurtako@redhat.com> 3.3.1-1
-- Update to upstream 3.3.1 release.
-
-* Sat Mar 07 2015 Michael Simacek <msimacek@redhat.com> - 3.3-2
-- Remove retired maven-timestamp-plugin
-
-* Tue Nov 25 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3-1
-- Update to upstream version 3.3
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.2-2
-- Use Requires: java-headless rebuild (#1067528)
-
-* Fri Aug 30 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:3.2-1
-- Update to upstream version 3.2
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Mon Feb 18 2013 Tomas Radej <tradej@redhat.com> - 0:1.2-20
-- Fixed sources (bz #905973)
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Tue Nov 27 2012 Tomas Radej <tradej@redhat.com> - 0:1.2-18
-- Removed ownership of _mavenpomdir
-
-* Thu Aug 16 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.2-17
-- Add LICENSE file
-- Remove rpm bug workaround
-- Update to current packaging guidelines
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue Feb 21 2012 Tomas Radej <tradej@redhat.com> - 0:1.2-15
-- Removed test
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Fri Nov 26 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 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 <akurtako@redhat.com> 0:1.2-11
-- Bump release for rebuild.
-
-* Thu Aug 20 2009 Alexander Kurtakov <akurtako@redhat.com> 0:1.2-10
-- Disable tests.
-
-* Mon May 18 2009 Fernando Nasser <fnasser@redhat.com> 0:1.2-9
-- Update instructions for obtaining source tar ball
-
-* Mon May 04 2009 Yong Yang <yyang@redhat.com> 0:1.2-8
-- Rebuild with maven2-2.0.8 built in non-bootstrap mode
-
-* Wed Mar 18 2009 Yong Yang <yyang@redhat.com>  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 <dwalluck@redhat.com> 0:1.2-6
-- fix component-info.xml
-
-* Mon Feb 02 2009 David Walluck <dwalluck@redhat.com> 0:1.2-5
-- remove unneeded maven flag
-
-* Mon Feb 02 2009 David Walluck <dwalluck@redhat.com> 0:1.2-4
-- add repolib
-
-* Fri Jan 30 2009 Will Tatam <will.tatam@red61.com> 1.2-3.jpp5
-- Inital JPP-5 Build
-
-* Fri Jan 09 2009 Yong Yang <yyang@redhat.com> 1.2-2jpp.1
-- Imported from dbhole's maven 2.0.8 packages, initial building on jpp6
-
-* Fri Apr 11 2008 Deepak Bhole <dbhole@redhat.com> 1.2-1jpp.1
-- Import from JPackage
-- Add pom file
-
-* Fri Feb 24 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.2-1jpp
-- Update to 1.2 keeping only java 1.4 requirement
-
-* Fri Feb 24 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.1-3jpp
-- drop java-1.3.1 requirement
-
-* Mon Oct 04 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.1-2jpp
-- Fixed Url, Summary, Description and License
-
-* Mon Oct 04 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.1-1jpp
-- First JPackage release

easymock.spec

@@ -1,29 +1,31 @@
 %bcond_with bootstrap
 
 Name:           easymock
-Version:        5.6.0
-Release:        %autorelease
+Version:        4.3
+Release:        2%{?dist}
 Summary:        Easy mock objects
-License:        Apache-2.0
+License:        ASL 2.0
 URL:            https://www.easymock.org
-BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
 
 # ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
 # Remove bundled binaries which cannot be easily verified for licensing
 Source1:        generate-tarball.sh
 
-Patch:          0001-Disable-android-support.patch
-# Forwarded: https://github.com/easymock/easymock/pull/807
-Patch:          0002-Migrate-from-deprecated-Hamcrest-is-to-isA.patch
+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
+
+BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local-openjdk25
+BuildRequires:  maven-local
+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)
@@ -35,12 +37,11 @@ BuildRequires:  mvn(org.objenesis:objenesis)
 BuildRequires:  mvn(org.ow2.asm:asm)
 BuildRequires:  mvn(org.testng:testng)
 %endif
-%if %{without bootstrap}
 # xmvn-builddep misses this:
+%if %{without bootstrap}
 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
@@ -49,12 +50,20 @@ 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:        Javadoc for %{name}
+
+%description javadoc
+Javadoc for %{name}.
+
 %prep
-%autosetup -p1 -C
+%setup -q -n %{name}-%{name}-%{version}
 
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
-%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
@@ -72,6 +81,7 @@ 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,6 +90,9 @@ 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
 
@@ -102,7 +115,7 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java
     <argLine>--add-opens=java.base/java.lang=ALL-UNNAMED</argLine></configuration>"
 
 %build
-%mvn_build -j
+%mvn_build
 
 %install
 %mvn_install
@@ -110,5 +123,213 @@ 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
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Sep 08 2022 Marian Koncek <mkoncek@redhat.com> - 4.3-1
+- Update to upstream version 4.3
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 4.2-7
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2-5
+- Workaround build issue with OpenJDK 17
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2-3
+- Bootstrap build
+- Non-bootstrap build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Aug 31 2020 Fabio Valentini <decathorpe@gmail.com> - 4.2-1
+- Update to version 4.2.
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.6-6
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Wed Mar 04 2020 Marian Koncek <mkoncek@redhat.com> - 4.2-1
+- Update to upstream version 4.2
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.0.2-2
+- Mass rebuild for javapackages-tools 201902
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jul 18 2019 Marian Koncek <mkoncek@redhat.com> - 4.0.2-1
+- Update to upstream version 4.0.2
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5-5
+- Mass rebuild for javapackages-tools 201901
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Nov 30 2018 Mat Booth <mat.booth@redhat.com> - 3.6-2
+- Rebuild to fix OSGi dependency on ASM 7
+
+* Mon Oct  8 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6-1
+- Update to upstream version 3.6
+
+* Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 3.5-4
+- Repack the tarball without binaries
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Sep 18 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5-1
+- Update to upstream version 3.5
+
+* Fri Sep 15 2017 Mat Booth <mat.booth@redhat.com> - 3.4-6
+- Regenerate OSGi metadata due to Objectweb ASM upgrade
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Feb 23 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4-4
+- Add missing BR on apache-resource-bundles
+
+* Tue Feb 07 2017 Michael Simacek <msimacek@redhat.com> - 3.4-3
+- Remove useless license-plugin
+
+* Wed Jun  1 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4-2
+- Fix OSGi manifest
+- Resolves: rhbz#1341052
+
+* Mon May 30 2016 Michael Simacek <msimacek@redhat.com> - 3.4-1
+- Update to upstream version 3.4
+
+* Mon May 30 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.1-5
+- Port to maven-jar-plugin 3.0.0
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Jul 13 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.1-3
+- Obsolete easymock2
+- Resolves: rhbz#1172958
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue May 5 2015 Alexander Kurtakov <akurtako@redhat.com> 3.3.1-1
+- Update to upstream 3.3.1 release.
+
+* Sat Mar 07 2015 Michael Simacek <msimacek@redhat.com> - 3.3-2
+- Remove retired maven-timestamp-plugin
+
+* Tue Nov 25 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3-1
+- Update to upstream version 3.3
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.2-2
+- Use Requires: java-headless rebuild (#1067528)
+
+* Fri Aug 30 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:3.2-1
+- Update to upstream version 3.2
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Mon Feb 18 2013 Tomas Radej <tradej@redhat.com> - 0:1.2-20
+- Fixed sources (bz #905973)
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Tue Nov 27 2012 Tomas Radej <tradej@redhat.com> - 0:1.2-18
+- Removed ownership of _mavenpomdir
+
+* Thu Aug 16 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.2-17
+- Add LICENSE file
+- Remove rpm bug workaround
+- Update to current packaging guidelines
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Feb 21 2012 Tomas Radej <tradej@redhat.com> - 0:1.2-15
+- Removed test
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Nov 26 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 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 <akurtako@redhat.com> 0:1.2-11
+- Bump release for rebuild.
+
+* Thu Aug 20 2009 Alexander Kurtakov <akurtako@redhat.com> 0:1.2-10
+- Disable tests.
+
+* Mon May 18 2009 Fernando Nasser <fnasser@redhat.com> 0:1.2-9
+- Update instructions for obtaining source tar ball
+
+* Mon May 04 2009 Yong Yang <yyang@redhat.com> 0:1.2-8
+- Rebuild with maven2-2.0.8 built in non-bootstrap mode
+
+* Wed Mar 18 2009 Yong Yang <yyang@redhat.com>  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 <dwalluck@redhat.com> 0:1.2-6
+- fix component-info.xml
+
+* Mon Feb 02 2009 David Walluck <dwalluck@redhat.com> 0:1.2-5
+- remove unneeded maven flag
+
+* Mon Feb 02 2009 David Walluck <dwalluck@redhat.com> 0:1.2-4
+- add repolib
+
+* Fri Jan 30 2009 Will Tatam <will.tatam@red61.com> 1.2-3.jpp5
+- Inital JPP-5 Build
+
+* Fri Jan 09 2009 Yong Yang <yyang@redhat.com> 1.2-2jpp.1
+- Imported from dbhole's maven 2.0.8 packages, initial building on jpp6
+
+* Fri Apr 11 2008 Deepak Bhole <dbhole@redhat.com> 1.2-1jpp.1
+- Import from JPackage
+- Add pom file
+
+* Fri Feb 24 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.2-1jpp
+- Update to 1.2 keeping only java 1.4 requirement
+
+* Fri Feb 24 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.1-3jpp
+- drop java-1.3.1 requirement
+
+* Mon Oct 04 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.1-2jpp
+- Fixed Url, Summary, Description and License
+
+* Mon Oct 04 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.1-1jpp
+- First JPackage release

plans/javapackages.fmf

@@ -1,7 +1,7 @@
 summary: Run javapackages-specific tests
 discover:
   how: fmf
-  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
-  ref: f43
+  url: https://src.fedoraproject.org/tests/javapackages
+  ref: f37
 execute:
   how: tmt

sources

@@ -1 +1 @@
-SHA512 (easymock-5.6.0.tar.gz) = a285cbfbd80eb6dad50f92a6bce7a494a06f8da33350bca41d5e7ead5a76219f5bbcf579e89be34525628bdc6c81b266db697ea2b1d6bf023759c294fd375329
+SHA512 (easymock-4.3.tar.gz) = 694219c948e3db85d75bd368440d24ddb575cc8bf7b436a2ef8cd7eeb8c9d173edfd2bf28bde2aea38587f7df4e50b290003b03e50f069520e5f474dec574fa7