This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch CXF-8671
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/CXF-8671 by this push:
new 9c9be02458 CXF-8993: Migrate from net.sf.cglib (cglib) to
org.springframework.cglib (spring) (#1779)
9c9be02458 is described below
commit 9c9be024582c0fc93b6b7985801613caaadd9a06
Author: Andriy Redko <[email protected]>
AuthorDate: Thu Apr 4 09:30:48 2024 -0400
CXF-8993: Migrate from net.sf.cglib (cglib) to org.springframework.cglib
(spring) (#1779)
---
core/pom.xml | 7 +------
.../java/org/apache/cxf/common/util/CglibProxyHelper.java | 12 ++++++------
.../apache/cxf/common/injection/ResourceInjectorTest.java | 6 +++---
.../java/org/apache/cxf/common/util/ClassHelperTest.java | 6 +++---
distribution/javadoc/pom.xml | 4 ----
.../src/main/release/samples/ruby_spring_support/pom.xml | 4 ----
parent/pom.xml | 7 -------
rt/rs/client/pom.xml | 5 -----
rt/rs/microprofile-client/pom.xml | 5 -----
systests/jaxrs/pom.xml | 5 -----
systests/rs-security/pom.xml | 5 -----
systests/transport-hc5/pom.xml | 5 -----
systests/uncategorized/pom.xml | 5 -----
13 files changed, 13 insertions(+), 63 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 4e853f4eb2..823854936d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -47,7 +47,7 @@
com.sun.xml*;resolution:=optional,
com.sun.codemodel.writer;resolution:=optional,
org.slf4j*;resolution:=optional;version="${cxf.osgi.slf4j.version}",
-
net.sf.cglib*;resolution:=optional;version="${cxf.cglib.osgi.version}",
+
org.springframework.cglib*;resolution:=optional;version="${cxf.osgi.spring.version}",
org.springframework.aop*;resolution:=optional;version="${cxf.osgi.spring.version}",
org.springframework.beans*;resolution:=optional;version="${cxf.osgi.spring.version}",
org.springframework.context*;resolution:=optional;version="${cxf.osgi.spring.version}",
@@ -122,11 +122,6 @@
<optional>true</optional>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
diff --git
a/core/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java
b/core/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java
index 2e00deffdd..9d4ff52a4b 100644
--- a/core/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java
+++ b/core/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java
@@ -23,9 +23,9 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
+import org.springframework.cglib.proxy.Enhancer;
+import org.springframework.cglib.proxy.MethodInterceptor;
+import org.springframework.cglib.proxy.MethodProxy;
/**
@@ -33,9 +33,9 @@ import net.sf.cglib.proxy.MethodProxy;
*/
class CglibProxyHelper extends ProxyHelper {
CglibProxyHelper() throws Exception {
- Class.forName("net.sf.cglib.proxy.Enhancer");
- Class.forName("net.sf.cglib.proxy.MethodInterceptor");
- Class.forName("net.sf.cglib.proxy.MethodProxy");
+ Class.forName("org.springframework.cglib.proxy.Enhancer");
+ Class.forName("org.springframework.cglib.proxy.MethodInterceptor");
+ Class.forName("org.springframework.cglib.proxy.MethodProxy");
}
@Override
diff --git
a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
index aa95459a97..5dd1662ac3 100644
---
a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
+++
b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
@@ -31,11 +31,11 @@ import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.Resource;
import jakarta.annotation.Resources;
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.resource.ResourceResolver;
+import org.springframework.cglib.proxy.Enhancer;
+import org.springframework.cglib.proxy.MethodInterceptor;
+import org.springframework.cglib.proxy.MethodProxy;
import org.junit.Test;
diff --git a/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java
b/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java
index e0d2d1750d..1ead276691 100644
--- a/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java
@@ -23,12 +23,12 @@ import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.function.Function;
-import net.sf.cglib.proxy.Callback;
-import net.sf.cglib.proxy.Enhancer;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.springframework.aop.AfterReturningAdvice;
import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.cglib.proxy.Callback;
+import org.springframework.cglib.proxy.Enhancer;
import org.junit.After;
import org.junit.Before;
@@ -83,7 +83,7 @@ public class ClassHelperTest {
springAopObject = proxyFactory.getProxy();
- final Callback callback = new net.sf.cglib.proxy.InvocationHandler() {
+ final Callback callback = new
org.springframework.cglib.proxy.InvocationHandler() {
@Override
public Object invoke(Object proxy, Method method, Object[] args)
throws Throwable {
return null;
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index b6e5121f84..d9dadd2dc0 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -260,10 +260,6 @@
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
</dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </dependency>
<dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
diff --git a/distribution/src/main/release/samples/ruby_spring_support/pom.xml
b/distribution/src/main/release/samples/ruby_spring_support/pom.xml
index c9e43dcfb4..5c028aa735 100644
--- a/distribution/src/main/release/samples/ruby_spring_support/pom.xml
+++ b/distribution/src/main/release/samples/ruby_spring_support/pom.xml
@@ -126,10 +126,6 @@
<artifactId>jruby</artifactId>
<version>9.4.6.0</version>
</dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 064b7ab724..6b384605d2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -74,7 +74,6 @@
<cxf.osgi.jakarta.mail.version>[2,3)</cxf.osgi.jakarta.mail.version>
<cxf.osgi.jakarta.servlet.version>[5,6)</cxf.osgi.jakarta.servlet.version>
<cxf.osgi.jakarta.xml.ws.version>[3,4)</cxf.osgi.jakarta.xml.ws.version>
- <cxf.cglib.osgi.version>[3.3,3.4)</cxf.cglib.osgi.version>
<cxf.osgi.cdi.version>[3,4)</cxf.osgi.cdi.version>
<cxf.osgi.jakarta.jwsapi.version>[3,4)</cxf.osgi.jakarta.jwsapi.version>
<cxf.osgi.saaj.version>[2,3)</cxf.osgi.saaj.version>
@@ -267,7 +266,6 @@
<cxf.reflections.bundle.version>0.9.11_2</cxf.reflections.bundle.version>
<cxf.rhino.bundle.version>1.7.13_1</cxf.rhino.bundle.version>
<cxf.servicemix.aspectj.version>1.9.1_1</cxf.servicemix.aspectj.version>
- <cxf.servicemix.cglib.version>3.3.0_1</cxf.servicemix.cglib.version>
<cxf.servicemix.jakarta.el.version>3.0.0_1</cxf.servicemix.jakarta.el.version>
<cxf.servicemix.jaxrs.specs.version>2.9.1</cxf.servicemix.jaxrs.specs.version>
<cxf.servicemix.jodatime.version>2.3_1</cxf.servicemix.jodatime.version>
@@ -789,11 +787,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>3.3.0</version>
- </dependency>
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml
index bc24de56b5..5e7c44f488 100644
--- a/rt/rs/client/pom.xml
+++ b/rt/rs/client/pom.xml
@@ -94,11 +94,6 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>${cxf.servlet-api.group}</groupId>
<artifactId>${cxf.servlet-api.artifact}</artifactId>
diff --git a/rt/rs/microprofile-client/pom.xml
b/rt/rs/microprofile-client/pom.xml
index f4a5d8ed8e..b38b088f4a 100644
--- a/rt/rs/microprofile-client/pom.xml
+++ b/rt/rs/microprofile-client/pom.xml
@@ -146,11 +146,6 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>${cxf.servlet-api.group}</groupId>
<artifactId>${cxf.servlet-api.artifact}</artifactId>
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index bed601d3ae..11f782dfed 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -347,11 +347,6 @@
<version>${cxf.aspectj.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>jakarta.management.j2ee</groupId>
<artifactId>jakarta.management.j2ee-api</artifactId>
diff --git a/systests/rs-security/pom.xml b/systests/rs-security/pom.xml
index 6b60ac3704..10ff51f589 100644
--- a/systests/rs-security/pom.xml
+++ b/systests/rs-security/pom.xml
@@ -132,11 +132,6 @@
<artifactId>spring-web</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>jakarta.management.j2ee</groupId>
<artifactId>jakarta.management.j2ee-api</artifactId>
diff --git a/systests/transport-hc5/pom.xml b/systests/transport-hc5/pom.xml
index 5d7dd1b243..1eab072411 100644
--- a/systests/transport-hc5/pom.xml
+++ b/systests/transport-hc5/pom.xml
@@ -174,11 +174,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml
index ee0effe1d3..78a1a7ff28 100644
--- a/systests/uncategorized/pom.xml
+++ b/systests/uncategorized/pom.xml
@@ -293,11 +293,6 @@
<version>${cxf.aspectj.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>jakarta.management.j2ee</groupId>
<artifactId>jakarta.management.j2ee-api</artifactId>
