diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ac7d6d1 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/easymock-3.4.tar.gz diff --git a/.rh-maven35-easymock.metadata b/.rh-maven35-easymock.metadata new file mode 100644 index 0000000..7e2be3a --- /dev/null +++ b/.rh-maven35-easymock.metadata @@ -0,0 +1 @@ +4c38e2c6ce612e4fcf5174252f60dd455c348d27 SOURCES/easymock-3.4.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-Port-to-maven-jar-plugin-3.0.0.patch b/SOURCES/0001-Port-to-maven-jar-plugin-3.0.0.patch new file mode 100644 index 0000000..a5a882d --- /dev/null +++ b/SOURCES/0001-Port-to-maven-jar-plugin-3.0.0.patch @@ -0,0 +1,27 @@ +From c68c40a586dc187e5f004a0279f143b278b81cd6 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 30 May 2016 10:45:16 +0200 +Subject: [PATCH 1/4] Port to maven-jar-plugin 3.0.0 + +--- + pom.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pom.xml b/pom.xml +index db33e5b..df2c483 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -339,9 +339,9 @@ + + maven-jar-plugin + +- true + + true ++ ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + true + true +-- +2.5.5 + diff --git a/SOURCES/0002-Disable-android-support.patch b/SOURCES/0002-Disable-android-support.patch new file mode 100644 index 0000000..e4b65d3 --- /dev/null +++ b/SOURCES/0002-Disable-android-support.patch @@ -0,0 +1,29 @@ +From 1422eddacbbe4ca5614794ebb7ba8779ce2718f2 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Mon, 30 May 2016 14:24:43 +0200 +Subject: [PATCH 2/4] 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 6ae65d1..d5937b0 100644 +--- a/core/src/main/java/org/easymock/internal/MocksControl.java ++++ b/core/src/main/java/org/easymock/internal/MocksControl.java +@@ -141,12 +141,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.5.5 + diff --git a/SOURCES/0003-Unshade-cglib-and-asm.patch b/SOURCES/0003-Unshade-cglib-and-asm.patch new file mode 100644 index 0000000..2ae8c91 --- /dev/null +++ b/SOURCES/0003-Unshade-cglib-and-asm.patch @@ -0,0 +1,27 @@ +From 1f0a742506d9d6270607158d91f9939089a1b731 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Mon, 30 May 2016 15:14:40 +0200 +Subject: [PATCH 3/4] 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 00e1575..2fa5653 100644 +--- a/core/pom.xml ++++ b/core/pom.xml +@@ -87,8 +87,8 @@ + maven-bundle-plugin + + +- 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.5.5 + diff --git a/SOURCES/0004-Fix-OSGi-manifest.patch b/SOURCES/0004-Fix-OSGi-manifest.patch new file mode 100644 index 0000000..7c0b04c --- /dev/null +++ b/SOURCES/0004-Fix-OSGi-manifest.patch @@ -0,0 +1,28 @@ +From a228c98f921520577d9563b0a330f7af4f19b66c Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Wed, 1 Jun 2016 09:31:44 +0200 +Subject: [PATCH 4/4] 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 2fa5653..73c4d94 100644 +--- a/core/pom.xml ++++ b/core/pom.xml +@@ -87,8 +87,9 @@ + maven-bundle-plugin + + +- 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.5.5 + diff --git a/SPECS/easymock.spec b/SPECS/easymock.spec new file mode 100644 index 0000000..52759e2 --- /dev/null +++ b/SPECS/easymock.spec @@ -0,0 +1,223 @@ +%{?scl:%scl_package easymock} +%{!?scl:%global pkg_name %{name}} + +Name: %{?scl_prefix}easymock +Version: 3.4 +Release: 4.2%{?dist} +Summary: Easy mock objects +License: ASL 2.0 +URL: http://www.easymock.org + +Source0: https://github.com/%{pkg_name}/%{pkg_name}/archive/%{pkg_name}-%{version}.tar.gz + +Patch1: 0001-Port-to-maven-jar-plugin-3.0.0.patch +Patch2: 0002-Disable-android-support.patch +Patch3: 0003-Unshade-cglib-and-asm.patch +Patch4: 0004-Fix-OSGi-manifest.patch + +BuildArch: noarch + +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix}mvn(cglib:cglib) +BuildRequires: %{?scl_prefix}mvn(junit:junit) +BuildRequires: %{?scl_prefix}mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.plugins:maven-remote-resources-plugin) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: %{?scl_prefix}mvn(org.objenesis:objenesis) +BuildRequires: %{?scl_prefix}mvn(org.ow2.asm:asm) +# xmvn-builddep misses this: +BuildRequires: %{?scl_prefix}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 %{pkg_name} + +%description javadoc +Javadoc for %{pkg_name}. + +%prep +%setup -q -n %{pkg_name}-%{pkg_name}-%{version} + +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 + +%pom_remove_plugin :maven-license-plugin + +# 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 + +%build +%mvn_build + +%install +%mvn_install + +%files -f .mfiles +%license core/LICENSE.txt + +%files javadoc -f .mfiles-javadoc +%license core/LICENSE.txt + +%changelog +* Thu Jun 22 2017 Michael Simacek - 3.4-4.2 +- Mass rebuild 2017-06-22 + +* Wed Jun 21 2017 Java Maintainers - 3.4-4.1 +- Automated package import and SCL-ization + +* 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