#321 - Remove dependency to Objenesis.

We're now using the inlined version of Objenesis in Spring Framework to avoid the additional dependency.
This commit is contained in:
Oliver Gierke
2015-03-19 13:34:41 +01:00
parent dc90d23da7
commit 2bcfd92c3b
3 changed files with 3 additions and 10 deletions

View File

@@ -64,7 +64,6 @@
<jaxrs.version>1.0</jaxrs.version>
<minidevjson.version>2.1.0</minidevjson.version>
<jsonpath.version>0.9.1</jsonpath.version>
<objenesis.version>2.1</objenesis.version>
<slf4j.version>1.7.10</slf4j.version>
<evo.version>1.2.1</evo.version>
<bundlor.failOnWarnings>true</bundlor.failOnWarnings>
@@ -457,12 +456,6 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>${objenesis.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>

View File

@@ -20,13 +20,13 @@ import java.util.Arrays;
import java.util.Iterator;
import org.aopalliance.intercept.MethodInterceptor;
import org.objenesis.ObjenesisStd;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.aop.target.EmptyTargetSource;
import org.springframework.cglib.proxy.Callback;
import org.springframework.cglib.proxy.Enhancer;
import org.springframework.cglib.proxy.Factory;
import org.springframework.cglib.proxy.MethodProxy;
import org.springframework.objenesis.ObjenesisStd;
import org.springframework.util.Assert;
import org.springframework.util.ReflectionUtils;
@@ -149,7 +149,8 @@ public class DummyInvocationUtils {
}
@SuppressWarnings("unchecked")
private static <T> T getProxyWithInterceptor(Class<?> type, InvocationRecordingMethodInterceptor interceptor, ClassLoader classLoader) {
private static <T> T getProxyWithInterceptor(Class<?> type, InvocationRecordingMethodInterceptor interceptor,
ClassLoader classLoader) {
if (type.isInterface()) {

View File

@@ -11,6 +11,5 @@ Import-Template:
net.minidev.json.*;version="${minidevjson.version:[=.=.=,+1.0.0)}";resolution:=optional,
org.aopalliance.*;version="[1.0.0,2.0.0)";resolution:=optional,
org.atteo.evo.inflector.*;version="${evo.version:[=.=.=,+1.0.0)}";resolution:=optional,
org.objenesis.*;version="${objenesis.version:[=.=.=,+1.0.0)}",
org.springframework.plugin.*;version="[0.8.0,2.0.0)";resolution:=optional,
org.springframework.*;version="${spring.version:[=.=.=,+1.1.0)}";resolution:=optional