From cd3b89969a888161a5ce052a4ae7ffd07d6a1760 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:55:38 +0000 Subject: [PATCH 01/10] Remove Obsoletes --- easymock.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/easymock.spec b/easymock.spec index 26ec055..aee2cf6 100644 --- a/easymock.spec +++ b/easymock.spec @@ -30,9 +30,7 @@ BuildRequires: mvn(org.testng:testng) # xmvn-builddep misses this: BuildRequires: mvn(org.apache:apache-jar-resource-bundle) -Obsoletes: %{name}3 < 3.4 Provides: %{name}3 = %{version}-%{release} -Obsoletes: %{name}2 < 2.5.2-10 %description From c578fc32812077c5eadd456e1fa28d7c39cd30ba Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:29 +0200 Subject: [PATCH 02/10] Mass rebuild for javapackages-tools 201901 --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index aee2cf6..b8f7d5a 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 3.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -97,6 +97,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog +* Fri May 24 2019 Mikolaj Izdebski - 3.5-5 +- Mass rebuild for javapackages-tools 201901 + * Tue Jul 31 2018 Michael Simacek - 3.5-4 - Repack the tarball without binaries From fa943ad03f368c553ac932a4a167d8db7d60022b Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 18 Jul 2019 09:58:26 +0200 Subject: [PATCH 03/10] Update to upstream version 4.0.2 --- .gitignore | 1 + easymock.spec | 17 +++++++++-------- sources | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 9f1347b..0cbacf3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ easymock-1.2-src.tar.gz /easymock-3.3.1.tar.gz /easymock-3.4.tar.gz /easymock-3.5.tar.gz +/easymock-4.0.2.tar.gz diff --git a/easymock.spec b/easymock.spec index b8f7d5a..6d9f479 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock -Version: 3.5 -Release: 5%{?dist} +Version: 4.0.2 +Release: 1%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -32,21 +32,18 @@ BuildRequires: mvn(org.apache:apache-jar-resource-bundle) Provides: %{name}3 = %{version}-%{release} - %description EasyMock provides Mock Objects for interfaces in JUnit tests by generating 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 %setup -q -n %{name}-%{name}-%{version} @@ -54,7 +51,10 @@ Javadoc for %{name}. %patch2 -p1 %patch3 -p1 -%pom_remove_plugin :maven-license-plugin +%pom_remove_plugin :license-maven-plugin +%pom_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :animal-sniffer-maven-plugin core # remove android support rm core/src/main/java/org/easymock/internal/Android*.java @@ -88,15 +88,16 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %install %mvn_install - %files -f .mfiles %license core/LICENSE.txt %files javadoc -f .mfiles-javadoc %license core/LICENSE.txt - %changelog +* 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 diff --git a/sources b/sources index 66e9671..1ef16d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (easymock-3.5.tar.gz) = fea9d14a880311f7b9ba372356af26084c07c95cbf331ee90a8e8d928c6176b59c17ff9838ce49589264feb06837c2f361b04a0428e6a3bd74ff75b076a16279 +SHA512 (easymock-4.0.2.tar.gz) = ee6bb5dfd7dbfe92cf09089cf928be4e333c106750a1bd54624ba42693e90d35e07b9d2201c528a26b02cec35b136733ac48248bf66ebfec5ae35e89a48db3ec From a3eda01c72148c1e21b536515ab11bbe628a1dc9 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 29 Aug 2019 15:42:46 +0200 Subject: [PATCH 04/10] Port to hamcrest 2.1 --- 0004-Port-to-hamcrest-2.1.patch | 75 +++++++++++++++++++++++++++++++++ easymock.spec | 2 + 2 files changed, 77 insertions(+) create mode 100644 0004-Port-to-hamcrest-2.1.patch diff --git a/0004-Port-to-hamcrest-2.1.patch b/0004-Port-to-hamcrest-2.1.patch new file mode 100644 index 0000000..542db7e --- /dev/null +++ b/0004-Port-to-hamcrest-2.1.patch @@ -0,0 +1,75 @@ +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 6d9f479..a32a9bf 100644 --- a/easymock.spec +++ b/easymock.spec @@ -13,6 +13,7 @@ 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 BuildArch: noarch @@ -50,6 +51,7 @@ Javadoc for %{name}. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %pom_remove_plugin :license-maven-plugin %pom_remove_plugin :maven-enforcer-plugin From 69199fe2369b04bf1a27ba63342057ae88c27fc1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 05/10] Mass rebuild for javapackages-tools 201902 --- easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index a32a9bf..9549f0e 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock Version: 4.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -97,6 +97,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 4.0.2-2 +- Mass rebuild for javapackages-tools 201902 + * Thu Jul 18 2019 Marian Koncek - 4.0.2-1 - Update to upstream version 4.0.2 From 56cbd27e76361b65219fd268654d6ab545f85c55 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 27 Jan 2020 16:21:37 +0100 Subject: [PATCH 06/10] Properly compress taballs --- generate-tarball.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generate-tarball.sh b/generate-tarball.sh index 3d5fe1e..cd9e1f7 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -9,7 +9,7 @@ wget "https://github.com/${name}/${name}/archive/${name}-${version}.tar.gz" -O " rm -rf tarball-tmp mkdir tarball-tmp -cd tarball-tmp +pushd tarball-tmp tar xf "../${name}-${version}.orig.tar.gz" # CLEAN TARBALL @@ -18,6 +18,6 @@ find -name '*.class' -delete # Contains minified js of uncertain origin rm -r */website -tar cf "../${name}-${version}.tar.gz" * -cd .. +tar -czf "../${name}-${version}.tar.gz" * +popd rm -r tarball-tmp "${name}-${version}.orig.tar.gz" From c0aa6e11caf336d5fc79de883a4459863f905eea Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 9 Mar 2020 13:07:35 +0100 Subject: [PATCH 07/10] Update to upstream version 4.2 --- .gitignore | 1 + easymock.spec | 16 +++++++++++++--- sources | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0cbacf3..380682d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ easymock-1.2-src.tar.gz /easymock-3.4.tar.gz /easymock-3.5.tar.gz /easymock-4.0.2.tar.gz +/easymock-4.2.tar.gz diff --git a/easymock.spec b/easymock.spec index 9549f0e..2195bc1 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,6 +1,6 @@ Name: easymock -Version: 4.0.2 -Release: 2%{?dist} +Version: 4.2 +Release: 1%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org @@ -22,15 +22,18 @@ BuildRequires: mvn(cglib:cglib) BuildRequires: mvn(junit:junit) 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-junit47) +BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform) BuildRequires: mvn(org.apache.maven.surefire:surefire-testng) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter) +BuildRequires: mvn(org.junit.vintage:junit-vintage-engine) BuildRequires: mvn(org.objenesis:objenesis) BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.testng:testng) # xmvn-builddep misses this: BuildRequires: mvn(org.apache:apache-jar-resource-bundle) + Provides: %{name}3 = %{version}-%{release} %description @@ -58,6 +61,10 @@ Javadoc for %{name}. %pom_remove_plugin :animal-sniffer-maven-plugin %pom_remove_plugin :animal-sniffer-maven-plugin core +%pom_remove_plugin :maven-gpg-plugin test-testng +%pom_remove_plugin :maven-gpg-plugin test-java8 +%pom_remove_plugin :maven-gpg-plugin test-junit5 + # remove android support rm core/src/main/java/org/easymock/internal/Android*.java rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java @@ -97,6 +104,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %license core/LICENSE.txt %changelog +* Wed Mar 04 2020 Marian Koncek - 4.2-1 +- Update to upstream version 4.2 + * Tue Nov 05 2019 Mikolaj Izdebski - 4.0.2-2 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index 1ef16d1..b7b960d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (easymock-4.0.2.tar.gz) = ee6bb5dfd7dbfe92cf09089cf928be4e333c106750a1bd54624ba42693e90d35e07b9d2201c528a26b02cec35b136733ac48248bf66ebfec5ae35e89a48db3ec +SHA512 (easymock-4.2.tar.gz) = f5bb5cf7a99ac8819c9b8ac9ab587a4526ce7febd442d128241c8a2c6ace5e47226881e42f492db98617ee6c2a8e3edf588f6595142b93fec512f9ba5e972dca From 964e53d6aaf4f95ef9a7dd58d752ae0e555c01c7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 18 May 2020 18:16:33 +0200 Subject: [PATCH 08/10] Force Surefire to run tests with JUnit, not with TestNG --- easymock.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/easymock.spec b/easymock.spec index 2195bc1..3abcf0a 100644 --- a/easymock.spec +++ b/easymock.spec @@ -91,6 +91,10 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java # ssh not needed during our builds %pom_xpath_remove pom:extensions +# Force Surefire to run tests with JUnit, not with TestNG +%pom_xpath_inject "pom:plugin[pom:artifactId='maven-surefire-plugin']" \ + "none:none" core + %build %mvn_build From 2a189d51b7d5141b1cea931e9206182ea2a50044 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 09/10] Conditionalize buildrequires in bootstrap mode --- easymock.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/easymock.spec b/easymock.spec index 3abcf0a..a0303ec 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: easymock Version: 4.2 Release: 1%{?dist} @@ -18,6 +20,9 @@ Patch4: 0004-Port-to-hamcrest-2.1.patch BuildArch: noarch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(cglib:cglib) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -30,8 +35,11 @@ BuildRequires: mvn(org.junit.vintage:junit-vintage-engine) BuildRequires: mvn(org.objenesis:objenesis) BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.testng:testng) +%endif # xmvn-builddep misses this: +%if %{without bootstrap} BuildRequires: mvn(org.apache:apache-jar-resource-bundle) +%endif Provides: %{name}3 = %{version}-%{release} From 98162a0440f2f99a7bb062d9372523d3703b8738 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 10/10] Turn off bootstrap mode by default --- easymock.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easymock.spec b/easymock.spec index a0303ec..a295070 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: easymock Version: 4.2