diff --git a/fix-incompatible-types.patch b/fix-incompatible-types.patch deleted file mode 100644 index 10adc69..0000000 --- a/fix-incompatible-types.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/org/mockito/internal/creation/instance/ObjenesisInstantiator.java b/src/org/mockito/internal/creation/instance/ObjenesisInstantiator.java -index 1ca0003..15172bd 100644 ---- a/src/org/mockito/internal/creation/instance/ObjenesisInstantiator.java -+++ b/src/org/mockito/internal/creation/instance/ObjenesisInstantiator.java -@@ -11,6 +11,6 @@ class ObjenesisInstantiator implements Instantiator { - private final ObjenesisStd objenesis = new ObjenesisStd(new GlobalConfiguration().enableClassCache()); - - public T newInstance(Class cls) { -- return objenesis.newInstance(cls); -+ return (T) objenesis.newInstance(cls); - } - } diff --git a/mockito.spec b/mockito.spec index ba0fc39..13485c0 100644 --- a/mockito.spec +++ b/mockito.spec @@ -11,10 +11,6 @@ Patch0001: fix-bnd-config.patch Patch0002: fixup-ant-script.patch # fix build error Patch0003: mockito-matcher.patch -# Workaround for NPE in setting NamingPolicy in cglib -Patch0004: setting-naming-policy.patch -# because we have old objenesis -Patch0005: fix-incompatible-types.patch BuildArch: noarch BuildRequires: javapackages-local java-devel ant objenesis cglib BuildRequires: junit hamcrest aqute-bnd dos2unix @@ -41,8 +37,6 @@ dos2unix `find -name *.java` %patch0001 -p1 %patch0002 -p1 %patch0003 -p1 -%patch0004 -p1 -%patch0005 -p1 %pom_add_dep net.sf.cglib:cglib:3.1 maven/mockito-core.pom find . -name "*.java" -exec sed -i "s|org\.mockito\.cglib|net\.sf\.cglib|g" {} + install -d lib/compile @@ -73,5 +67,8 @@ sed -i -e "s|@version@|1.10.19|g" maven/mockito-core.pom %doc NOTICE %changelog +* Thu Apr 23 2020 wutao 1.10.19-19 +* delete useless patches + * Thu Apr 2 2020 gulining - 1.10.19-18 - Package init diff --git a/setting-naming-policy.patch b/setting-naming-policy.patch deleted file mode 100644 index d4f30b1..0000000 --- a/setting-naming-policy.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 04e36a01e93c3b79caa9f7e9e8573fe2a0d65d1a Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Thu, 5 Dec 2013 16:53:36 +0100 -Subject: [PATCH] Setting naming policy - -Signed-off-by: Michael Simacek ---- - src/org/mockito/internal/creation/cglib/CGLIBHacker.java | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/org/mockito/internal/creation/cglib/CGLIBHacker.java b/src/org/mockito/internal/creation/cglib/CGLIBHacker.java -index 172f744..de53ab1 100644 ---- a/src/org/mockito/internal/creation/cglib/CGLIBHacker.java -+++ b/src/org/mockito/internal/creation/cglib/CGLIBHacker.java -@@ -20,6 +20,9 @@ public class CGLIBHacker implements Serializable { - Field createInfoField = reflectOnCreateInfo(methodProxy); - createInfoField.setAccessible(true); - Object createInfo = createInfoField.get(methodProxy); -+ if (createInfo == null) { -+ return; -+ } - Field namingPolicyField = createInfo.getClass().getDeclaredField("namingPolicy"); - namingPolicyField.setAccessible(true); - if (namingPolicyField.get(createInfo) == null) { -@@ -43,4 +46,4 @@ public class CGLIBHacker implements Serializable { - } - return cglibMethodProxyClass.getDeclaredField("createInfo"); - } --} -\ No newline at end of file -+} --- -1.8.3.1 -