From 5e17a85578129419f270c74e62d8a705f79b91c2 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Fri, 18 Sep 2015 18:43:40 -0500 Subject: mockito: add new package to [pcr] --- pcr/mockito/mockito-use_system_libraries.patch | 100 +++++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 pcr/mockito/mockito-use_system_libraries.patch (limited to 'pcr/mockito/mockito-use_system_libraries.patch') diff --git a/pcr/mockito/mockito-use_system_libraries.patch b/pcr/mockito/mockito-use_system_libraries.patch new file mode 100644 index 000000000..935599605 --- /dev/null +++ b/pcr/mockito/mockito-use_system_libraries.patch @@ -0,0 +1,100 @@ +--- mockito-1.10.19.orig/src/org/mockito/internal/creation/cglib/CGLIBHacker.java 2014-12-31 11:43:56.000000000 -0500 ++++ mockito-1.10.19/src/org/mockito/internal/creation/cglib/CGLIBHacker.java 2015-09-18 15:31:22.878230564 -0500 +@@ -4,7 +4,7 @@ + */ + package org.mockito.internal.creation.cglib; + +-import org.mockito.cglib.proxy.MethodProxy; ++import net.sf.cglib.proxy.MethodProxy; + + import java.io.Serializable; + import java.lang.reflect.Field; +--- mockito-1.10.19.orig/src/org/mockito/internal/creation/cglib/CglibMockMaker.java 2014-12-31 11:43:56.000000000 -0500 ++++ mockito-1.10.19/src/org/mockito/internal/creation/cglib/CglibMockMaker.java 2015-09-18 15:31:48.654757617 -0500 +@@ -4,8 +4,8 @@ + */ + package org.mockito.internal.creation.cglib; + +-import org.mockito.cglib.proxy.Callback; +-import org.mockito.cglib.proxy.Factory; ++import net.sf.cglib.proxy.Callback; ++import net.sf.cglib.proxy.Factory; + import org.mockito.exceptions.base.MockitoException; + import org.mockito.internal.InternalMockHandler; + import org.mockito.internal.creation.instance.InstantiatorProvider; +--- mockito-1.10.19.orig/src/org/mockito/internal/creation/cglib/ClassImposterizer.java 2014-12-31 11:43:56.000000000 -0500 ++++ mockito-1.10.19/src/org/mockito/internal/creation/cglib/ClassImposterizer.java 2015-09-18 15:33:39.454157490 -0500 +@@ -4,10 +4,10 @@ + */ + package org.mockito.internal.creation.cglib; + +-import org.mockito.cglib.core.CodeGenerationException; +-import org.mockito.cglib.core.NamingPolicy; +-import org.mockito.cglib.core.Predicate; +-import org.mockito.cglib.proxy.*; ++import net.sf.cglib.core.CodeGenerationException; ++import net.sf.cglib.core.NamingPolicy; ++import net.sf.cglib.core.Predicate; ++import net.sf.cglib.proxy.*; + import org.mockito.exceptions.base.MockitoException; + import org.mockito.internal.creation.instance.InstantationException; + import org.mockito.internal.creation.instance.Instantiator; +--- mockito-1.10.19.orig/src/org/mockito/internal/creation/cglib/DelegatingMockitoMethodProxy.java 2014-12-31 11:43:56.000000000 -0500 ++++ mockito-1.10.19/src/org/mockito/internal/creation/cglib/DelegatingMockitoMethodProxy.java 2015-09-18 15:34:22.997254980 -0500 +@@ -4,7 +4,7 @@ + */ + package org.mockito.internal.creation.cglib; + +-import org.mockito.cglib.proxy.MethodProxy; ++import net.sf.cglib.proxy.MethodProxy; + import org.mockito.internal.creation.util.MockitoMethodProxy; + + class DelegatingMockitoMethodProxy implements MockitoMethodProxy { +--- mockito-1.10.19.orig/src/org/mockito/internal/creation/cglib/MethodInterceptorFilter.java 2014-12-31 11:43:56.000000000 -0500 ++++ mockito-1.10.19/src/org/mockito/internal/creation/cglib/MethodInterceptorFilter.java 2015-09-18 15:35:14.710308218 -0500 +@@ -5,8 +5,8 @@ + + package org.mockito.internal.creation.cglib; + +-import org.mockito.cglib.proxy.MethodInterceptor; +-import org.mockito.cglib.proxy.MethodProxy; ++import net.sf.cglib.proxy.MethodInterceptor; ++import net.sf.cglib.proxy.MethodProxy; + import org.mockito.internal.InternalMockHandler; + import org.mockito.internal.creation.DelegatingMethod; + import org.mockito.internal.creation.util.MockitoMethodProxy; +--- mockito-1.10.19.orig/src/org/mockito/internal/creation/cglib/MockitoNamingPolicy.java 2014-12-31 11:43:56.000000000 -0500 ++++ mockito-1.10.19/src/org/mockito/internal/creation/cglib/MockitoNamingPolicy.java 2015-09-18 15:35:55.766752509 -0500 +@@ -4,7 +4,7 @@ + */ + package org.mockito.internal.creation.cglib; + +-import org.mockito.cglib.core.DefaultNamingPolicy; ++import net.sf.cglib.core.DefaultNamingPolicy; + + class MockitoNamingPolicy extends DefaultNamingPolicy { + +--- mockito-1.10.19.orig/src/org/mockito/internal/creation/cglib/SerializableMockitoMethodProxy.java 2014-12-31 11:43:56.000000000 -0500 ++++ mockito-1.10.19/src/org/mockito/internal/creation/cglib/SerializableMockitoMethodProxy.java 2015-09-18 15:36:38.069856715 -0500 +@@ -4,7 +4,7 @@ + */ + package org.mockito.internal.creation.cglib; + +-import org.mockito.cglib.proxy.MethodProxy; ++import net.sf.cglib.proxy.MethodProxy; + import org.mockito.internal.creation.util.MockitoMethodProxy; + import org.mockito.internal.util.reflection.Whitebox; + +--- mockito-1.10.19.orig/src/org/mockito/internal/creation/cglib/SerializableNoOp.java 2014-12-31 11:43:56.000000000 -0500 ++++ mockito-1.10.19/src/org/mockito/internal/creation/cglib/SerializableNoOp.java 2015-09-18 15:37:15.342988164 -0500 +@@ -4,8 +4,8 @@ + */ + package org.mockito.internal.creation.cglib; + +-import org.mockito.cglib.proxy.Callback; +-import org.mockito.cglib.proxy.NoOp; ++import net.sf.cglib.proxy.Callback; ++import net.sf.cglib.proxy.NoOp; + + import java.io.Serializable; + -- cgit v1.2.3-2-g168b