You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2024/01/28 16:53:05 UTC
(cxf) branch CXF-8671 updated (86d3e50181 -> bf0fa9c078)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch CXF-8671
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 86d3e50181 Fix parent version of IT projects (#1663)
add f5c126f185 Update Netty to 4.1.106.Final
add 08deedc3e8 Update Dropwizard Metrics to 4.2.24
add 419b68d85b Bump actions/cache from 3.3.3 to 4.0.0 (#1659)
add cfac6ce7e1 Bump actions/upload-artifact from 4.1.0 to 4.2.0 (#1658)
add 5fafb851e3 [CXF-8970]ensure we can build and run without bouncycastle dependencies (#1645)
add 18a0bd2995 Update Mockito to 5.10.0
add 6b5e316464 Bump org.assertj:assertj-core from 3.25.1 to 3.25.2 (#1661)
add dc9b20d4df Bump cxf.dropwizard4.version from 4.2.24 to 4.2.25 (#1662)
add b1d605d387 Bump io.github.openfeign:feign-httpclient from 13.1 to 13.2 (#1666)
add f862855c12 Bump io.github.openfeign:feign-micrometer from 13.1 to 13.2 (#1665)
add 99bc15385a Bump io.github.openfeign:feign-core from 13.1 to 13.2 (#1664)
add 0b0b85eb2d CXF-8955: Custom timeout with Message.RECEIVE_TIMEOUT not working with hc5 / hc (#1607)
new bf0fa9c078 Merge remote-tracking branch 'origin/main' into CXF-8671
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/codeql-analysis.yml | 2 +-
.github/workflows/scorecards.yml | 2 +-
Jenkinsfile | 2 +-
distribution/javadoc/pom.xml | 4 -
.../src/main/java/demo/spring/servlet/Server.java | 7 +-
.../samples/java_first_spring_support/pom.xml | 3 +-
.../src/main/java/demo/spring/service/Server.java | 7 +-
.../samples/jax_rs/basic_http2_jetty/pom.xml | 6 +-
.../java/demo/jaxrs/openapi/server/Server.java | 4 +-
.../jax_rs/description_openapi_v3_web/pom.xml | 2 +-
.../src/main/release/samples/jax_rs/search/pom.xml | 7 +
.../main/java/demo/jaxrs/search/server/Server.java | 8 +-
.../src/main/java/demo/jaxrs/servlet/Server.java | 7 +-
.../main/release/samples/jax_rs/sse_cdi/pom.xml | 12 +-
.../src/main/java/demo/jaxrs/sse/StatsServer.java | 15 +-
.../main/release/samples/jax_rs/sse_spring/pom.xml | 12 +-
.../src/main/java/demo/jaxrs/sse/StatsServer.java | 15 +-
.../java/demo/jaxrs/tracing/server/Server.java | 4 +-
.../samples/jax_rs/tracing_micrometer/pom.xml | 11 +-
.../java/demo/jaxrs/tracing/server/Server.java | 4 +-
.../samples/jax_rs/tracing_opentelemetry/pom.xml | 9 +-
.../java/demo/jaxrs/tracing/server/Server.java | 4 +-
.../jax_rs/tracing_opentelemetry_camel/pom.xml | 5 +-
.../samples/jax_rs/tracing_opentracing/pom.xml | 4 +-
.../java/demo/jaxrs/tracing/server/Server.java | 4 +-
.../main/release/samples/jax_rs/websocket/pom.xml | 10 +-
.../release/samples/jax_rs/websocket_web/pom.xml | 2 +-
distribution/src/main/release/samples/pom.xml | 5 +-
.../src/main/java/demo/spring/service/Server.java | 7 +-
parent/pom.xml | 21 ++-
rt/rs/extensions/search/pom.xml | 6 +
rt/rs/security/jose-parent/jose/pom.xml | 6 -
.../cxf/rs/security/jose/common/JoseUtils.java | 24 +++
.../cxf/rs/security/jose/jwa/AlgorithmUtils.java | 12 +-
.../cxf/rs/security/jose/jwa/ContentAlgorithm.java | 6 +-
.../rs/security/jose/jwa/SignatureAlgorithm.java | 6 +-
.../jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java | 40 ++---
.../jose/jwe/WrappedKeyDecryptionAlgorithm.java | 2 +-
.../jose/jws/PrivateKeyJwsSignatureProvider.java | 8 +
.../jose/jws/PublicKeyJwsSignatureVerifier.java | 17 +++
.../cxf/rs/security/jose/common/HexUtils.java} | 32 ++--
.../jose/cookbook/JwsJoseCookBookTest.java | 165 +++++++++-----------
.../cxf/rs/security/jose/jwa/AbstractJwaTest.java | 17 +--
.../rs/security/jose/jwa/CxfDecryptRfcTest.java | 2 +
.../rs/security/jose/jwa/CxfEncryptRfcTest.java | 3 +
.../rs/security/jose/jwe/JwaSpecTestCasesTest.java | 43 ++----
.../jose/jwe/JweCompactReaderWriterTest.java | 18 +--
.../rs/security/jose/jwe/JweJsonConsumerTest.java | 22 +--
.../rs/security/jose/jwe/JweJsonProducerTest.java | 24 +--
.../security/jose/jwe/JwePbeHmacAesWrapTest.java | 13 +-
.../cxf/rs/security/jose/jwk/JsonWebKeyTest.java | 66 ++++----
.../cxf/rs/security/jose/jwk/JwkUtilsTest.java | 1 +
.../jose/jws/JwsCompactReaderWriterTest.java | 37 ++---
rt/security-saml/pom.xml | 6 +
.../rt/security/crypto/BouncyCastleInstaller.java | 31 ----
.../apache/cxf/rt/security/crypto/CryptoUtils.java | 19 +--
.../http/asyncclient/AsyncHTTPConduit.java | 17 +--
.../http/asyncclient/hc5/AsyncHTTPConduit.java | 16 +-
.../http_jetty/JettyHTTPServerEngine.java | 2 +-
rt/ws/security/pom.xml | 9 +-
services/sts/sts-core/pom.xml | 2 +-
.../sts/token/provider/JWTTokenProviderTest.java | 168 ++++++++++-----------
services/sts/systests/advanced/pom.xml | 5 -
systests/jaxrs/pom.xml | 11 +-
systests/kerberos/pom.xml | 5 -
systests/ldap/pom.xml | 5 -
systests/rs-security/pom.xml | 5 -
.../systest/jaxrs/security/jcs/JAXRSJcsTest.java | 14 +-
.../security/jose/jwejws/JAXRSJweJsonTest.java | 12 +-
.../security/jose/jwejws/JAXRSJweJwsTest.java | 14 +-
.../security/jose/jwejws/JAXRSJwsJsonTest.java | 14 +-
.../jose/jwejws/JAXRSJwsMultipartTest.java | 13 --
.../security/jose/jwejws/JweJwsAlgorithmTest.java | 15 +-
.../security/jose/jwejws/JweJwsReferenceTest.java | 15 +-
.../jaxrs/security/jose/jwt/JWTAlgorithmTest.java | 15 +-
.../hc5/http/timeout/ClientTimeoutTest.java | 127 ++++++++++++++++
.../systest/hc5/http/timeout/DelayedService.java | 6 +-
.../hc5/http/timeout/DelayedServiceImpl.java | 20 +--
systests/transports/pom.xml | 6 -
.../systest/http/timeout/ClientTimeoutTest.java | 127 ++++++++++++++++
.../cxf/systest/http/timeout/DelayedService.java | 6 +-
.../systest/http/timeout/DelayedServiceImpl.java | 20 +--
systests/ws-security/pom.xml | 5 -
83 files changed, 738 insertions(+), 767 deletions(-)
copy rt/rs/security/jose-parent/jose/src/{main/java/org/apache/cxf/rs/security/jose/common/JoseException.java => test/java/org/apache/cxf/rs/security/jose/common/HexUtils.java} (67%)
delete mode 100644 rt/security/src/main/java/org/apache/cxf/rt/security/crypto/BouncyCastleInstaller.java
create mode 100644 systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/http/timeout/ClientTimeoutTest.java
copy core/src/main/java/org/apache/cxf/common/security/SecurityToken.java => systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/http/timeout/DelayedService.java (87%)
copy rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/CustomerGender.java => systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/http/timeout/DelayedServiceImpl.java (72%)
create mode 100644 systests/transports/src/test/java/org/apache/cxf/systest/http/timeout/ClientTimeoutTest.java
copy core/src/main/java/org/apache/cxf/common/security/SecurityToken.java => systests/transports/src/test/java/org/apache/cxf/systest/http/timeout/DelayedService.java (88%)
copy rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/CustomerGender.java => systests/transports/src/test/java/org/apache/cxf/systest/http/timeout/DelayedServiceImpl.java (72%)
(cxf) 01/01: Merge remote-tracking branch 'origin/main' into CXF-8671
Posted by re...@apache.org.
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
commit bf0fa9c0787db4bdc072fc8260dadbafe343efd2
Merge: 86d3e50181 0b0b85eb2d
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Jan 28 11:52:47 2024 -0500
Merge remote-tracking branch 'origin/main' into CXF-8671
.github/workflows/codeql-analysis.yml | 2 +-
.github/workflows/scorecards.yml | 2 +-
Jenkinsfile | 2 +-
distribution/javadoc/pom.xml | 4 -
.../src/main/java/demo/spring/servlet/Server.java | 7 +-
.../samples/java_first_spring_support/pom.xml | 3 +-
.../src/main/java/demo/spring/service/Server.java | 7 +-
.../samples/jax_rs/basic_http2_jetty/pom.xml | 6 +-
.../java/demo/jaxrs/openapi/server/Server.java | 4 +-
.../jax_rs/description_openapi_v3_web/pom.xml | 2 +-
.../src/main/release/samples/jax_rs/search/pom.xml | 7 +
.../main/java/demo/jaxrs/search/server/Server.java | 8 +-
.../src/main/java/demo/jaxrs/servlet/Server.java | 7 +-
.../main/release/samples/jax_rs/sse_cdi/pom.xml | 12 +-
.../src/main/java/demo/jaxrs/sse/StatsServer.java | 15 +-
.../main/release/samples/jax_rs/sse_spring/pom.xml | 12 +-
.../src/main/java/demo/jaxrs/sse/StatsServer.java | 15 +-
.../java/demo/jaxrs/tracing/server/Server.java | 4 +-
.../samples/jax_rs/tracing_micrometer/pom.xml | 11 +-
.../java/demo/jaxrs/tracing/server/Server.java | 4 +-
.../samples/jax_rs/tracing_opentelemetry/pom.xml | 9 +-
.../java/demo/jaxrs/tracing/server/Server.java | 4 +-
.../jax_rs/tracing_opentelemetry_camel/pom.xml | 5 +-
.../samples/jax_rs/tracing_opentracing/pom.xml | 4 +-
.../java/demo/jaxrs/tracing/server/Server.java | 4 +-
.../main/release/samples/jax_rs/websocket/pom.xml | 10 +-
.../release/samples/jax_rs/websocket_web/pom.xml | 2 +-
distribution/src/main/release/samples/pom.xml | 5 +-
.../src/main/java/demo/spring/service/Server.java | 7 +-
parent/pom.xml | 21 ++-
rt/rs/extensions/search/pom.xml | 6 +
rt/rs/security/jose-parent/jose/pom.xml | 6 -
.../cxf/rs/security/jose/common/JoseUtils.java | 24 +++
.../cxf/rs/security/jose/jwa/AlgorithmUtils.java | 12 +-
.../cxf/rs/security/jose/jwa/ContentAlgorithm.java | 6 +-
.../rs/security/jose/jwa/SignatureAlgorithm.java | 6 +-
.../jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java | 40 ++---
.../jose/jwe/WrappedKeyDecryptionAlgorithm.java | 2 +-
.../jose/jws/PrivateKeyJwsSignatureProvider.java | 8 +
.../jose/jws/PublicKeyJwsSignatureVerifier.java | 17 +++
.../cxf/rs/security/jose/common/HexUtils.java} | 31 ++--
.../jose/cookbook/JwsJoseCookBookTest.java | 165 +++++++++-----------
.../cxf/rs/security/jose/jwa/AbstractJwaTest.java | 17 +--
.../rs/security/jose/jwa/CxfDecryptRfcTest.java | 2 +
.../rs/security/jose/jwa/CxfEncryptRfcTest.java | 3 +
.../rs/security/jose/jwe/JwaSpecTestCasesTest.java | 43 ++----
.../jose/jwe/JweCompactReaderWriterTest.java | 18 +--
.../rs/security/jose/jwe/JweJsonConsumerTest.java | 22 +--
.../rs/security/jose/jwe/JweJsonProducerTest.java | 24 +--
.../security/jose/jwe/JwePbeHmacAesWrapTest.java | 13 +-
.../cxf/rs/security/jose/jwk/JsonWebKeyTest.java | 66 ++++----
.../cxf/rs/security/jose/jwk/JwkUtilsTest.java | 1 +
.../jose/jws/JwsCompactReaderWriterTest.java | 37 ++---
rt/security-saml/pom.xml | 6 +
.../apache/cxf/rt/security/crypto/CryptoUtils.java | 19 +--
.../http/asyncclient/AsyncHTTPConduit.java | 17 +--
.../http/asyncclient/hc5/AsyncHTTPConduit.java | 16 +-
.../http_jetty/JettyHTTPServerEngine.java | 2 +-
rt/ws/security/pom.xml | 9 +-
services/sts/sts-core/pom.xml | 2 +-
.../sts/token/provider/JWTTokenProviderTest.java | 168 ++++++++++-----------
services/sts/systests/advanced/pom.xml | 5 -
systests/jaxrs/pom.xml | 11 +-
systests/kerberos/pom.xml | 5 -
systests/ldap/pom.xml | 5 -
systests/rs-security/pom.xml | 5 -
.../systest/jaxrs/security/jcs/JAXRSJcsTest.java | 14 +-
.../security/jose/jwejws/JAXRSJweJsonTest.java | 12 +-
.../security/jose/jwejws/JAXRSJweJwsTest.java | 14 +-
.../security/jose/jwejws/JAXRSJwsJsonTest.java | 14 +-
.../jose/jwejws/JAXRSJwsMultipartTest.java | 13 --
.../security/jose/jwejws/JweJwsAlgorithmTest.java | 15 +-
.../security/jose/jwejws/JweJwsReferenceTest.java | 15 +-
.../jaxrs/security/jose/jwt/JWTAlgorithmTest.java | 15 +-
.../hc5/http/timeout/ClientTimeoutTest.java | 127 ++++++++++++++++
.../systest/hc5/http/timeout/DelayedService.java | 14 +-
.../hc5/http/timeout/DelayedServiceImpl.java | 19 ++-
systests/transports/pom.xml | 6 -
.../systest/http/timeout/ClientTimeoutTest.java | 127 ++++++++++++++++
.../cxf/systest/http/timeout/DelayedService.java | 14 +-
.../systest/http/timeout/DelayedServiceImpl.java | 19 ++-
systests/ws-security/pom.xml | 5 -
82 files changed, 742 insertions(+), 745 deletions(-)
diff --cc Jenkinsfile
index aa8023e130,aa8023e130..67953a3862
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@@ -51,7 -51,7 +51,7 @@@ pipeline
stages {
stage('Build & Test') {
steps {
-- sh 'mvn -U -B clean install'
++ sh 'mvn -U -B clean install -Peverything'
// step([$class: 'JiraIssueUpdater', issueSelector: [$class: 'DefaultIssueSelector'], scm: scm])
}
post {
diff --cc distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java
index a5f352c665,a5f352c665..850c944d71
--- a/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java
+++ b/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java
@@@ -18,10 -18,10 +18,9 @@@
*/
package demo.spring.servlet;
++import org.eclipse.jetty.ee10.webapp.WebAppContext;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.handler.DefaultHandler;
--import org.eclipse.jetty.server.handler.HandlerCollection;
--import org.eclipse.jetty.webapp.WebAppContext;
public class Server {
@@@ -42,8 -42,8 +41,8 @@@
webappcontext.setWar("target/GroovySpringSupport.war");
-- HandlerCollection handlers = new HandlerCollection();
-- handlers.setHandlers(new Handler[] {webappcontext, new DefaultHandler()});
++ Handler.Collection handlers = new Handler.Sequence(webappcontext, new DefaultHandler());
++ handlers.setHandlers(handlers);
server.setHandler(handlers);
server.start();
diff --cc distribution/src/main/release/samples/java_first_spring_support/pom.xml
index c4670ba145,2d10864054..aefaa6c15e
--- a/distribution/src/main/release/samples/java_first_spring_support/pom.xml
+++ b/distribution/src/main/release/samples/java_first_spring_support/pom.xml
@@@ -124,8 -124,8 +124,9 @@@
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
+ <groupId>org.eclipse.jetty.ee10</groupId>
- <artifactId>jetty-ee10.webapp</artifactId>
++ <artifactId>jetty-ee10-webapp</artifactId>
++ <version>${cxf.jetty12.version}</version>
</dependency>
</dependencies>
</project>
diff --cc distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/Server.java
index d176e834e9,d176e834e9..84d35d6396
--- a/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/Server.java
+++ b/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/Server.java
@@@ -18,10 -18,10 +18,9 @@@
*/
package demo.spring.service;
++import org.eclipse.jetty.ee10.webapp.WebAppContext;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.handler.DefaultHandler;
--import org.eclipse.jetty.server.handler.HandlerCollection;
--import org.eclipse.jetty.webapp.WebAppContext;
public class Server {
@@@ -42,8 -42,8 +41,8 @@@
webappcontext.setWar("target/JavaFirstSpringSupport.war");
-- HandlerCollection handlers = new HandlerCollection();
-- handlers.setHandlers(new Handler[] {webappcontext, new DefaultHandler()});
++ Handler.Collection handlers = new Handler.Sequence(webappcontext, new DefaultHandler());
++ handlers.setHandlers(handlers);
server.setHandler(handlers);
server.start();
diff --cc distribution/src/main/release/samples/jax_rs/basic_http2_jetty/pom.xml
index f36597d185,d397809030..89527ab837
--- a/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/basic_http2_jetty/pom.xml
@@@ -85,7 -85,7 +85,7 @@@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-java-server</artifactId>
-- <version>${cxf.jetty11.version}</version>
++ <version>${cxf.jetty12.version}</version>
</dependency>
</dependencies>
</profile>
@@@ -107,13 -107,13 +107,13 @@@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
- <artifactId>http2-server</artifactId>
- <version>${cxf.jetty11.version}</version>
+ <artifactId>jetty-http2-server</artifactId>
- <version>${cxf.jetty11.version}</version>
++ <version>${cxf.jetty12.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-server</artifactId>
-- <version>${cxf.jetty11.version}</version>
++ <version>${cxf.jetty12.version}</version>
</dependency>
</dependencies>
</project>
diff --cc distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/Server.java
index f8be7c7db0,f8be7c7db0..1860294995
--- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/Server.java
@@@ -25,8 -25,8 +25,8 @@@ import org.apache.commons.lang3.StringU
import org.apache.cxf.jaxrs.openapi.OpenApiFeature;
import org.apache.cxf.jaxrs.provider.MultipartProvider;
import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;
--import org.eclipse.jetty.servlet.ServletContextHandler;
--import org.eclipse.jetty.servlet.ServletHolder;
++import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
++import org.eclipse.jetty.ee10.servlet.ServletHolder;
public class Server {
diff --cc distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml
index 59ad6ba4cd,d8d8e04efe..5776ad40e6
--- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml
@@@ -35,7 -35,7 +35,7 @@@ under the License
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
-- <version>${cxf.jetty11.version}</version>
++ <version>${cxf.jetty12.version}</version>
<configuration>
<webApp>
<contextPath>/</contextPath>
diff --cc distribution/src/main/release/samples/jax_rs/search/pom.xml
index 79af160231,1c41769db9..f868bd9a9a
--- a/distribution/src/main/release/samples/jax_rs/search/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/search/pom.xml
@@@ -153,8 -159,8 +159,9 @@@
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
+ <groupId>org.eclipse.jetty.ee10</groupId>
+ <artifactId>jetty-ee10-webapp</artifactId>
++ <version>${cxf.jetty12.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --cc distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java
index 5fe8682ce7,5fe8682ce7..9e71499e91
--- a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java
@@@ -26,9 -26,9 +26,9 @@@ import org.apache.cxf.jaxrs.provider.Mu
import org.apache.cxf.jaxrs.provider.jsrjsonp.JsrJsonpProvider;
import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;
import org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter;
--import org.eclipse.jetty.servlet.DefaultServlet;
--import org.eclipse.jetty.servlet.ServletContextHandler;
--import org.eclipse.jetty.servlet.ServletHolder;
++import org.eclipse.jetty.ee10.servlet.DefaultServlet;
++import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
++import org.eclipse.jetty.ee10.servlet.ServletHolder;
public class Server {
@@@ -43,7 -43,7 +43,7 @@@
context.setContextPath("/");
context.addServlet(staticHolder, "/static/*");
context.addServlet(servletHolder, "/*");
-- context.setResourceBase(getClass().getResource("/browser").toURI().toString());
++ context.setBaseResourceAsString(getClass().getResource("/browser").toURI().toString());
servletHolder.setInitParameter("redirects-list",
"/ /index.html /js/fileinput.min.js /css/fileinput.min.css");
diff --cc distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java
index f093934fcc,f093934fcc..db6a805d32
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java
@@@ -18,10 -18,10 +18,9 @@@
*/
package demo.jaxrs.servlet;
++import org.eclipse.jetty.ee10.webapp.WebAppContext;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.handler.DefaultHandler;
--import org.eclipse.jetty.server.handler.HandlerCollection;
--import org.eclipse.jetty.webapp.WebAppContext;
public class Server {
@@@ -42,9 -42,9 +41,7 @@@
webappcontext.setWar("target/JAXRSSpringSecurity.war");
-- HandlerCollection handlers = new HandlerCollection();
-- handlers.setHandlers(new Handler[] {webappcontext, new DefaultHandler()});
--
++ Handler.Collection handlers = new Handler.Sequence(webappcontext, new DefaultHandler());
server.setHandler(handlers);
server.start();
System.out.println("Server ready...");
diff --cc distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml
index ab4f98c6d2,0448a8bdfc..5f537a9b9a
--- a/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml
@@@ -57,9 -57,14 +57,9 @@@
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-plus</artifactId>
- </dependency>
-
- <dependency>
-- <groupId>org.eclipse.jetty</groupId>
-- <artifactId>apache-jsp</artifactId>
-- <version>${cxf.jetty11.version}</version>
++ <groupId>org.eclipse.jetty.ee10</groupId>
++ <artifactId>jetty-ee10-apache-jsp</artifactId>
++ <version>${cxf.jetty12.version}</version>
</dependency>
<dependency>
@@@ -68,9 -73,9 +68,9 @@@
</dependency>
<dependency>
-- <groupId>org.eclipse.jetty.websocket</groupId>
-- <artifactId>websocket-jakarta-server</artifactId>
-- <version>${cxf.jetty11.version}</version>
++ <groupId>org.eclipse.jetty.ee10.websocket</groupId>
++ <artifactId>jetty-ee10-websocket-jetty-server</artifactId>
++ <version>${cxf.jetty12.version}</version>
</dependency>
<dependency>
diff --cc distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsServer.java
index dde5496211,dde5496211..29c55a2a9a
--- a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsServer.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsServer.java
@@@ -19,11 -19,11 +19,11 @@@
package demo.jaxrs.sse;
import org.apache.cxf.cdi.CXFCdiServlet;
++import org.eclipse.jetty.ee10.servlet.DefaultServlet;
++import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
++import org.eclipse.jetty.ee10.servlet.ServletHolder;
++import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
--import org.eclipse.jetty.server.handler.HandlerList;
--import org.eclipse.jetty.servlet.DefaultServlet;
--import org.eclipse.jetty.servlet.ServletContextHandler;
--import org.eclipse.jetty.servlet.ServletHolder;
import org.jboss.weld.environment.servlet.BeanManagerResourceBindingListener;
import org.jboss.weld.environment.servlet.Listener;
@@@ -38,7 -38,7 +38,7 @@@ public final class StatsServer
final ServletContextHandler staticContext = new ServletContextHandler();
staticContext.setContextPath("/static");
staticContext.addServlet(staticHolder, "/*");
-- staticContext.setResourceBase(StatsServer.class.getResource("/web-ui").toURI().toString());
++ staticContext.setBaseResourceAsString(StatsServer.class.getResource("/web-ui").toURI().toString());
// Register and map the dispatcher servlet
final CXFCdiServlet cxfServlet = new CXFCdiServlet();
@@@ -49,10 -49,10 +49,7 @@@
context.addEventListener(new BeanManagerResourceBindingListener());
context.addServlet(cxfServletHolder, "/rest/*");
-- HandlerList handlers = new HandlerList();
-- handlers.addHandler(staticContext);
-- handlers.addHandler(context);
--
++ Handler.Collection handlers = new Handler.Sequence(staticContext, context);
server.setHandler(handlers);
server.start();
server.join();
diff --cc distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
index af2c2f50ac,8885f726bd..520ecd9a0e
--- a/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml
@@@ -39,11 -39,15 +39,11 @@@
<artifactId>jetty-server</artifactId>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-plus</artifactId>
- </dependency>
<dependency>
-- <groupId>org.eclipse.jetty</groupId>
-- <artifactId>apache-jsp</artifactId>
-- <version>${cxf.jetty11.version}</version>
++ <groupId>org.eclipse.jetty.ee10</groupId>
++ <artifactId>jetty-ee10-apache-jsp</artifactId>
++ <version>${cxf.jetty12.version}</version>
</dependency>
<dependency>
@@@ -52,9 -56,9 +52,9 @@@
</dependency>
<dependency>
-- <groupId>org.eclipse.jetty.websocket</groupId>
-- <artifactId>websocket-jakarta-server</artifactId>
-- <version>${cxf.jetty11.version}</version>
++ <groupId>org.eclipse.jetty.ee10.websocket</groupId>
++ <artifactId>jetty-ee10-websocket-jetty-server</artifactId>
++ <version>${cxf.jetty12.version}</version>
</dependency>
<dependency>
diff --cc distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsServer.java
index 9e23afc203,9e23afc203..8b2a157f7a
--- a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsServer.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsServer.java
@@@ -19,11 -19,11 +19,11 @@@
package demo.jaxrs.sse;
import org.apache.cxf.transport.servlet.CXFServlet;
++import org.eclipse.jetty.ee10.servlet.DefaultServlet;
++import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
++import org.eclipse.jetty.ee10.servlet.ServletHolder;
++import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
--import org.eclipse.jetty.server.handler.HandlerList;
--import org.eclipse.jetty.servlet.DefaultServlet;
--import org.eclipse.jetty.servlet.ServletContextHandler;
--import org.eclipse.jetty.servlet.ServletHolder;
import org.springframework.web.context.ContextLoaderListener;
import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
@@@ -38,7 -38,7 +38,7 @@@ public final class StatsServer
final ServletContextHandler staticContext = new ServletContextHandler();
staticContext.setContextPath("/static");
staticContext.addServlet(staticHolder, "/*");
-- staticContext.setResourceBase(StatsServer.class.getResource("/web-ui").toURI().toString());
++ staticContext.setBaseResourceAsString(StatsServer.class.getResource("/web-ui").toURI().toString());
// Register and map the dispatcher servlet
final ServletHolder cxfServletHolder = new ServletHolder(new CXFServlet());
@@@ -49,10 -49,10 +49,7 @@@
context.setInitParameter("contextClass", AnnotationConfigWebApplicationContext.class.getName());
context.setInitParameter("contextConfigLocation", StatsConfig.class.getName());
-- HandlerList handlers = new HandlerList();
-- handlers.addHandler(staticContext);
-- handlers.addHandler(context);
--
++ Handler.Collection handlers = new Handler.Sequence(staticContext, context);
server.setHandler(handlers);
server.start();
server.join();
diff --cc distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Server.java
index b50a59ed43,b50a59ed43..fc3406fe28
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Server.java
@@@ -20,8 -20,8 +20,8 @@@
package demo.jaxrs.tracing.server;
import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;
--import org.eclipse.jetty.servlet.ServletContextHandler;
--import org.eclipse.jetty.servlet.ServletHolder;
++import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
++import org.eclipse.jetty.ee10.servlet.ServletHolder;
public class Server {
protected Server() throws Exception {
diff --cc distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml
index 37598c7b2b,87a4e89692..828d30940a
--- a/distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml
@@@ -124,8 -124,8 +124,9 @@@
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
<dependency>
-- <groupId>org.eclipse.jetty</groupId>
-- <artifactId>jetty-webapp</artifactId>
++ <groupId>org.eclipse.jetty.ee10</groupId>
++ <artifactId>jetty-ee10-webapp</artifactId>
++ <version>${cxf.jetty12.version}</version>
</dependency>
<dependency>
<groupId>io.github.openfeign</groupId>
diff --cc distribution/src/main/release/samples/jax_rs/tracing_micrometer/src/main/java/demo/jaxrs/tracing/server/Server.java
index 126b2ab340,126b2ab340..9604f8570f
--- a/distribution/src/main/release/samples/jax_rs/tracing_micrometer/src/main/java/demo/jaxrs/tracing/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_micrometer/src/main/java/demo/jaxrs/tracing/server/Server.java
@@@ -22,8 -22,8 +22,8 @@@ package demo.jaxrs.tracing.server
import demo.jaxrs.tracing.OpenTelemetrySetup;
import io.opentelemetry.sdk.OpenTelemetrySdk;
import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;
--import org.eclipse.jetty.servlet.ServletContextHandler;
--import org.eclipse.jetty.servlet.ServletHolder;
++import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
++import org.eclipse.jetty.ee10.servlet.ServletHolder;
public class Server {
protected Server() throws Exception {
diff --cc distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
index c26567f83f,77a528e1fa..591eb72732
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
@@@ -124,8 -124,8 +124,9 @@@
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
<dependency>
-- <groupId>org.eclipse.jetty</groupId>
-- <artifactId>jetty-webapp</artifactId>
++ <groupId>org.eclipse.jetty.ee10</groupId>
++ <artifactId>jetty-ee10-webapp</artifactId>
++ <version>${cxf.jetty12.version}</version>
</dependency>
<dependency>
<groupId>io.github.openfeign</groupId>
diff --cc distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/server/Server.java
index 126b2ab340,126b2ab340..9604f8570f
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/server/Server.java
@@@ -22,8 -22,8 +22,8 @@@ package demo.jaxrs.tracing.server
import demo.jaxrs.tracing.OpenTelemetrySetup;
import io.opentelemetry.sdk.OpenTelemetrySdk;
import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;
--import org.eclipse.jetty.servlet.ServletContextHandler;
--import org.eclipse.jetty.servlet.ServletHolder;
++import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
++import org.eclipse.jetty.ee10.servlet.ServletHolder;
public class Server {
protected Server() throws Exception {
diff --cc distribution/src/main/release/samples/jax_rs/tracing_opentelemetry_camel/pom.xml
index 07954d9c66,e23a24df60..c51a64452d
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry_camel/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry_camel/pom.xml
@@@ -156,8 -156,8 +156,9 @@@
<artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
<dependency>
-- <groupId>org.eclipse.jetty</groupId>
-- <artifactId>jetty-webapp</artifactId>
++ <groupId>org.eclipse.jetty.ee10</groupId>
++ <artifactId>jetty-ee10-webapp</artifactId>
++ <version>${cxf.jetty12.version}</version>
</dependency>
<!-- spring-boot -->
diff --cc distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/Server.java
index ff574ceacd,ff574ceacd..5dd49d54ac
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/Server.java
@@@ -27,8 -27,8 +27,8 @@@ import io.jaegertracing.internal.sample
import io.jaegertracing.spi.Sender;
import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;
--import org.eclipse.jetty.servlet.ServletContextHandler;
--import org.eclipse.jetty.servlet.ServletHolder;
++import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
++import org.eclipse.jetty.ee10.servlet.ServletHolder;
import demo.jaxrs.tracing.Slf4jLogSender;
import io.opentracing.Tracer;
diff --cc distribution/src/main/release/samples/jax_rs/websocket/pom.xml
index d3d0471c39,82f697224d..4faf08fc55
--- a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
@@@ -30,11 -30,11 +30,11 @@@
</parent>
<properties>
<cxf.version>${project.version}</cxf.version>
-- <cxf.jetty.version>${cxf.jetty11.version}</cxf.jetty.version>
++ <cxf.jetty.version>${cxf.jetty12.version}</cxf.jetty.version>
</properties>
<profiles>
<profile>
-- <id>jetty11</id>
++ <id>jetty12</id>
<!-- activate it by default -->
<activation>
<activeByDefault>true</activeByDefault>
@@@ -42,9 -42,9 +42,9 @@@
<dependencies>
<!-- jetty11 websocket -->
<dependency>
-- <groupId>org.eclipse.jetty.websocket</groupId>
-- <artifactId>websocket-jakarta-server</artifactId>
-- <version>${cxf.jetty11.version}</version>
++ <groupId>org.eclipse.jetty.ee10.websocket</groupId>
++ <artifactId>jetty-ee10-websocket-jetty-server</artifactId>
++ <version>${cxf.jetty12.version}</version>
<exclusions>
<exclusion>
<groupId>jakarta.servlet</groupId>
diff --cc distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
index eb7f0e6fd0,2a974d281a..faf876a929
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
@@@ -37,7 -37,7 +37,7 @@@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
-- <version>${cxf.jetty11.version}</version>
++ <version>${cxf.jetty12.version}</version>
<configuration>
<webAppSourceDirectory>${project.build.directory}/${project.name}</webAppSourceDirectory>
<scanIntervalSeconds>1</scanIntervalSeconds>
diff --cc distribution/src/main/release/samples/pom.xml
index 8a7d60639b,520648f882..b62f082424
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@@ -31,9 -31,10 +31,10 @@@
<!-- don't deploy the samples, kind of pointless -->
<maven.deploy.skip>true</maven.deploy.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cxf.spring.boot.version>3.0.13</cxf.spring.boot.version>
- <cxf.spring.cloud.eureka.version>4.0.3</cxf.spring.cloud.eureka.version>
- <cxf.jetty11.version>11.0.19</cxf.jetty11.version>
+ <cxf.spring.boot.version>3.2.2</cxf.spring.boot.version>
+ <cxf.spring.cloud.eureka.version>4.1.0</cxf.spring.cloud.eureka.version>
- <cxf.netty.version>4.1.105.Final</cxf.netty.version>
++ <cxf.jetty12.version>12.0.5</cxf.jetty12.version>
+ <cxf.netty.version>4.1.106.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
<cxf.swagger.ui.version>5.10.3</cxf.swagger.ui.version>
<cxf.tika.version>2.7.0</cxf.tika.version>
@@@ -212,7 -213,7 +213,7 @@@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
-- <version>${cxf.jetty11.version}</version>
++ <version>${cxf.jetty12.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --cc distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/Server.java
index 417dd72278,417dd72278..3a5e837f68
--- a/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/Server.java
+++ b/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/Server.java
@@@ -18,10 -18,10 +18,9 @@@
*/
package demo.spring.service;
++import org.eclipse.jetty.ee10.webapp.WebAppContext;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.handler.DefaultHandler;
--import org.eclipse.jetty.server.handler.HandlerCollection;
--import org.eclipse.jetty.webapp.WebAppContext;
public class Server {
@@@ -42,9 -42,9 +41,7 @@@
webappcontext.setWar("target/RubySpringSupport.war");
-- HandlerCollection handlers = new HandlerCollection();
-- handlers.setHandlers(new Handler[] {webappcontext, new DefaultHandler()});
--
++ Handler.Collection handlers = new Handler.Sequence(webappcontext, new DefaultHandler());
server.setHandler(handlers);
server.start();
System.out.println("Server ready...");
diff --cc parent/pom.xml
index 60d6b2b986,9ff6b7d86c..872b90e06d
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@@ -91,9 -91,9 +91,9 @@@
<cxf.activemq.artemis.version>2.31.2</cxf.activemq.artemis.version>
<cxf.ahc.version>2.12.3</cxf.ahc.version>
<cxf.arquillian.version>1.8.0.Final</cxf.arquillian.version>
- <cxf.arquillian.weld.container.version>3.0.0.Final</cxf.arquillian.weld.container.version>
+ <cxf.arquillian.weld.container.version>3.0.2.Final</cxf.arquillian.weld.container.version>
<cxf.aspectj.version>1.9.21</cxf.aspectj.version>
- <cxf.assertj.version>3.25.1</cxf.assertj.version>
+ <cxf.assertj.version>3.25.2</cxf.assertj.version>
<cxf.atmosphere.version.range>[3.0, 4.0)</cxf.atmosphere.version.range>
<cxf.atmosphere.version>3.0.4</cxf.atmosphere.version>
<cxf.bcprov.version>1.77</cxf.bcprov.version>
@@@ -110,9 -110,9 +110,9 @@@
<cxf.derby.version>10.16.1.1</cxf.derby.version>
<cxf.dom4j.version>2.1.4</cxf.dom4j.version>
<cxf.dropwizard3.version>3.2.6</cxf.dropwizard3.version>
- <cxf.dropwizard4.version>4.2.23</cxf.dropwizard4.version>
+ <cxf.dropwizard4.version>4.2.25</cxf.dropwizard4.version>
<cxf.ehcache3.version>3.10.8</cxf.ehcache3.version>
- <cxf.el-api.version>3.0.3</cxf.el-api.version>
+ <cxf.el-api.version>5.0.1</cxf.el-api.version>
<cxf.findbugs.version>3.0.2</cxf.findbugs.version>
<cxf.hisrc.basicjaxb.version>2.2.0</cxf.hisrc.basicjaxb.version>
<cxf.geronimo.jta.version>1.1.1</cxf.geronimo.jta.version>
@@@ -162,9 -161,8 +162,9 @@@
<cxf.jcache.version>1.1.1</cxf.jcache.version>
<cxf.jdom.version>1.0</cxf.jdom.version>
<cxf.jettison.version>1.5.4</cxf.jettison.version>
- <cxf.jetty11.version>11.0.17</cxf.jetty11.version>
- <cxf.jetty12.version>12.0.3</cxf.jetty12.version>
+ <cxf.jetty11.version>11.0.19</cxf.jetty11.version>
- <cxf.jetty.version>${cxf.jetty11.version}</cxf.jetty.version>
++ <cxf.jetty12.version>12.0.5</cxf.jetty12.version>
+ <cxf.jetty.version>${cxf.jetty12.version}</cxf.jetty.version>
<cxf.jexl.version>3.3</cxf.jexl.version>
<cxf.joda.time.version>2.10.10</cxf.joda.time.version>
<cxf.johnzon.version>1.2.21</cxf.johnzon.version>
@@@ -179,13 -177,13 +179,13 @@@
<cxf.logback.classic.version>1.4.14</cxf.logback.classic.version>
<cxf.lucene.version>9.9.1</cxf.lucene.version>
<cxf.maven.core.version>3.9.6</cxf.maven.core.version>
- <cxf.micrometer.version>1.10.13</cxf.micrometer.version>
- <cxf.micrometer-tracing.version>1.0.12</cxf.micrometer-tracing.version>
- <cxf.microprofile.config.version>3.0.3</cxf.microprofile.config.version>
+ <cxf.micrometer.version>1.12.2</cxf.micrometer.version>
+ <cxf.micrometer-tracing.version>1.2.2</cxf.micrometer-tracing.version>
+ <cxf.microprofile.config.version>3.1</cxf.microprofile.config.version>
<cxf.microprofile.rest.client.version>3.0.1</cxf.microprofile.rest.client.version>
- <cxf.microprofile.openapi.version>3.0</cxf.microprofile.openapi.version>
+ <cxf.microprofile.openapi.version>3.1.1</cxf.microprofile.openapi.version>
<cxf.mina.version>2.2.1</cxf.mina.version>
- <cxf.mockito.version>5.9.0</cxf.mockito.version>
+ <cxf.mockito.version>5.10.0</cxf.mockito.version>
<cxf.msv.version>2022.7</cxf.msv.version>
<cxf.neethi.version>3.2.0</cxf.neethi.version>
<cxf.netty.version.range>[4,5)</cxf.netty.version.range>
diff --cc rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index c34c1ec2ea,1e4cb9fbd9..aa99222681
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@@ -1329,137 -1180,5 +1329,137 @@@ public class JettyHTTPServerEngine impl
public void setSessionTimeout(int sessionTimeout) {
this.sessionTimeout = sessionTimeout;
}
+
+ private final class CxfJettyErrorHandler extends ErrorHandler {
+
- public boolean handle(Request request, Response response, Callback callback) {
++ public boolean handle(Request request, Response response, Callback callback) throws Exception {
+ String msg = (String)request.getAttribute(RequestDispatcher.ERROR_MESSAGE);
+ if (StringUtils.isEmpty(msg) || msg.contains("org.apache.cxf.interceptor.Fault")) {
+ msg = HttpStatus.getMessage(response.getStatus());
+ request.setAttribute(RequestDispatcher.ERROR_MESSAGE, msg);
+ }
+ if (response instanceof Response) {
+ ((Response)response).setStatus(response.getStatus());
+ }
+ return super.handle(request, response, callback);
+ }
+
+ //CHECKSTYLE:OFF
+ protected boolean generateAcceptableResponse(Request request, Response response,
+ Callback callback, String contentType,
+ List<Charset> charsets, int code, String message,
+ Throwable cause)
+ //CHECKSTYLE:ON
+ throws IOException {
+ Type type;
+ Charset charset;
+ switch (contentType) {
+ case "text/html":
+ case "text/*":
+ case "*/*":
+ type = Type.TEXT_HTML;
+ charset = charsets.stream().findFirst().orElse(StandardCharsets.ISO_8859_1);
+ break;
+
+ case "text/json":
+ case "application/json":
+ if (charsets.contains(StandardCharsets.UTF_8)) {
+ charset = StandardCharsets.UTF_8;
+ } else if (charsets.contains(StandardCharsets.ISO_8859_1)) {
+ charset = StandardCharsets.ISO_8859_1;
+ } else {
+ return false;
+ }
+ type = Type.TEXT_JSON.is(contentType) ? Type.TEXT_JSON : Type.APPLICATION_JSON;
+ break;
+
+ case "text/plain":
+ type = Type.TEXT_PLAIN;
+ charset = charsets.stream().findFirst().orElse(StandardCharsets.ISO_8859_1);
+ break;
+
+ default:
+ return false;
+ }
+
+ int bufferSize = request.getConnectionMetaData().getHttpConfiguration().getOutputBufferSize();
+ bufferSize = Math.min(8192, bufferSize); // TODO ?
+ RetainableByteBuffer buffer = request.getComponents().getByteBufferPool().acquire(bufferSize,
+ false);
+
+ try {
+ // write into the response aggregate buffer and flush it asynchronously.
+ // Looping to reduce size if buffer overflows
+ boolean showStacks = isShowStacks();
+ while (true) {
+ try {
+ buffer.clear();
+ ByteBufferOutputStream out = new ByteBufferOutputStream(buffer.getByteBuffer());
+ PrintWriter writer = new PrintWriter(new OutputStreamWriter(out, charset));
+
+ switch (type) {
+ case TEXT_HTML:
+ writeErrorHtml(request, writer, charset, code, message, cause, showStacks);
+ break;
+ case TEXT_JSON:
+
+ case APPLICATION_JSON:
+ writeErrorJson(request, writer, code, message, cause, showStacks);
+ break;
+ case TEXT_PLAIN:
+ writeErrorPlain(request, writer, code, message, cause, showStacks);
+ break;
+ default:
+ throw new IllegalStateException();
+ }
+
+ writer.flush();
+ break;
+ } catch (BufferOverflowException e) {
+ if (showStacks) {
+ if (LOG.isLoggable(Level.FINER)) {
+ LOG.log(Level.FINER, "Disable stacks for " + e.toString());
+ }
+ showStacks = false;
+ continue;
+ }
+
+ LOG.log(Level.WARNING,
+ "Error page too large:" + message);
+
+ break;
+ }
+ }
+
+ if (!buffer.hasRemaining()) {
+ buffer.release();
+ callback.succeeded();
+ return true;
+ }
+
+ response.getHeaders().put(type.getContentTypeField(charset));
+ response.write(true, buffer.getByteBuffer(), new WriteErrorCallback(callback, buffer));
+
+ return true;
+ } catch (Throwable x) {
+ buffer.release();
+ throw x;
+ }
+ }
+
+ class WriteErrorCallback extends Callback.Nested {
+ private final Retainable retainable;
+
+ WriteErrorCallback(Callback callback, Retainable retainable) {
+ super(callback);
+ this.retainable = retainable;
+ }
+
+ @Override
+ public void completed() {
+ this.retainable.release();
+ }
+ }
+ }
}