From 92a64505b7fa3cbb2165a3111db23d80c6799158 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Tue, 11 Oct 2022 13:10:33 +0000 Subject: [PATCH] import easymock-4.2-8.module_el9+234+7cb71cfa --- .easymock.metadata | 2 + SOURCES/0001-Disable-android-support.patch | 29 ++ SOURCES/0002-Unshade-cglib-and-asm.patch | 27 ++ SOURCES/0003-Fix-OSGi-manifest.patch | 28 ++ SOURCES/0004-Port-to-hamcrest-2.1.patch | 75 +++++ SPECS/easymock.spec | 330 +++++++++++++++++++++ 6 files changed, 491 insertions(+) create mode 100644 .easymock.metadata create mode 100644 SOURCES/0001-Disable-android-support.patch create mode 100644 SOURCES/0002-Unshade-cglib-and-asm.patch create mode 100644 SOURCES/0003-Fix-OSGi-manifest.patch create mode 100644 SOURCES/0004-Port-to-hamcrest-2.1.patch create mode 100644 SPECS/easymock.spec diff --git a/.easymock.metadata b/.easymock.metadata new file mode 100644 index 0000000..247eecb --- /dev/null +++ b/.easymock.metadata @@ -0,0 +1,2 @@ +694e2b07ae50b780ba5c69191d53d7fede67b59c SOURCES/generate-tarball.sh +01c88efb013098238432986d3db7d6be5050aa43 SOURCES/easymock-4.2.tar.gz diff --git a/SOURCES/0001-Disable-android-support.patch b/SOURCES/0001-Disable-android-support.patch new file mode 100644 index 0000000..208e85b --- /dev/null +++ b/SOURCES/0001-Disable-android-support.patch @@ -0,0 +1,29 @@ +From 57501046dc32012210433444543c513b20c5d517 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 + +--- + 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 +--- 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, + return cached; + } + +- // ///CLOVER:OFF +- if (AndroidSupport.isAndroid()) { +- return classProxyFactory = new AndroidClassProxyFactory(); +- } +- // ///CLOVER:ON +- + return classProxyFactory = new ClassProxyFactory(); + } + +-- +2.13.5 + diff --git a/SOURCES/0002-Unshade-cglib-and-asm.patch b/SOURCES/0002-Unshade-cglib-and-asm.patch new file mode 100644 index 0000000..93d3367 --- /dev/null +++ b/SOURCES/0002-Unshade-cglib-and-asm.patch @@ -0,0 +1,27 @@ +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/SOURCES/0003-Fix-OSGi-manifest.patch b/SOURCES/0003-Fix-OSGi-manifest.patch new file mode 100644 index 0000000..d4b3263 --- /dev/null +++ b/SOURCES/0003-Fix-OSGi-manifest.patch @@ -0,0 +1,28 @@ +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/SOURCES/0004-Port-to-hamcrest-2.1.patch b/SOURCES/0004-Port-to-hamcrest-2.1.patch new file mode 100644 index 0000000..542db7e --- /dev/null +++ b/SOURCES/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/SPECS/easymock.spec b/SPECS/easymock.spec new file mode 100644 index 0000000..6c236ff --- /dev/null +++ b/SPECS/easymock.spec @@ -0,0 +1,330 @@ +%bcond_with bootstrap + +Name: easymock +Version: 4.2 +Release: 8%{?dist} +Summary: Easy mock objects +License: ASL 2.0 +URL: http://www.easymock.org + +# ./generate-tarball.sh +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 + +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch + +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local +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-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) +%endif +# xmvn-builddep misses this: +%if %{without bootstrap} +BuildRequires: mvn(org.apache:apache-jar-resource-bundle) +%endif + + +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} + +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 + +%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 + +%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 +%pom_disable_module test-android +%pom_remove_dep :dexmaker core + +# unbundle asm and cglib +%pom_disable_module test-nodeps +%pom_remove_plugin :maven-shade-plugin core + +# missing test deps +%pom_disable_module test-integration +%pom_disable_module test-osgi + +# 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 + +# 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 + +# Workaround Java 17 compatibility issue that should be fixed in +# easymock 4.4: https://github.com/easymock/easymock/issues/274 +%pom_xpath_inject "pom:plugin[pom:artifactId='maven-surefire-plugin']/pom:configuration" \ + "--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED" core +%pom_xpath_inject "pom:plugin[pom:artifactId='maven-surefire-plugin']/pom:configuration" \ + "--add-opens=java.base/java.lang=ALL-UNNAMED" test-testng +%pom_add_plugin :maven-surefire-plugin test-java8 " + --add-opens=java.base/java.lang=ALL-UNNAMED" +%pom_add_plugin :maven-surefire-plugin test-junit5 " + --add-opens=java.base/java.lang=ALL-UNNAMED" + +%build +%mvn_build + +%install +%mvn_install + +%files -f .mfiles +%license core/LICENSE.txt + +%files javadoc -f .mfiles-javadoc +%license core/LICENSE.txt + +%changelog +* 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