1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
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;
|
