From b58a89d51aeda47c112bbd305c6eb230906b60db Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sep 18 2017 07:15:12 +0000 Subject: Update to upstream version 3.5 --- diff --git a/0001-Disable-android-support.patch b/0001-Disable-android-support.patch new file mode 100644 index 0000000..208e85b --- /dev/null +++ b/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/0001-Port-to-maven-jar-plugin-3.0.0.patch b/0001-Port-to-maven-jar-plugin-3.0.0.patch deleted file mode 100644 index a5a882d..0000000 --- a/0001-Port-to-maven-jar-plugin-3.0.0.patch +++ /dev/null @@ -1,27 +0,0 @@ -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/0002-Disable-android-support.patch b/0002-Disable-android-support.patch deleted file mode 100644 index e4b65d3..0000000 --- a/0002-Disable-android-support.patch +++ /dev/null @@ -1,29 +0,0 @@ -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/0002-Unshade-cglib-and-asm.patch b/0002-Unshade-cglib-and-asm.patch new file mode 100644 index 0000000..93d3367 --- /dev/null +++ b/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/0003-Fix-OSGi-manifest.patch b/0003-Fix-OSGi-manifest.patch new file mode 100644 index 0000000..d4b3263 --- /dev/null +++ b/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/0003-Unshade-cglib-and-asm.patch b/0003-Unshade-cglib-and-asm.patch deleted file mode 100644 index 2ae8c91..0000000 --- a/0003-Unshade-cglib-and-asm.patch +++ /dev/null @@ -1,27 +0,0 @@ -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/0004-Fix-OSGi-manifest.patch b/0004-Fix-OSGi-manifest.patch deleted file mode 100644 index 7c0b04c..0000000 --- a/0004-Fix-OSGi-manifest.patch +++ /dev/null @@ -1,28 +0,0 @@ -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/easymock.spec b/easymock.spec index 79662c4..3611233 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,16 +1,15 @@ Name: easymock -Version: 3.4 -Release: 6%{?dist} +Version: 3.5 +Release: 1%{?dist} Summary: Easy mock objects License: ASL 2.0 URL: http://www.easymock.org Source0: https://github.com/%{name}/%{name}/archive/%{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 +Patch1: 0001-Disable-android-support.patch +Patch2: 0002-Unshade-cglib-and-asm.patch +Patch3: 0003-Fix-OSGi-manifest.patch BuildArch: noarch @@ -19,9 +18,12 @@ 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-testng) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) 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) @@ -50,7 +52,6 @@ Javadoc for %{name}. %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %pom_remove_plugin :maven-license-plugin @@ -95,6 +96,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java %changelog +* 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