Support Jakarta EE 10 (initial commit) (apache#1805)

* CXF-8671: Support Jakarta EE 10. Initial commit to prepare the Jakarta EE integration branch * CXF-8671: Support Jakarta EE 10 (apache#1201) * Update dependencies to Jakarta EE 10 * Remove unnecessary dependency on jakarta.xml.bind-api It didn’t respect the Jakarta EE 10 BOM for some reason, and it doesn’t (yet?) appear to be necessary * Servlet API 6.0.0 * Jakarta XML Binding 4.0 * Jakarta Context Dependency Injection 4.0 * Fix Maven dependencies * Jakarta RESTful Web Services 3.1 * Update Jakarta EE dependencies for codegen-plugins integration tests * Add missing jakarta.xml.bind-api dependencies for codegen-plugin maven-invoker-plugin * Correct RetryAfterHeaderProviderTest not accounting for host daylight time getRawOffset() returns the offset for standard time, which means these tests fail when the default timezone is observing daylight time. * Upgrade saaj-impl * Upgrade undertow * Upgrade istack * Placeholders for bootstrap API * EntityPart * Implement RuntimeDelegateImpl * Partially implement TLS/SSL in SE bootstrap (needs some work on CXF engines) * Fix cxf-tools-wadlto-jaxrs test cases * Update Spring Boot to 3.1.0, Spring LDAP to 3.1.0, Spring Security to 6.1.0 * docs: Fix BUILDING.txt fastinstall line * Fix compilation and checkstyle issues * Update Hibernate to 6.2.9.Final * Update Hibernate to 6.3.1.Final * Refactor EntityPartBuilderImpl & EntityPartImpl * Replace JakarteEE 10 BOM with indvidual component versions to simplify patching and minor updates * Fixed CDI and Security test cases * Update Weld to 5.1.2.Final * Switch JSON-P/JSON-B implementation and fix test cases --------- Co-authored-by: Andriy Redko <[email protected]> * Update Arquillian to 1.8.0.Final * Update Apache Camel to 4.1.0 * Move to Spring Boot 3.2.0 baseline (apache#1534) * Update Hibernate to 6.4.0.Final * Update Apache Camel to 4.2.0 * Update JAXB Runtime (Glassfish) to 4.0.0 * Update SAAJ impl to 3.0.3 * Bump com.sun.xml.ws:jaxws-rt from 3.0.2 to 4.0.2 (apache#1568) Bumps com.sun.xml.ws:jaxws-rt from 3.0.2 to 4.0.2. --- updated-dependencies: - dependency-name: com.sun.xml.ws:jaxws-rt dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump com.sun.istack:istack-commons-tools from 4.1.1 to 4.2.0 (apache#1576) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update Netty to 4.1.104.Final * Update Spring LDAP to 3.2.1 * Dependency updates * Bump org.eclipse.persistence:org.eclipse.persistence.moxy (apache#1583) Bumps [org.eclipse.persistence:org.eclipse.persistence.moxy](https://github.com/eclipse-ee4j/eclipselink) from 2.7.6 to 4.0.2. - [Release notes](https://github.com/eclipse-ee4j/eclipselink/releases) - [Commits](eclipse-ee4j/eclipselink@2.7.6...4.0.2) --- updated-dependencies: - dependency-name: org.eclipse.persistence:org.eclipse.persistence.moxy dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump cxf.zipkin-reporter.version from 2.17.0 to 2.17.1 (apache#1587) Bumps `cxf.zipkin-reporter.version` from 2.17.0 to 2.17.1. Updates `io.zipkin.reporter2:zipkin-reporter-brave` from 2.17.0 to 2.17.1 - [Release notes](https://github.com/openzipkin/zipkin-reporter-java/releases) - [Changelog](https://github.com/openzipkin/zipkin-reporter-java/blob/master/RELEASE.md) - [Commits](openzipkin/zipkin-reporter-java@2.17.0...2.17.1) Updates `io.zipkin.reporter2:zipkin-sender-urlconnection` from 2.17.0 to 2.17.1 - [Release notes](https://github.com/openzipkin/zipkin-reporter-java/releases) - [Changelog](https://github.com/openzipkin/zipkin-reporter-java/blob/master/RELEASE.md) - [Commits](openzipkin/zipkin-reporter-java@2.17.0...2.17.1) --- updated-dependencies: - dependency-name: io.zipkin.reporter2:zipkin-reporter-brave dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: io.zipkin.reporter2:zipkin-sender-urlconnection dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump cxf.brave.version from 5.16.0 to 5.17.0 (apache#1584) Bumps `cxf.brave.version` from 5.16.0 to 5.17.0. Updates `io.zipkin.brave:brave-context-slf4j` from 5.16.0 to 5.17.0 Updates `io.zipkin.brave:brave-instrumentation-httpclient` from 5.16.0 to 5.17.0 Updates `io.zipkin.brave:brave-instrumentation-httpasyncclient` from 5.16.0 to 5.17.0 Updates `io.zipkin.brave:brave-instrumentation-okhttp3` from 5.16.0 to 5.17.0 --- updated-dependencies: - dependency-name: io.zipkin.brave:brave-context-slf4j dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.zipkin.brave:brave-instrumentation-httpclient dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.zipkin.brave:brave-instrumentation-httpasyncclient dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.zipkin.brave:brave-instrumentation-okhttp3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.apache.maven.plugins:maven-compiler-plugin (apache#1589) Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.11.0 to 3.12.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](apache/maven-compiler-plugin@maven-compiler-plugin-3.11.0...maven-compiler-plugin-3.12.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update Apache Camel to 4.3.0 * Bump cxf.olingo.server.version from 4.10.0 to 5.0.0 (apache#1597) Bumps `cxf.olingo.server.version` from 4.10.0 to 5.0.0. Updates `org.apache.olingo:odata-commons-api` from 4.10.0 to 5.0.0 Updates `org.apache.olingo:odata-commons-core` from 4.10.0 to 5.0.0 Updates `org.apache.olingo:odata-server-api` from 4.10.0 to 5.0.0 Updates `org.apache.olingo:odata-server-core` from 4.10.0 to 5.0.0 --- updated-dependencies: - dependency-name: org.apache.olingo:odata-commons-api dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.apache.olingo:odata-commons-core dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.apache.olingo:odata-server-api dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.apache.olingo:odata-server-core dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update Spring Boot to 3.2.1 * Update Microprofile Config to 3.1 * Update Arquillian Weld Container to 3.0.2.Final * Update Hibernate to 6.4.2.Final * Update Spring Boot to 3.2.2 * Update to Jetty 12 (apache#1633) * Update to Jetty 12 * Fix parent version of IT projects (apache#1663) * Fix multiple compilation issues * Fix javadoc generation (post Jetty 12 update) * Update Hibernate to 6.4.3.Final * Update Hibernate to 6.4.4.Final * Update Micrometer to 1.12.3 and Micrometer Tracing to 1.2.3 * Update Spring LDAP to 3.2.2 * Update to Spring Boot 3.2.3 * Update UnboundID LDAP SDK for Java to 7.0.0 * Update Apache Camel to 4.4.1 * Update Apache Camel to 4.5.0 * Update Spring Cloud Eureka to 4.1.1 * Switched from wiremock-standalone to wiremock-jetty12 * Update JDK baseline to JDK-17 * Update Jetty to 12.0.8 * CXF-8993: Migrate from net.sf.cglib (cglib) to org.springframework.cglib (spring) (apache#1779) * Revamped io.opentelemetry.semconv:* dependencies since Micrometer Tracing brings conflicting ones * Adapt JAXWSServicesListingTest test cases to jetty 12.0.8+ changes * Adapt JAXRSServicesListingTest test cases to jetty 12.0.8+ changes * Update jakarta.json.bind-api to 3.0.1 * Bump org.jvnet.jaxb:jaxb-plugins from 3.0.1 to 4.0.6 (apache#1800) Bumps org.jvnet.jaxb:jaxb-plugins from 3.0.1 to 4.0.6. --- updated-dependencies: - dependency-name: org.jvnet.jaxb:jaxb-plugins dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andriy Redko <[email protected]> * Update Project Reactor to 3.6.5 * Update Micrometer to 1.12.5 * Update Micrometer Tracing to 1.2.5 * Minor pom.xml cleanups before merging to main --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Karl von Randow <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Freeman(Yue) Fang <[email protected]> Co-authored-by: Andreas Kuhtz <[email protected]>
Talend · Apr 15, 2024 · 59a167f · 59a167f
1 parent ed888e6
commit 59a167f
Show file tree

Hide file tree

Showing 400 changed files with 2,915 additions and 2,223 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -7,10 +7,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: ['main', '3.6.x-fixes']
+    branches: ['main', '4.0.x-fixes', '3.6.x-fixes']
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: ['main', '3.6.x-fixes']
+    branches: ['main', '4.0.x-fixes', '3.6.x-fixes']
   #schedule:
     #- cron: '0 18 * * 5'
 

diff --git a/BUILDING.txt b/BUILDING.txt
@@ -29,7 +29,7 @@ Building
 	$> mvn
    This will compile Apache CXF and run all of the tests in the Apache CXF source
    distribution. Alternatively, you can run
-    $> mvn -Pfastinstall.
+    $> mvn -Pfastinstall
    This will compile Apache CXF without running the tests and takes less
    time to build.
    Depending on the load of remote Maven repositories, you may have 

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf</artifactId>
-        <version>4.0.5-SNAPSHOT</version>
+        <version>4.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cxf-bom</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>4.0.5-SNAPSHOT</version>
+        <version>4.1.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <properties>
@@ -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
@@ -23,19 +23,19 @@
 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;
 
 
 /**
  *
  */
 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/com/ibm/xml/mock/marshaller/MockMarshaller.java b/core/src/test/java/com/ibm/xml/mock/marshaller/MockMarshaller.java
@@ -121,23 +121,20 @@ public ValidationEventHandler getEventHandler() throws JAXBException {
         return null;
     }
 
-    @SuppressWarnings("rawtypes")
     @Override
-    public void setAdapter(XmlAdapter adapter) {
+    public <A extends XmlAdapter<?, ?>> void setAdapter(A adapter) {
         // TODO Auto-generated method stub
 
     }
 
-    @SuppressWarnings("rawtypes")
     @Override
-    public <A extends XmlAdapter> void setAdapter(Class<A> type, A adapter) {
+    public <A extends XmlAdapter<?, ?>> void setAdapter(Class<A> type, A adapter) {
         // TODO Auto-generated method stub
 
     }
 
-    @SuppressWarnings("rawtypes")
     @Override
-    public <A extends XmlAdapter> A getAdapter(Class<A> type) {
+    public <A extends XmlAdapter<?, ?>> A getAdapter(Class<A> type) {
         // TODO Auto-generated method stub
         return null;
     }

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
@@ -31,11 +31,11 @@
 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
@@ -23,12 +23,12 @@
 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 void afterReturning(Object o, Method method, Object[] objects, Object o1)
 
         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
@@ -20,15 +20,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cxf-distribution-javadoc</artifactId>
-  <version>4.0.5-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Apache CXF JavaDoc</name>
     <description>Apache CXF JavaDoc</description>
     <url>https://cxf.apache.org</url>
     <parent>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-parent</artifactId>
-        <version>4.0.5-SNAPSHOT</version>
+        <version>4.1.0-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
     <properties>
@@ -39,7 +38,7 @@
             <dependency>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-bom</artifactId>
-                <version>4.0.5-SNAPSHOT</version>
+                <version>4.1.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -49,107 +48,107 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-core</artifactId>
-            <version>4.0.5-SNAPSHOT</version>
+            <version>4.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>
-            <version>4.0.5-SNAPSHOT</version>
+            <version>4.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-security</artifactId>
-            <version>4.0.5-SNAPSHOT</version>
+            <version>4.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-security-http-signature</artifactId>
-            <version>4.0.5-SNAPSHOT</version>
+            <version>4.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-security-jose</artifactId>
-            <version>4.0.5-SNAPSHOT</version>
+            <version>4.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-security-jose-jaxrs</artifactId>
-            <version>4.0.5-SNAPSHOT</version>
+            <version>4.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-security-oauth2</artifactId>
-            <version>4.0.5-SNAPSHOT</version>
+            <version>4.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-security-oauth2-saml</artifactId>
-            <version>4.0.5-SNAPSHOT</version>
+            <version>4.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-security-saml</artifactId>
-            <version>4.0.5-SNAPSHOT</version>
+            <version>4.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-service-description</artifactId>
-            <version>4.0.5-SNAPSHOT</version>
+            <version>4.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-service-description-openapi-v3</artifactId>
-            <version>4.0.5-SNAPSHOT</version>
+            <version>4.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-service-description-microprofile-openapi</artifactId>
-            <version>4.0.5-SNAPSHOT</version>
+            <version>4.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-mp-client</artifactId>
-            <version>4.0.5-SNAPSHOT</version>
+            <version>4.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-aegis</artifactId>
-            <version>4.0.5-SNAPSHOT</version>
+            <version>4.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-jaxb</artifactId>
-            <version>4.0.5-SNAPSHOT</version>
+            <version>4.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-providers</artifactId>
-            <version>4.0.5-SNAPSHOT</version>
+            <version>4.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-reactor</artifactId>
-            <version>4.0.5-SNAPSHOT</version>
+            <version>4.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-extension-search</artifactId>
-            <version>4.0.5-SNAPSHOT</version>
+            <version>4.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-features-clustering</artifactId>
-            <version>4.0.5-SNAPSHOT</version>
+            <version>4.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-transfer</artifactId>
-            <version>4.0.5-SNAPSHOT</version>
+            <version>4.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-websocket</artifactId>
-            <version>4.0.5-SNAPSHOT</version>
+            <version>4.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -261,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>
@@ -394,10 +389,12 @@
         <dependency>
             <groupId>io.opentelemetry.semconv</groupId>
             <artifactId>opentelemetry-semconv</artifactId>
+            <version>${cxf.opentelemetry.semconv.version}</version>
         </dependency>
         <dependency>
             <groupId>io.opentelemetry.semconv</groupId>
             <artifactId>opentelemetry-semconv-incubating</artifactId>
+            <version>${cxf.opentelemetry.semconv.version}</version>
         </dependency>
         <dependency>
             <groupId>io.opentracing</groupId>
@@ -421,19 +418,23 @@
         </dependency>
         <dependency>
              <groupId>io.undertow</groupId>
-             <artifactId>undertow-servlet-jakarta</artifactId>
+             <artifactId>undertow-servlet</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-webapp</artifactId>
+            <groupId>org.eclipse.jetty.ee10</groupId>
+            <artifactId>jetty-ee10-webapp</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
+            <groupId>org.eclipse.jetty.ee10</groupId>
+            <artifactId>jetty-ee10-servlet</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.ee10.websocket</groupId>
+            <artifactId>jetty-ee10-websocket-jetty-server</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
@@ -455,13 +456,9 @@
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-http</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-plus</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.http2</groupId>
-            <artifactId>http2-server</artifactId>
+            <artifactId>jetty-http2-server</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
@@ -472,11 +469,6 @@
             <artifactId>jacorb</artifactId>
             <version>${cxf.jacorb.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty.websocket</groupId>
-            <artifactId>websocket-jakarta-server</artifactId>
-            <version>${cxf.jetty11.version}</version>
-        </dependency>
         <dependency>
           <groupId>io.reactivex.rxjava3</groupId>
           <artifactId>rxjava</artifactId>