diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c6bf640005b..758995bd925 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -30,11 +30,11 @@ jobs: - name: Checkout repository uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - name: Setup JDK 17 + - name: Setup JDK 21 uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0 with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Cache local Maven repository uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0 with: diff --git a/.github/workflows/pull-request-build.yml b/.github/workflows/pull-request-build.yml index 97c9c5aa8ef..272dd535142 100644 --- a/.github/workflows/pull-request-build.yml +++ b/.github/workflows/pull-request-build.yml @@ -19,10 +19,10 @@ jobs: timeout-minutes: 130 steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v3.6.0 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: maven - name: Build with Apache Maven (Windows) diff --git a/bom/pom.xml b/bom/pom.xml index 1b5a56d74a9..32d4699b01d 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -20,7 +20,7 @@ org.apache.cxf cxf - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT 4.0.0 cxf-bom diff --git a/core/pom.xml b/core/pom.xml index 6566f72354b..43dce7ed87d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../parent/pom.xml diff --git a/coverage/pom.xml b/coverage/pom.xml index 3e0d187c17b..3b4e8be209b 100644 --- a/coverage/pom.xml +++ b/coverage/pom.xml @@ -20,7 +20,7 @@ org.apache.cxf cxf - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT 4.0.0 cxf-coverage-report diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml index e2e3c28566a..ad9534813ca 100644 --- a/distribution/javadoc/pom.xml +++ b/distribution/javadoc/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../parent @@ -38,7 +38,7 @@ org.apache.cxf cxf-bom - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT pom import @@ -48,107 +48,107 @@ org.apache.cxf cxf-core - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-client - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-security - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-security-http-signature - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-security-jose - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-security-jose-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-security-oauth2 - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-security-oauth2-saml - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-security-saml - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-service-description - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-service-description-openapi-v3 - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-service-description-microprofile-openapi - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-mp-client - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-databinding-aegis - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-databinding-jaxb - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-extension-providers - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-extension-reactor - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-extension-search - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-features-clustering - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-ws-transfer - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-websocket - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.commons @@ -391,11 +391,6 @@ opentelemetry-semconv ${cxf.opentelemetry.semconv.version} - - io.opentelemetry.semconv - opentelemetry-semconv-incubating - ${cxf.opentelemetry.semconv.version} - io.opentracing opentracing-util @@ -417,7 +412,7 @@ undertow-core - io.undertow + io.undertow.ee undertow-servlet @@ -425,16 +420,16 @@ jetty-server - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty.ee11 + jetty-ee11-webapp - org.eclipse.jetty.ee10 - jetty-ee10-servlet + org.eclipse.jetty.ee11 + jetty-ee11-servlet - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server + org.eclipse.jetty.ee11.websocket + jetty-ee11-websocket-jetty-server org.eclipse.jetty @@ -542,6 +537,10 @@ org.springframework.boot spring-boot-starter-validation + + org.springframework.boot + spring-boot-micrometer-metrics + org.springframework.security spring-security-web diff --git a/distribution/manifest/pom.xml b/distribution/manifest/pom.xml index 598d01c3da0..a7c6e42041b 100644 --- a/distribution/manifest/pom.xml +++ b/distribution/manifest/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../parent @@ -39,52 +39,52 @@ ${project.groupId} cxf-tools-common - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-tools-validator - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-tools-wsdlto-core - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-tools-misctools - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-tools-wsdlto-databinding-jaxb - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-tools-corba - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-tools-wsdlto-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-tools-wsdlto-frontend-javascript - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-tools-wadlto-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-tools-java2ws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId}.xjcplugins @@ -119,52 +119,52 @@ ${project.groupId} cxf-core - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-features-clustering - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-management - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-transports-local - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-transports-http-hc - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-transports-http-netty-server - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-transports-http-netty-client - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-transports-udp - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.slf4j @@ -177,133 +177,133 @@ ${project.groupId} cxf-rt-transports-jms - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-bindings-soap - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-bindings-xml - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-bindings-corba - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-bindings-coloc - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-databinding-aegis - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-rs-extension-providers - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-rs-extension-search - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-rs-security-cors - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-rs-security-oauth2 - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-rs-security-xml - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-ws-addr - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-ws-rm - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-ws-policy - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-ws-mex - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-ws-security - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-frontend-js - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-frontend-simple - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-javascript - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf.services.sts cxf-services-sts-core - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf.services.wsn cxf-services-wsn-api - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf.services.wsn cxf-services-wsn-core - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf.services.ws-discovery cxf-services-ws-discovery-api - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf.services.ws-discovery cxf-services-ws-discovery-service - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.codehaus.jettison diff --git a/distribution/pom.xml b/distribution/pom.xml index 0190966e057..4238381d486 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../parent @@ -44,52 +44,52 @@ ${project.groupId} cxf-tools-common - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-tools-validator - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-tools-wsdlto-core - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-tools-wsdlto-frontend-javascript - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-tools-misctools - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-tools-corba - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-tools-wsdlto-databinding-jaxb - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-tools-wsdlto-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-tools-wadlto-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-tools-java2ws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId}.xjc-utils @@ -124,57 +124,57 @@ ${project.groupId} cxf-core - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-features-clustering - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-features-throttling - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-features-metrics - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-management - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-transports-local - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-transports-udp - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-transports-http-hc - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-transports-http-netty-server - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.geronimo.specs @@ -189,7 +189,7 @@ ${project.groupId} cxf-rt-transports-http-netty-client - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT io.netty @@ -200,12 +200,12 @@ ${project.groupId} cxf-rt-transports-websocket - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-transports-http-undertow - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.slf4j @@ -218,178 +218,178 @@ ${project.groupId} cxf-rt-transports-jms - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-bindings-soap - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-bindings-corba - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-bindings-xml - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-bindings-coloc - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-databinding-aegis - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-ws-addr - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-ws-rm - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-ws-policy - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-ws-mex - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-ws-security - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-ws-transfer - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-ws-eventing - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-frontend-js - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-frontend-simple - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-rs-extension-providers - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-rs-extension-search - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-rs-security-cors - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-rs-security-oauth2 - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-rs-security-oauth2-saml - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-rs-security-xml - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-rs-security-sso-saml - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-rs-security-sso-oidc - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-rs-security-http-signature - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-rs-sse - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-rs-mp-client - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-rs-http-sci - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.groupId} cxf-rt-javascript - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf.services.sts cxf-services-sts-core - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf.services.wsn cxf-services-wsn-api - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf.services.wsn cxf-services-wsn-core - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf.services.ws-discovery cxf-services-ws-discovery-api - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf.services.ws-discovery cxf-services-ws-discovery-service - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.codehaus.jettison diff --git a/distribution/src/main/release/samples/aegis/pom.xml b/distribution/src/main/release/samples/aegis/pom.xml index e15d860f216..98a955f7fb0 100644 --- a/distribution/src/main/release/samples/aegis/pom.xml +++ b/distribution/src/main/release/samples/aegis/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -88,24 +88,24 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-databinding-aegis - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT junit diff --git a/distribution/src/main/release/samples/aegis_standalone/pom.xml b/distribution/src/main/release/samples/aegis_standalone/pom.xml index 0eef5cd4607..8e9a7f2c263 100644 --- a/distribution/src/main/release/samples/aegis_standalone/pom.xml +++ b/distribution/src/main/release/samples/aegis_standalone/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -88,7 +88,7 @@ org.apache.cxf cxf-rt-databinding-aegis - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT net.java.dev.stax-utils diff --git a/distribution/src/main/release/samples/callback/pom.xml b/distribution/src/main/release/samples/callback/pom.xml index c9cb3f44c50..f61bd014ef3 100644 --- a/distribution/src/main/release/samples/callback/pom.xml +++ b/distribution/src/main/release/samples/callback/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -36,7 +36,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-CallbackService @@ -117,17 +117,17 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/distribution/src/main/release/samples/configuration_interceptor/pom.xml b/distribution/src/main/release/samples/configuration_interceptor/pom.xml index ec2fa124f35..ce3731f687f 100644 --- a/distribution/src/main/release/samples/configuration_interceptor/pom.xml +++ b/distribution/src/main/release/samples/configuration_interceptor/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -35,7 +35,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -118,17 +118,17 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/distribution/src/main/release/samples/corba/bank/pom.xml b/distribution/src/main/release/samples/corba/bank/pom.xml index dabe03476b2..70115cbf7dd 100644 --- a/distribution/src/main/release/samples/corba/bank/pom.xml +++ b/distribution/src/main/release/samples/corba/bank/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -38,7 +38,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -65,7 +65,7 @@ - 17 + 21 diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/pom.xml b/distribution/src/main/release/samples/corba/bank_ws_addressing/pom.xml index a0dc09199c2..b2c7d00a3df 100644 --- a/distribution/src/main/release/samples/corba/bank_ws_addressing/pom.xml +++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -69,7 +69,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -129,7 +129,7 @@ - 17 + 21 diff --git a/distribution/src/main/release/samples/corba/hello_world/pom.xml b/distribution/src/main/release/samples/corba/hello_world/pom.xml index 80b77fad683..26009c5a19b 100644 --- a/distribution/src/main/release/samples/corba/hello_world/pom.xml +++ b/distribution/src/main/release/samples/corba/hello_world/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -71,7 +71,7 @@ org.apache.cxf cxf-corbatools-maven-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -174,7 +174,7 @@ - 17 + 21 @@ -279,17 +279,17 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-bindings-corba - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-tools-common - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework diff --git a/distribution/src/main/release/samples/groovy_spring_support/pom.xml b/distribution/src/main/release/samples/groovy_spring_support/pom.xml index e4043732950..75814c35702 100644 --- a/distribution/src/main/release/samples/groovy_spring_support/pom.xml +++ b/distribution/src/main/release/samples/groovy_spring_support/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT @@ -48,7 +48,7 @@ - 17 + 21 @@ -108,23 +108,23 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.groovy groovy - 4.0.29 + 5.0.2 org.springframework @@ -135,8 +135,8 @@ spring-web - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty.ee11 + jetty-ee11-webapp diff --git 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 index 850c944d713..bedceb120a5 100644 --- 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,7 +18,7 @@ */ package demo.spring.servlet; -import org.eclipse.jetty.ee10.webapp.WebAppContext; +import org.eclipse.jetty.ee11.webapp.WebAppContext; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.handler.DefaultHandler; diff --git a/distribution/src/main/release/samples/in_jvm_transport/pom.xml b/distribution/src/main/release/samples/in_jvm_transport/pom.xml index a38fa7b23d1..5a6c2b3ad8f 100644 --- a/distribution/src/main/release/samples/in_jvm_transport/pom.xml +++ b/distribution/src/main/release/samples/in_jvm_transport/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -87,23 +87,23 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-bindings-coloc - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/distribution/src/main/release/samples/java_first_jaxws/pom.xml b/distribution/src/main/release/samples/java_first_jaxws/pom.xml index 8378f3659da..6a9cbc90199 100644 --- a/distribution/src/main/release/samples/java_first_jaxws/pom.xml +++ b/distribution/src/main/release/samples/java_first_jaxws/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT @@ -102,7 +102,7 @@ org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT @@ -134,12 +134,12 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework diff --git a/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml b/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml index dc9da4f3545..a543fc40aea 100644 --- a/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml +++ b/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -82,18 +82,18 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/distribution/src/main/release/samples/java_first_jms/pom.xml b/distribution/src/main/release/samples/java_first_jms/pom.xml index 889a9e54125..ad83d5d07f2 100644 --- a/distribution/src/main/release/samples/java_first_jms/pom.xml +++ b/distribution/src/main/release/samples/java_first_jms/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -97,12 +97,12 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-jms - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/distribution/src/main/release/samples/java_first_pojo/pom.xml b/distribution/src/main/release/samples/java_first_pojo/pom.xml index 4bfeb4a7d79..86164005b13 100644 --- a/distribution/src/main/release/samples/java_first_pojo/pom.xml +++ b/distribution/src/main/release/samples/java_first_pojo/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -82,18 +82,18 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/distribution/src/main/release/samples/java_first_spring_support/pom.xml b/distribution/src/main/release/samples/java_first_spring_support/pom.xml index 5e12e7a4156..33d175b8106 100644 --- a/distribution/src/main/release/samples/java_first_spring_support/pom.xml +++ b/distribution/src/main/release/samples/java_first_spring_support/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT @@ -43,7 +43,7 @@ - 17 + 21 @@ -103,17 +103,17 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework @@ -124,8 +124,8 @@ spring-web - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty.ee11 + jetty-ee11-webapp ${cxf.jetty12.version} diff --git 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 index 84d35d6396b..b9e8b14af37 100644 --- 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,7 +18,7 @@ */ package demo.spring.service; -import org.eclipse.jetty.ee10.webapp.WebAppContext; +import org.eclipse.jetty.ee11.webapp.WebAppContext; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.handler.DefaultHandler; diff --git a/distribution/src/main/release/samples/jax_rs/basic/pom.xml b/distribution/src/main/release/samples/jax_rs/basic/pom.xml index 88ce0b0af6c..fc933d679a3 100644 --- a/distribution/src/main/release/samples/jax_rs/basic/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/basic/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -83,18 +83,18 @@ org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT jakarta.ws.rs diff --git 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 index 0dd07a7b82f..b62345d503b 100644 --- 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 @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -81,12 +81,12 @@ org.apache.cxf cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework diff --git a/distribution/src/main/release/samples/jax_rs/basic_http2_netty/pom.xml b/distribution/src/main/release/samples/jax_rs/basic_http2_netty/pom.xml index 1d3ce9917c7..c1b34d58a52 100644 --- a/distribution/src/main/release/samples/jax_rs/basic_http2_netty/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/basic_http2_netty/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -81,12 +81,12 @@ org.apache.cxf cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-netty-server - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework diff --git a/distribution/src/main/release/samples/jax_rs/basic_http2_undertow/pom.xml b/distribution/src/main/release/samples/jax_rs/basic_http2_undertow/pom.xml index c2379c0028b..fa58b7933ab 100644 --- a/distribution/src/main/release/samples/jax_rs/basic_http2_undertow/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/basic_http2_undertow/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -81,12 +81,12 @@ org.apache.cxf cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-undertow - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework diff --git a/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml b/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml index 5ab31fab7a3..c806e7d1022 100644 --- a/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -81,17 +81,17 @@ org.apache.cxf cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-client - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.httpcomponents diff --git a/distribution/src/main/release/samples/jax_rs/basic_oidc/pom.xml b/distribution/src/main/release/samples/jax_rs/basic_oidc/pom.xml index 3dee87213c9..d32348776e7 100644 --- a/distribution/src/main/release/samples/jax_rs/basic_oidc/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/basic_oidc/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -34,22 +34,22 @@ org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-security-jose-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-security-sso-oidc - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT jakarta.ws.rs diff --git a/distribution/src/main/release/samples/jax_rs/big_query/pom.xml b/distribution/src/main/release/samples/jax_rs/big_query/pom.xml index 3ae07994658..5a327924ac4 100644 --- a/distribution/src/main/release/samples/jax_rs/big_query/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/big_query/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -34,32 +34,32 @@ org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-security-jose-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-extension-providers - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-security-sso-oidc - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-features-logging - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT jakarta.ws.rs @@ -129,7 +129,7 @@ - 17 + 21 diff --git a/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml b/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml index 0f4c361596a..cb914765ca9 100644 --- a/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/content_negotiation/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -83,23 +83,23 @@ org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-extension-providers - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.codehaus.jettison diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/pom.xml b/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/pom.xml index aaec75b3199..c58d555511c 100644 --- a/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_openapi_microprofile_spring/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3/pom.xml b/distribution/src/main/release/samples/jax_rs/description_openapi_v3/pom.xml index 47470490b91..0c9666ebf78 100644 --- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -74,8 +74,8 @@ jackson-jakarta-rs-json-provider - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty.ee11 + jetty-ee11-webapp diff --git 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 index 18602949951..c5540b669a8 100644 --- 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 @@ 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.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; public class Server { diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/pom.xml b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/pom.xml index e3e3baf89e5..e781ffabb3f 100644 --- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3_spring/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. diff --git 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 index 7f426ff8551..fc1b736d1dd 100644 --- 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 @@ -26,7 +26,7 @@ under the License. org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. diff --git a/distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml b/distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml index e43f2790752..a2249bce12a 100644 --- a/distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. diff --git a/distribution/src/main/release/samples/jax_rs/odata/pom.xml b/distribution/src/main/release/samples/jax_rs/odata/pom.xml index d4c5e8e58da..6cd4c0ed14c 100644 --- a/distribution/src/main/release/samples/jax_rs/odata/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/odata/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -57,12 +57,12 @@ org.apache.cxf cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.olingo diff --git a/distribution/src/main/release/samples/jax_rs/search/pom.xml b/distribution/src/main/release/samples/jax_rs/search/pom.xml index 7bccaf7db8e..46261ab662b 100644 --- a/distribution/src/main/release/samples/jax_rs/search/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/search/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -83,33 +83,33 @@ org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-extension-search - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-extension-providers - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-security-cors - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.lucene @@ -159,14 +159,14 @@ jakarta.ws.rs-api - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty.ee11 + jetty-ee11-webapp ${cxf.jetty12.version} org.apache.httpcomponents httpclient - + org.apache.httpcomponents httpmime diff --git a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java index dd89a203a68..f66594519d3 100644 --- a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java +++ b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java @@ -172,7 +172,7 @@ public JsonArray getBooks() throws IOException { final DocumentStoredFieldVisitor fieldVisitor = new DocumentStoredFieldVisitor(LuceneDocumentMetadata.SOURCE_FIELD); - reader.document(scoreDoc.doc, fieldVisitor); + reader.storedFields().document(scoreDoc.doc, fieldVisitor); builder.add(fieldVisitor .getDocument() .getField(LuceneDocumentMetadata.SOURCE_FIELD) @@ -204,7 +204,7 @@ public Response findBook(@Context SearchContext searchContext, if (query != null) { final TopDocs topDocs = searcher.search(query, 1000); for (final ScoreDoc scoreDoc: topDocs.scoreDocs) { - final Document document = reader.document(scoreDoc.doc); + final Document document = reader.storedFields().document(scoreDoc.doc); final String source = document .getField(LuceneDocumentMetadata.SOURCE_FIELD) .stringValue(); @@ -288,7 +288,7 @@ private boolean exists(final String source) throws IOException { try { return searcher.search(new TermQuery( - new Term(LuceneDocumentMetadata.SOURCE_FIELD, source)), 1).totalHits.value > 0; + new Term(LuceneDocumentMetadata.SOURCE_FIELD, source)), 1).totalHits.value() > 0; } finally { reader.close(); } diff --git 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 index 9e71499e913..ecc33faa455 100644 --- 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 @@ 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.ee10.servlet.DefaultServlet; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.DefaultServlet; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; public class Server { diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml index ce840c17352..adeaeb6b0a5 100644 --- a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml @@ -4,7 +4,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. org.apache.cxf.samples @@ -16,7 +16,7 @@ org.apache.cxf cxf-spring-boot-starter-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework.boot @@ -32,12 +32,12 @@ org.apache.cxf cxf-rt-rs-service-description-openapi-v3 - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-features-metrics - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT io.micrometer diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml index 12568c9627c..febd3016fe6 100644 --- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml @@ -4,7 +4,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../.. spring-boot-sample-rs-scan-app @@ -15,7 +15,7 @@ org.apache.cxf cxf-spring-boot-starter-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework.boot @@ -31,7 +31,7 @@ org.apache.cxf cxf-rt-features-metrics - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/resources/application.yml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/resources/application.yml index 93d65d16fcd..868de5ed304 100644 --- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/resources/application.yml +++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/resources/application.yml @@ -19,6 +19,8 @@ cxf: eureka: client: + restclient: + enabled: true registerWithEureka: true serviceUrl: defaultZone: ${EUREKA_SERVER_URI:http://127.0.0.1}:${EUREKA_SERVER_PORT:8761}/eureka/ diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml index a5a29b5291f..914ad06033e 100644 --- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml @@ -4,7 +4,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../.. spring-boot-sample-rs-scan-client @@ -25,13 +25,13 @@ org.apache.cxf cxf-rt-rs-client - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-features-clustering - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java index 25d7cf848b8..3cc0e4d0e84 100644 --- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java +++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java @@ -42,8 +42,6 @@ import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.netflix.eureka.http.DefaultEurekaClientHttpRequestFactorySupplier; -import org.springframework.cloud.netflix.eureka.http.RestTemplateDiscoveryClientOptionalArgs; import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; @@ -79,11 +77,6 @@ public void run(String... runArgs) throws Exception { }; } - @Bean - RestTemplateDiscoveryClientOptionalArgs restTemplateDiscoveryClientOptionalArgs() { - return new RestTemplateDiscoveryClientOptionalArgs(new DefaultEurekaClientHttpRequestFactorySupplier()); - } - /** * Basic Random selection of statically prepared addresses. * More advanced strategies will periodically pull DiscoveryClient diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml index 7fbfd0da437..5ac1fe85731 100644 --- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml @@ -4,7 +4,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../.. spring-boot-sample-rs-scan-eureka diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml index 5dadea5733c..7fa1701ad04 100644 --- a/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -100,18 +100,18 @@ org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT jakarta.ws.rs @@ -152,8 +152,8 @@ ${cxf.aspectj.version} - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty.ee11 + jetty-ee11-webapp org.apache.httpcomponents diff --git 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 index db6a805d32a..b78fe9bb5dc 100644 --- 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,7 +18,7 @@ */ package demo.jaxrs.servlet; -import org.eclipse.jetty.ee10.webapp.WebAppContext; +import org.eclipse.jetty.ee11.webapp.WebAppContext; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.handler.DefaultHandler; diff --git a/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml index e5bfca7fdb8..e6b8e01da76 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml @@ -7,7 +7,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -20,19 +20,19 @@ org.apache.cxf cxf-integration-cdi - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-sse - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT @@ -57,19 +57,19 @@ - org.eclipse.jetty.ee10 - jetty-ee10-apache-jsp + org.eclipse.jetty.ee11 + jetty-ee11-apache-jsp ${cxf.jetty12.version} - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty.ee11 + jetty-ee11-webapp - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server + org.eclipse.jetty.ee11.websocket + jetty-ee11-websocket-jetty-server ${cxf.jetty12.version} diff --git 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 index 29c55a2a9af..9b895be1309 100644 --- 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,9 +19,9 @@ 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.ee11.servlet.DefaultServlet; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; import org.jboss.weld.environment.servlet.BeanManagerResourceBindingListener; diff --git a/distribution/src/main/release/samples/jax_rs/sse_client/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_client/pom.xml index 1570343664e..032a315e270 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_client/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/sse_client/pom.xml @@ -7,7 +7,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -15,19 +15,19 @@ org.apache.cxf cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-client - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-sse - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT @@ -46,7 +46,7 @@ - io.undertow + io.undertow.ee undertow-servlet diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml index 5e84ec5ab7b..7a272b28318 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml @@ -7,7 +7,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -15,13 +15,13 @@ org.apache.cxf cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-sse - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT @@ -41,19 +41,19 @@ - org.eclipse.jetty.ee10 - jetty-ee10-apache-jsp + org.eclipse.jetty.ee11 + jetty-ee11-apache-jsp ${cxf.jetty12.version} - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty.ee11 + jetty-ee11-webapp - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server + org.eclipse.jetty.ee11.websocket + jetty-ee11-websocket-jetty-server ${cxf.jetty12.version} diff --git 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 index 8b2a157f7ad..fa8881bc3d2 100644 --- 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,9 +19,9 @@ 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.ee11.servlet.DefaultServlet; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; import org.springframework.web.context.ContextLoaderListener; diff --git a/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml index 7d2ec945a73..e9b00337d08 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml @@ -7,7 +7,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -25,13 +25,13 @@ org.apache.cxf cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-sse - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml index e26df16ae26..dc39693a6a8 100644 --- a/distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -169,7 +169,7 @@ org.apache.cxf cxf-integration-tracing-brave - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf @@ -188,8 +188,8 @@ jakarta.ws.rs-api - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty.ee11 + jetty-ee11-webapp io.zipkin.reporter2 diff --git 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 index fc3406fe286..a8bb22858cb 100644 --- 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 @@ package demo.jaxrs.tracing.server; import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; public class Server { protected Server() throws Exception { diff --git a/distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml index 6f6b62c8a64..90cd4bfdb23 100644 --- a/distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -83,33 +83,33 @@ org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-client - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-integration-tracing-micrometer - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-extension-providers - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT jakarta.json @@ -124,8 +124,8 @@ jakarta.ws.rs-api - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty.ee11 + jetty-ee11-webapp ${cxf.jetty12.version} diff --git a/distribution/src/main/release/samples/jax_rs/tracing_micrometer/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java b/distribution/src/main/release/samples/jax_rs/tracing_micrometer/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java index 3d7eb6aad0f..25995aced86 100644 --- a/distribution/src/main/release/samples/jax_rs/tracing_micrometer/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java +++ b/distribution/src/main/release/samples/jax_rs/tracing_micrometer/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java @@ -26,12 +26,12 @@ import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.export.BatchSpanProcessor; -import io.opentelemetry.semconv.ResourceAttributes; +import io.opentelemetry.semconv.ServiceAttributes; public class OpenTelemetrySetup { public static OpenTelemetrySdk setup(String serviceName) { final Resource resource = Resource.getDefault() - .merge(Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, serviceName))); + .merge(Resource.create(Attributes.of(ServiceAttributes.SERVICE_NAME, serviceName))); final SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder() .addSpanProcessor(BatchSpanProcessor.builder(LoggingSpanExporter.create()).build()) diff --git 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 index 9604f8570f4..8b285d2e5b1 100644 --- 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 @@ import demo.jaxrs.tracing.OpenTelemetrySetup; import io.opentelemetry.sdk.OpenTelemetrySdk; import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; public class Server { protected Server() throws Exception { diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml index 94c275dd41b..57298db614f 100644 --- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -83,33 +83,33 @@ org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-client - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-integration-tracing-opentelemetry - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-extension-providers - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT jakarta.json @@ -124,8 +124,8 @@ jakarta.ws.rs-api - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty.ee11 + jetty-ee11-webapp ${cxf.jetty12.version} diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java index 7f66981d5de..9bd792caf8a 100644 --- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java +++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java @@ -27,14 +27,14 @@ import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.export.BatchSpanProcessor; -import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes; +import io.opentelemetry.semconv.ServiceAttributes; import io.opentracing.util.GlobalTracer; public class OpenTelemetrySetup { public static OpenTelemetrySdk setup(String serviceName) { Resource resource = Resource.getDefault() - .merge(Resource.create(Attributes.of(ServiceIncubatingAttributes.SERVICE_NAME, serviceName))); + .merge(Resource.create(Attributes.of(ServiceAttributes.SERVICE_NAME, serviceName))); final SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder() .addSpanProcessor(BatchSpanProcessor.builder(LoggingSpanExporter.create()).build()) diff --git 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 index 9604f8570f4..8b285d2e5b1 100644 --- 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 @@ import demo.jaxrs.tracing.OpenTelemetrySetup; import io.opentelemetry.sdk.OpenTelemetrySdk; import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; public class Server { protected Server() throws Exception { diff --git 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 index 7a9861f1288..fcfe49a0d0d 100644 --- 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 @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -156,8 +156,8 @@ jakarta.ws.rs-api - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty.ee11 + jetty-ee11-webapp ${cxf.jetty12.version} diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry_camel/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry_camel/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java index 6813a51f334..411d8b62427 100644 --- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry_camel/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java +++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry_camel/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java @@ -27,13 +27,13 @@ import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.export.BatchSpanProcessor; import io.opentelemetry.sdk.trace.samplers.Sampler; -import io.opentelemetry.semconv.resource.attributes.ResourceAttributes; +import io.opentelemetry.semconv.ServiceAttributes; public class OpenTelemetrySetup { public static OpenTelemetrySdk setup(String serviceName) { Resource resource = Resource.getDefault() - .merge(Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, serviceName))); + .merge(Resource.create(Attributes.of(ServiceAttributes.SERVICE_NAME, serviceName))); final SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder() .addSpanProcessor(BatchSpanProcessor.builder(OtlpGrpcSpanExporter.builder().build()).build()) diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml index 5eacefe16a5..bb71ab15abe 100644 --- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -83,33 +83,33 @@ org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-client - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-integration-tracing-opentracing - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-rs-extension-providers - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT jakarta.json @@ -124,8 +124,8 @@ jakarta.ws.rs-api - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty.ee11 + jetty-ee11-webapp io.jaegertracing diff --git 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 index 5dd49d54aca..f40a419783f 100644 --- 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 @@ import io.jaegertracing.spi.Sender; import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import demo.jaxrs.tracing.Slf4jLogSender; import io.opentracing.Tracer; diff --git a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml index 0355ae8f8f8..c2c9eb5a2e3 100644 --- a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -42,8 +42,8 @@ - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server + org.eclipse.jetty.ee11.websocket + jetty-ee11-websocket-jetty-server ${cxf.jetty12.version} @@ -105,7 +105,7 @@ org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT @@ -124,8 +124,8 @@ ${cxf.jetty.version} - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty.ee11 + jetty-ee11-webapp ${cxf.jetty.version} @@ -142,17 +142,17 @@ org.apache.cxf cxf-rt-transports-websocket - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT jakarta.ws.rs diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml index eb229a81d4d..565c96c7c9a 100644 --- a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. diff --git a/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml b/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml index 7e30e69362d..12af5179ded 100644 --- a/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml +++ b/distribution/src/main/release/samples/jax_server_aegis_client/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -82,23 +82,23 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-databinding-aegis - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/distribution/src/main/release/samples/jaxws_async/pom.xml b/distribution/src/main/release/samples/jaxws_async/pom.xml index abfd76e98d8..d1ca743f86c 100644 --- a/distribution/src/main/release/samples/jaxws_async/pom.xml +++ b/distribution/src/main/release/samples/jaxws_async/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -37,7 +37,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -92,7 +92,7 @@ org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT @@ -127,17 +127,17 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-hc - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework @@ -149,7 +149,7 @@ org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.eclipse.jetty diff --git a/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml b/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml index f22ecdb0d94..99488cdc4ad 100644 --- a/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml +++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -36,7 +36,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-SOAPService1 @@ -114,18 +114,18 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT com.sun.xml.messaging.saaj diff --git a/distribution/src/main/release/samples/jaxws_graalvm/pom.xml b/distribution/src/main/release/samples/jaxws_graalvm/pom.xml index f87066fdea8..1ff282e8090 100644 --- a/distribution/src/main/release/samples/jaxws_graalvm/pom.xml +++ b/distribution/src/main/release/samples/jaxws_graalvm/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -36,7 +36,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-SOAPService1 diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/pom.xml b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/pom.xml index c04eefe8cd7..15d323ff1cc 100644 --- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/pom.xml +++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/pom.xml b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/pom.xml index ac94574b827..35c47a354ea 100644 --- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/pom.xml +++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -38,7 +38,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-SOAPService1 diff --git a/distribution/src/main/release/samples/jaxws_handlers/pom.xml b/distribution/src/main/release/samples/jaxws_handlers/pom.xml index 4532c5986cf..d0b4f3658df 100644 --- a/distribution/src/main/release/samples/jaxws_handlers/pom.xml +++ b/distribution/src/main/release/samples/jaxws_handlers/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -36,7 +36,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-SOAPService1 @@ -114,18 +114,18 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT com.sun.xml.messaging.saaj diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml index 599322f4e80..ed22035d182 100644 --- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml +++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml @@ -4,7 +4,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT .. spring-boot-sample-ws-cxf @@ -15,7 +15,7 @@ org.apache.cxf cxf-spring-boot-starter-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework.boot @@ -31,7 +31,7 @@ org.apache.cxf cxf-rt-features-metrics - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT io.micrometer diff --git a/distribution/src/main/release/samples/jms_pubsub/pom.xml b/distribution/src/main/release/samples/jms_pubsub/pom.xml index 2e140fabf13..f35485b06f7 100644 --- a/distribution/src/main/release/samples/jms_pubsub/pom.xml +++ b/distribution/src/main/release/samples/jms_pubsub/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -36,7 +36,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources diff --git a/distribution/src/main/release/samples/jms_queue/pom.xml b/distribution/src/main/release/samples/jms_queue/pom.xml index ca6dbe6015b..d78ad709a6d 100644 --- a/distribution/src/main/release/samples/jms_queue/pom.xml +++ b/distribution/src/main/release/samples/jms_queue/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -36,7 +36,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -137,12 +137,12 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-jms - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.activemq diff --git a/distribution/src/main/release/samples/jms_spec_demo/pom.xml b/distribution/src/main/release/samples/jms_spec_demo/pom.xml index e5347f74e13..1a391d7617a 100644 --- a/distribution/src/main/release/samples/jms_spec_demo/pom.xml +++ b/distribution/src/main/release/samples/jms_spec_demo/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -36,7 +36,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -137,12 +137,12 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-jms - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.activemq diff --git a/distribution/src/main/release/samples/jms_spring_config/pom.xml b/distribution/src/main/release/samples/jms_spring_config/pom.xml index 73f1e6d09d2..068f3ace7fd 100644 --- a/distribution/src/main/release/samples/jms_spring_config/pom.xml +++ b/distribution/src/main/release/samples/jms_spring_config/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -47,7 +47,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources diff --git a/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml b/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml index 0d85385dc30..1ffba65f239 100644 --- a/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml +++ b/distribution/src/main/release/samples/js_browser_client_java_first/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -59,22 +59,22 @@ org.apache.cxf cxf-rt-javascript - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework diff --git a/distribution/src/main/release/samples/js_browser_client_simple/pom.xml b/distribution/src/main/release/samples/js_browser_client_simple/pom.xml index 1d756a7d375..9783424aada 100644 --- a/distribution/src/main/release/samples/js_browser_client_simple/pom.xml +++ b/distribution/src/main/release/samples/js_browser_client_simple/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -36,7 +36,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -111,22 +111,22 @@ org.apache.cxf cxf-rt-javascript - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/distribution/src/main/release/samples/js_client/pom.xml b/distribution/src/main/release/samples/js_client/pom.xml index d796db64496..76496e14d27 100644 --- a/distribution/src/main/release/samples/js_client/pom.xml +++ b/distribution/src/main/release/samples/js_client/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -35,7 +35,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -113,22 +113,22 @@ org.apache.cxf cxf-rt-javascript - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.mozilla diff --git a/distribution/src/main/release/samples/js_provider/pom.xml b/distribution/src/main/release/samples/js_provider/pom.xml index 1a7d8794bf6..18fa9ab021c 100644 --- a/distribution/src/main/release/samples/js_provider/pom.xml +++ b/distribution/src/main/release/samples/js_provider/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -46,7 +46,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -128,18 +128,18 @@ org.apache.cxf cxf-rt-frontend-js - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT com.sun.xml.messaging.saaj diff --git a/distribution/src/main/release/samples/mtom/pom.xml b/distribution/src/main/release/samples/mtom/pom.xml index 52a357f6516..15ea8b74083 100644 --- a/distribution/src/main/release/samples/mtom/pom.xml +++ b/distribution/src/main/release/samples/mtom/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -36,7 +36,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -115,18 +115,18 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.eclipse.angus diff --git a/distribution/src/main/release/samples/performance/base/pom.xml b/distribution/src/main/release/samples/performance/base/pom.xml index 409fa51f5b2..ef21d6caec4 100644 --- a/distribution/src/main/release/samples/performance/base/pom.xml +++ b/distribution/src/main/release/samples/performance/base/pom.xml @@ -23,7 +23,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. diff --git a/distribution/src/main/release/samples/performance/jaxrs/pom.xml b/distribution/src/main/release/samples/performance/jaxrs/pom.xml index 937fef2b951..3f10d3df38f 100644 --- a/distribution/src/main/release/samples/performance/jaxrs/pom.xml +++ b/distribution/src/main/release/samples/performance/jaxrs/pom.xml @@ -23,7 +23,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. diff --git a/distribution/src/main/release/samples/performance/soap_http_doc_lit/pom.xml b/distribution/src/main/release/samples/performance/soap_http_doc_lit/pom.xml index 170f0fbd7d9..b1e1064e143 100644 --- a/distribution/src/main/release/samples/performance/soap_http_doc_lit/pom.xml +++ b/distribution/src/main/release/samples/performance/soap_http_doc_lit/pom.xml @@ -24,7 +24,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index 040028d8209..ec7678a2b05 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -22,26 +22,26 @@ org.apache.cxf.samples cxf-samples pom - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT Apache CXF Samples Apache CXF Samples https://cxf.apache.org - 17 + 21 true UTF-8 - 3.4.11 - 4.2.2 - 12.0.29 - 4.1.128.Final + 4.0.0-RC2 + 5.0.0-M4 + 12.1.3 + 4.2.7.Final 4.5.14 5.30.1 - 3.0.0 - 10.1.48 - 5.1.2.Final + 3.2.0 + 11.0.13 + 6.0.3.Final 2.13.2 - 9.12.1 + 10.3.1 5.0.0 1.9.25 6.3.0 @@ -51,7 +51,7 @@ 2.4.240 5.13.1.Final 2.6.7 - 4.11.0 + 4.16.0 13.6 @@ -169,21 +169,21 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT pom import org.apache.cxf cxf - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT pom import org.glassfish.corba glassfish-corba-orb - 4.2.5 + 5.0.0 diff --git a/distribution/src/main/release/samples/restful_dispatch/pom.xml b/distribution/src/main/release/samples/restful_dispatch/pom.xml index 8c862804ecf..eb2dc2dca4d 100644 --- a/distribution/src/main/release/samples/restful_dispatch/pom.xml +++ b/distribution/src/main/release/samples/restful_dispatch/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -82,23 +82,23 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-frontend-jaxrs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT jakarta.ws.rs 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 62188df7854..72244674726 100644 --- a/distribution/src/main/release/samples/ruby_spring_support/pom.xml +++ b/distribution/src/main/release/samples/ruby_spring_support/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT @@ -108,18 +108,18 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.jruby @@ -135,8 +135,8 @@ spring-web - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty.ee11 + jetty-ee11-webapp diff --git 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 index 3a5e837f68c..399ff1ffed2 100644 --- 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,7 +18,7 @@ */ package demo.spring.service; -import org.eclipse.jetty.ee10.webapp.WebAppContext; +import org.eclipse.jetty.ee11.webapp.WebAppContext; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.handler.DefaultHandler; diff --git a/distribution/src/main/release/samples/soap_header/pom.xml b/distribution/src/main/release/samples/soap_header/pom.xml index 618032db611..5f196726c1c 100644 --- a/distribution/src/main/release/samples/soap_header/pom.xml +++ b/distribution/src/main/release/samples/soap_header/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -35,7 +35,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -114,18 +114,18 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/distribution/src/main/release/samples/sts/pom.xml b/distribution/src/main/release/samples/sts/pom.xml index 7b2d6bce997..52a10e17d54 100644 --- a/distribution/src/main/release/samples/sts/pom.xml +++ b/distribution/src/main/release/samples/sts/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT .. @@ -36,7 +36,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -97,7 +97,7 @@ org.apache.cxf.services.sts cxf-services-sts-core - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT @@ -130,7 +130,7 @@ org.apache.cxf.services.sts cxf-services-sts-core - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT @@ -245,27 +245,27 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-ws-security - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-ws-policy - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework diff --git a/distribution/src/main/release/samples/throttling/pom.xml b/distribution/src/main/release/samples/throttling/pom.xml index 76267d2484d..0a26f993565 100644 --- a/distribution/src/main/release/samples/throttling/pom.xml +++ b/distribution/src/main/release/samples/throttling/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${basedir}/src/main/config/hello_world.wsdl @@ -35,7 +35,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -123,32 +123,32 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-management - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-features-metrics - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-features-throttling - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.slf4j diff --git a/distribution/src/main/release/samples/ws_addressing/pom.xml b/distribution/src/main/release/samples/ws_addressing/pom.xml index 9ff135b99dc..367dcd88634 100644 --- a/distribution/src/main/release/samples/ws_addressing/pom.xml +++ b/distribution/src/main/release/samples/ws_addressing/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -36,7 +36,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -118,17 +118,17 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework diff --git a/distribution/src/main/release/samples/ws_discovery/pom.xml b/distribution/src/main/release/samples/ws_discovery/pom.xml index f79930a47f4..a18f5494b4d 100644 --- a/distribution/src/main/release/samples/ws_discovery/pom.xml +++ b/distribution/src/main/release/samples/ws_discovery/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -37,22 +37,22 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf.services.ws-discovery cxf-services-ws-discovery-api - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf.services.ws-discovery cxf-services-ws-discovery-service - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT @@ -61,7 +61,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -88,7 +88,7 @@ org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/distribution/src/main/release/samples/ws_eventing/pom.xml b/distribution/src/main/release/samples/ws_eventing/pom.xml index 9421b14e59e..df2f67b47c5 100644 --- a/distribution/src/main/release/samples/ws_eventing/pom.xml +++ b/distribution/src/main/release/samples/ws_eventing/pom.xml @@ -25,24 +25,24 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-core - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework @@ -55,12 +55,12 @@ org.apache.cxf cxf-rt-ws-eventing - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-ws-addr - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT jakarta.servlet diff --git a/distribution/src/main/release/samples/ws_notification/pom.xml b/distribution/src/main/release/samples/ws_notification/pom.xml index 195a813d26c..dc342760bb3 100644 --- a/distribution/src/main/release/samples/ws_notification/pom.xml +++ b/distribution/src/main/release/samples/ws_notification/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} diff --git a/distribution/src/main/release/samples/ws_policy/pom.xml b/distribution/src/main/release/samples/ws_policy/pom.xml index 584755ee8e2..aaeb0462df0 100644 --- a/distribution/src/main/release/samples/ws_policy/pom.xml +++ b/distribution/src/main/release/samples/ws_policy/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -35,7 +35,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -124,17 +124,17 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework diff --git a/distribution/src/main/release/samples/ws_rm/pom.xml b/distribution/src/main/release/samples/ws_rm/pom.xml index 4873c95568f..eccddb935db 100644 --- a/distribution/src/main/release/samples/ws_rm/pom.xml +++ b/distribution/src/main/release/samples/ws_rm/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -35,7 +35,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -108,23 +108,23 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-ws-rm - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml b/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml index 256885e9129..410271dbfbb 100644 --- a/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml +++ b/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -47,7 +47,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -165,38 +165,38 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-ws-rm - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-ws-security - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-ws-addr - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-ws-policy - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/pom.xml b/distribution/src/main/release/samples/ws_security/sign_enc_policy/pom.xml index d13b7623c51..cc7fd4be37e 100644 --- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/pom.xml +++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -33,7 +33,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -169,27 +169,27 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-ws-security - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-ws-policy - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework diff --git a/distribution/src/main/release/samples/ws_security/ut/pom.xml b/distribution/src/main/release/samples/ws_security/ut/pom.xml index 01775790b56..c1dc8cb4657 100644 --- a/distribution/src/main/release/samples/ws_security/ut/pom.xml +++ b/distribution/src/main/release/samples/ws_security/ut/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -36,7 +36,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -154,23 +154,23 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-ws-security - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml b/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml index 1e547c5dc51..1bbf0712ee9 100644 --- a/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml +++ b/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../.. @@ -34,7 +34,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -198,27 +198,27 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-ws-security - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-ws-policy - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework diff --git a/distribution/src/main/release/samples/ws_transaction/client/pom.xml b/distribution/src/main/release/samples/ws_transaction/client/pom.xml index 4fa808af1be..88b96eb5e94 100644 --- a/distribution/src/main/release/samples/ws_transaction/client/pom.xml +++ b/distribution/src/main/release/samples/ws_transaction/client/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf.samples ws_transaction - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT .. spring-boot-sample-ws-cxf-client diff --git a/distribution/src/main/release/samples/ws_transaction/pom.xml b/distribution/src/main/release/samples/ws_transaction/pom.xml index d021f05270e..9b49f087451 100644 --- a/distribution/src/main/release/samples/ws_transaction/pom.xml +++ b/distribution/src/main/release/samples/ws_transaction/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT pom @@ -45,12 +45,12 @@ org.apache.cxf cxf-rt-features-logging - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-spring-boot-starter-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework.boot diff --git a/distribution/src/main/release/samples/ws_transaction/ws_first/pom.xml b/distribution/src/main/release/samples/ws_transaction/ws_first/pom.xml index 3547f206acd..78ece3aaf47 100644 --- a/distribution/src/main/release/samples/ws_transaction/ws_first/pom.xml +++ b/distribution/src/main/release/samples/ws_transaction/ws_first/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf.samples ws_transaction - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT .. spring-boot-sample-ws-cxf-first-service diff --git a/distribution/src/main/release/samples/ws_transaction/ws_second/pom.xml b/distribution/src/main/release/samples/ws_transaction/ws_second/pom.xml index 8fae4515685..38d596a4762 100644 --- a/distribution/src/main/release/samples/ws_transaction/ws_second/pom.xml +++ b/distribution/src/main/release/samples/ws_transaction/ws_second/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf.samples ws_transaction - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT .. spring-boot-sample-ws-cxf-second-service diff --git a/distribution/src/main/release/samples/wsdl_first/pom.xml b/distribution/src/main/release/samples/wsdl_first/pom.xml index 35892dd37e4..87aa90ccaa3 100644 --- a/distribution/src/main/release/samples/wsdl_first/pom.xml +++ b/distribution/src/main/release/samples/wsdl_first/pom.xml @@ -26,7 +26,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT @@ -89,7 +89,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -141,7 +141,7 @@ org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT @@ -171,7 +171,7 @@ org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT @@ -201,7 +201,7 @@ org.apache.cxf cxf-rt-transports-http-netty-server - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT @@ -260,7 +260,7 @@ org.apache.cxf cxf-rt-transports-http-netty-client - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT @@ -269,22 +269,22 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-management - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-features-metrics - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf.xjc-utils diff --git a/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml b/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml index fa7e2ea7506..ceb65261fca 100644 --- a/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml +++ b/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -36,7 +36,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -112,18 +112,18 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework diff --git a/distribution/src/main/release/samples/wsdl_first_https/pom.xml b/distribution/src/main/release/samples/wsdl_first_https/pom.xml index 453b5e6535c..25077504c76 100644 --- a/distribution/src/main/release/samples/wsdl_first_https/pom.xml +++ b/distribution/src/main/release/samples/wsdl_first_https/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${basedir}/src/main/config/hello_world.wsdl @@ -35,7 +35,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -198,17 +198,17 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.springframework diff --git a/distribution/src/main/release/samples/wsdl_first_pure_xml/pom.xml b/distribution/src/main/release/samples/wsdl_first_pure_xml/pom.xml index f06eaf5a494..2259bc89361 100644 --- a/distribution/src/main/release/samples/wsdl_first_pure_xml/pom.xml +++ b/distribution/src/main/release/samples/wsdl_first_pure_xml/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -35,7 +35,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -114,18 +114,18 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml b/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml index fa532a80e98..d4d84c1ba0c 100644 --- a/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml +++ b/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -35,7 +35,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -114,18 +114,18 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml b/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml index fcefad8a2db..3ee0cab3b80 100644 --- a/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml +++ b/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -35,7 +35,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -114,18 +114,18 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/distribution/src/main/release/samples/wsdl_first_xml_wrapped/pom.xml b/distribution/src/main/release/samples/wsdl_first_xml_wrapped/pom.xml index 80ce3387ba7..766e80bb99a 100644 --- a/distribution/src/main/release/samples/wsdl_first_xml_wrapped/pom.xml +++ b/distribution/src/main/release/samples/wsdl_first_xml_wrapped/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ${project.version} @@ -35,7 +35,7 @@ org.apache.cxf cxf-codegen-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT generate-sources @@ -114,18 +114,18 @@ org.apache.cxf cxf-rt-frontend-jaxws - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf cxf-rt-transports-http-jetty - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/integration/cdi/pom.xml b/integration/cdi/pom.xml index 1832dd66150..468e72fa0ee 100644 --- a/integration/cdi/pom.xml +++ b/integration/cdi/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../parent/pom.xml diff --git a/integration/jca/pom.xml b/integration/jca/pom.xml index d83f6d347d4..2ef043f5ff3 100644 --- a/integration/jca/pom.xml +++ b/integration/jca/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../parent/pom.xml diff --git a/integration/pom.xml b/integration/pom.xml index 59e585f595f..948f6d4fa8e 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT jca diff --git a/integration/spring-boot/autoconfigure/pom.xml b/integration/spring-boot/autoconfigure/pom.xml index 12e6de7c663..9435104d451 100644 --- a/integration/spring-boot/autoconfigure/pom.xml +++ b/integration/spring-boot/autoconfigure/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml @@ -54,6 +54,11 @@ org.springframework.boot spring-boot-autoconfigure + + org.springframework.boot + spring-boot-micrometer-metrics + true + org.springframework.boot @@ -178,5 +183,10 @@ assertj-core test + + commons-logging + commons-logging + test + diff --git a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/micrometer/MicrometerMetricsAutoConfiguration.java b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/micrometer/MicrometerMetricsAutoConfiguration.java index 2a19231cc37..30eac4f2b54 100644 --- a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/micrometer/MicrometerMetricsAutoConfiguration.java +++ b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/micrometer/MicrometerMetricsAutoConfiguration.java @@ -43,21 +43,21 @@ import org.apache.cxf.spring.boot.autoconfigure.CxfProperties.Metrics.Client; import org.apache.cxf.spring.boot.autoconfigure.CxfProperties.Metrics.Server; import org.apache.cxf.spring.boot.autoconfigure.micrometer.provider.SpringBasedTimedAnnotationProvider; -import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration; -import org.springframework.boot.actuate.autoconfigure.metrics.OnlyOnceLoggingDenyMeterFilter; -import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; +import org.springframework.boot.micrometer.metrics.autoconfigure.MetricsAutoConfiguration; +import org.springframework.boot.micrometer.metrics.autoconfigure.export.simple.SimpleMetricsExportAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.Order; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.config.MeterFilter; +import io.micrometer.core.instrument.internal.OnlyOnceLoggingDenyMeterFilter; @Configuration @AutoConfigureAfter({MetricsAutoConfiguration.class, SimpleMetricsExportAutoConfiguration.class}) diff --git a/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/micrometer/MicrometerMetricsAutoConfigurationTest.java b/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/micrometer/MicrometerMetricsAutoConfigurationTest.java index 9e4accc8060..3ce4cb1fb80 100644 --- a/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/micrometer/MicrometerMetricsAutoConfigurationTest.java +++ b/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/micrometer/MicrometerMetricsAutoConfigurationTest.java @@ -24,9 +24,9 @@ import org.apache.cxf.metrics.micrometer.provider.jaxws.JaxwsTags; import org.apache.cxf.spring.boot.autoconfigure.CxfProperties; import org.springframework.beans.factory.NoSuchBeanDefinitionException; -import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration; -import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigurations; +import org.springframework.boot.micrometer.metrics.autoconfigure.MetricsAutoConfiguration; +import org.springframework.boot.micrometer.metrics.autoconfigure.export.simple.SimpleMetricsExportAutoConfiguration; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.junit.Test; diff --git a/integration/spring-boot/pom.xml b/integration/spring-boot/pom.xml index dc12c1275d3..34622034d68 100644 --- a/integration/spring-boot/pom.xml +++ b/integration/spring-boot/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-integration - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT autoconfigure diff --git a/integration/spring-boot/starter-jaxrs/pom.xml b/integration/spring-boot/starter-jaxrs/pom.xml index 5729e47620c..773eb07d41b 100644 --- a/integration/spring-boot/starter-jaxrs/pom.xml +++ b/integration/spring-boot/starter-jaxrs/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/integration/spring-boot/starter-jaxws/pom.xml b/integration/spring-boot/starter-jaxws/pom.xml index 392b29f0593..be4ca5b8be7 100644 --- a/integration/spring-boot/starter-jaxws/pom.xml +++ b/integration/spring-boot/starter-jaxws/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/integration/tracing/tracing-brave/pom.xml b/integration/tracing/tracing-brave/pom.xml index c3ee7f5523d..4907c12a835 100644 --- a/integration/tracing/tracing-brave/pom.xml +++ b/integration/tracing/tracing-brave/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/integration/tracing/tracing-micrometer/pom.xml b/integration/tracing/tracing-micrometer/pom.xml index 404d4a92234..86b84be6cea 100644 --- a/integration/tracing/tracing-micrometer/pom.xml +++ b/integration/tracing/tracing-micrometer/pom.xml @@ -8,7 +8,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml @@ -92,7 +92,7 @@ org.junit junit-bom - ${cxf.junit5.version} + ${cxf.junit6.version} pom import diff --git a/integration/tracing/tracing-opentelemetry/pom.xml b/integration/tracing/tracing-opentelemetry/pom.xml index 88caceb1b13..e8734f8d3cf 100644 --- a/integration/tracing/tracing-opentelemetry/pom.xml +++ b/integration/tracing/tracing-opentelemetry/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml @@ -87,11 +87,6 @@ opentelemetry-semconv ${cxf.opentelemetry.semconv.version} - - io.opentelemetry.semconv - opentelemetry-semconv-incubating - ${cxf.opentelemetry.semconv.version} - org.slf4j slf4j-jdk14 diff --git a/integration/tracing/tracing-opentracing/pom.xml b/integration/tracing/tracing-opentracing/pom.xml index 11aece5a5e7..15bffc1c3a8 100644 --- a/integration/tracing/tracing-opentracing/pom.xml +++ b/integration/tracing/tracing-opentracing/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml b/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml index c79e5ba5240..44d4e05d4f4 100644 --- a/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml +++ b/maven-plugins/archetypes/cxf-jaxrs-service/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml org.apache.cxf.archetype diff --git a/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml b/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml index 58d25edeb97..0c85f9285f4 100644 --- a/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml +++ b/maven-plugins/archetypes/cxf-jaxrs-service/src/main/resources/archetype-resources/pom.xml @@ -65,8 +65,8 @@ org.apache.maven.plugins maven-compiler-plugin - 11 - 11 + 21 + 21 diff --git a/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml b/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml index f1fa44eb47c..313a8eed8ea 100644 --- a/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml +++ b/maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml @@ -22,12 +22,12 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml org.apache.cxf.archetype cxf-jaxws-javafirst - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT maven-archetype Apache CXF Archetype - Simple JAX-WS Java First Creates a project for developing a Web service starting from Java code diff --git a/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml b/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml index f58a666bf53..6ed1917dc8e 100644 --- a/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml +++ b/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/pom.xml @@ -80,8 +80,8 @@ org.apache.maven.plugins maven-compiler-plugin - 11 - 11 + 21 + 21 diff --git a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml b/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml index 5b03cf58049..b1e292e64a3 100644 --- a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml +++ b/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml org.apache.cxf.archetype diff --git a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/pom.xml b/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/pom.xml index b19e77e7674..16e51394b11 100644 --- a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/pom.xml +++ b/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/pom.xml @@ -107,8 +107,8 @@ org.apache.maven.plugins maven-compiler-plugin - 11 - 11 + 21 + 21 diff --git a/maven-plugins/archetypes/pom.xml b/maven-plugins/archetypes/pom.xml index f3b033cdc89..12f5f1dec1d 100644 --- a/maven-plugins/archetypes/pom.xml +++ b/maven-plugins/archetypes/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-maven-plugins - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT cxf-jaxws-javafirst diff --git a/maven-plugins/codegen-plugin/pom.xml b/maven-plugins/codegen-plugin/pom.xml index 1b3d112e61c..4cbf9026557 100644 --- a/maven-plugins/codegen-plugin/pom.xml +++ b/maven-plugins/codegen-plugin/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-maven-plugins - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf.plugin.codegen diff --git a/maven-plugins/codegen-plugin/src/it/jaxb-xjc-runtime-sources/pom.xml b/maven-plugins/codegen-plugin/src/it/jaxb-xjc-runtime-sources/pom.xml index 820f9923366..d4cace49f2e 100644 --- a/maven-plugins/codegen-plugin/src/it/jaxb-xjc-runtime-sources/pom.xml +++ b/maven-plugins/codegen-plugin/src/it/jaxb-xjc-runtime-sources/pom.xml @@ -57,8 +57,8 @@ maven-compiler-plugin 3.11.0 - 11 - 11 + 21 + 21 diff --git a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml index 8eb286b4717..59b846526c6 100644 --- a/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml +++ b/maven-plugins/codegen-plugin/src/it/jdk-cxf-with-toolchain/pom.xml @@ -8,8 +8,8 @@ jar utf-8 - 11 - 11 + 21 + 21 diff --git a/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml b/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml index 6bf98737774..c512dc93fe2 100644 --- a/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml +++ b/maven-plugins/codegen-plugin/src/it/mark-generated/pom.xml @@ -57,8 +57,8 @@ maven-compiler-plugin 3.11.0 - 11 - 11 + 21 + 21 diff --git a/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml b/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml index 14e78b6832b..856ac857c03 100644 --- a/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml +++ b/maven-plugins/codegen-plugin/src/it/wsdl-artifact-resolution/pom.xml @@ -57,8 +57,8 @@ maven-compiler-plugin 3.11.0 - 11 - 11 + 21 + 21 diff --git a/maven-plugins/corba/pom.xml b/maven-plugins/corba/pom.xml index 10168682cdd..705e1752cd5 100644 --- a/maven-plugins/corba/pom.xml +++ b/maven-plugins/corba/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-maven-plugins - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf.plugin.corbatools diff --git a/maven-plugins/java2wadl-plugin/pom.xml b/maven-plugins/java2wadl-plugin/pom.xml index 94568a28ca9..78a7076861c 100644 --- a/maven-plugins/java2wadl-plugin/pom.xml +++ b/maven-plugins/java2wadl-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf cxf-java2wadl-plugin maven-plugin - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT Apache CXF Java2WADL Maven2 Plugin Apache CXF Java2WADL Maven2 Plugin https://cxf.apache.org @@ -31,7 +31,7 @@ org.apache.cxf cxf-maven-plugins - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf.plugin.java2wadl diff --git a/maven-plugins/java2wadl-plugin/src/it/java-generate-rx/pom.xml b/maven-plugins/java2wadl-plugin/src/it/java-generate-rx/pom.xml index 7c89af967f7..86f076df73d 100644 --- a/maven-plugins/java2wadl-plugin/src/it/java-generate-rx/pom.xml +++ b/maven-plugins/java2wadl-plugin/src/it/java-generate-rx/pom.xml @@ -21,8 +21,8 @@ maven-compiler-plugin 3.13.0 - 17 - 17 + 21 + 21 diff --git a/maven-plugins/java2ws-plugin/pom.xml b/maven-plugins/java2ws-plugin/pom.xml index 56824b6e3a6..88067fdabf7 100644 --- a/maven-plugins/java2ws-plugin/pom.xml +++ b/maven-plugins/java2ws-plugin/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-maven-plugins - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf.plugin.java2ws diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml index e9a2e5b6709..1fd9d08e2e1 100644 --- a/maven-plugins/pom.xml +++ b/maven-plugins/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../parent diff --git a/maven-plugins/wadl2java-plugin/pom.xml b/maven-plugins/wadl2java-plugin/pom.xml index e9cc1761e76..c6e69f2f84e 100644 --- a/maven-plugins/wadl2java-plugin/pom.xml +++ b/maven-plugins/wadl2java-plugin/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-maven-plugins - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf.plugin.wadl2java diff --git a/maven-plugins/wadl2java-plugin/src/it/wadl-generate-rx/pom.xml b/maven-plugins/wadl2java-plugin/src/it/wadl-generate-rx/pom.xml index 2051eca905b..7b1954bbe0c 100644 --- a/maven-plugins/wadl2java-plugin/src/it/wadl-generate-rx/pom.xml +++ b/maven-plugins/wadl2java-plugin/src/it/wadl-generate-rx/pom.xml @@ -46,10 +46,10 @@ maven-compiler-plugin - 3.8.1 + 3.14.0 - 11 - 11 + 21 + 21 diff --git a/maven-plugins/wadl2java-plugin/src/it/wsdl-artifact-resolution/pom.xml b/maven-plugins/wadl2java-plugin/src/it/wsdl-artifact-resolution/pom.xml index e716864567f..6002ad1fe6c 100644 --- a/maven-plugins/wadl2java-plugin/src/it/wsdl-artifact-resolution/pom.xml +++ b/maven-plugins/wadl2java-plugin/src/it/wsdl-artifact-resolution/pom.xml @@ -48,8 +48,8 @@ maven-compiler-plugin 3.8.1 - 11 - 11 + 21 + 21 diff --git a/maven-plugins/wsdl-validator-plugin/pom.xml b/maven-plugins/wsdl-validator-plugin/pom.xml index 0f3fbbf7448..7ecf1daf839 100644 --- a/maven-plugins/wsdl-validator-plugin/pom.xml +++ b/maven-plugins/wsdl-validator-plugin/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-maven-plugins - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf.plugin.wsdl.validator diff --git a/parent/pom.xml b/parent/pom.xml index 692e8cf8290..efe2ec19d5b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -21,7 +21,7 @@ org.apache.cxf cxf - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT 4.0.0 cxf-parent @@ -69,19 +69,19 @@ [9.5,10) [6,7) [2,3) - [2,3) - [4,5) + [3,4) + [5,6) [2,3) [2,3) - [5,6) + [6,7) [3,4) - [3,4) + [4,5) [4,5) [2,3) - [4.2,5) + [5,6) [3,4) [12,13) - [4.1,5) + [4.2,5) [3.8,4) [2.2,3) [3.1,4) @@ -90,29 +90,29 @@ 2.44.0 3.0.3 - 1.8.1.Final - 3.0.2.Final + 1.9.5.Final + 4.0.0.Final 1.9.25 - 3.27.6 + 4.0.0-M1 [3.0, 4.0) 3.0.14 - 1.77 + 1.81 6.3.0 - 4.0.1 + 4.1.0 4.8.25 1.5.1 - 1.17.1 - 2.16.1 + 1.18.0 + 2.19.0 2.2.1 3.18.0 - 1.2 + 1.3.5 1.13.1 - 10.16.1.1 + 10.17.1.0 2.2.0 3.2.6 4.2.37 - 3.10.8 - 5.0.1 + 3.11.1 + 6.0.1 3.0.2 4.0.11 1.1.1 @@ -120,16 +120,16 @@ 4.0.2 2.0.1 3.0 - 5.5.0 - 6.6.34.Final - 8.0.3.Final + 5.6.0 + 7.1.7.Final + 9.1.0.Final 2.7.4 [4.0,4.2) 4.1.5 4.5.14 [4.3,4.5.0) 4.4.16 - 5.4.4 + 5.5.1 5.3.6 2.20.1 2.20.1 @@ -139,7 +139,7 @@ 2.1.4 2.1.5 2.0.1 - 2.1.0 + 2.2.0 3.0.2 4.0.2 3.1.0 @@ -149,58 +149,58 @@ 1.1.4 0.7.2 3.29.2-GA - 2.1.1 - 3.1.0 - 4.0.6 + 3.0.0 + 4.0.0 + 4.0.5 4.0.4 ${cxf.jaxb.runtime.version} 2.0.0 3.6.1.Final - 5.1.2.Final + 6.0.3.Final 5.13.1.Final 1.1.1 1.0 1.5.4 - 12.0.29 + 12.1.3 ${cxf.jetty12.version} - 3.3 + 3.5.0 2.10.10 - 1.2.21 + 2.0.2 2.1.3 3.0.1 1.0 4.13.2 - 5.14.1 + 6.0.1 2.0.3 7.0.3 2.4.6 1.5.20 - 9.12.1 + 10.3.1 3.9.10 - 1.14.13 - 1.4.12 + 1.16.0 + 1.6.0 3.1 - 3.0.1 - 3.1.2 + 4.0 + 4.1.1 2.2.4 5.20.0 2022.7 3.2.1 [4,5) - 4.1.128.Final + 4.2.7.Final 2.0.69.Final 2.0.13 - 3.2.2 + 4.1.1 1.56.0 - 1.29.0-alpha + 1.34.0 0.33.0 - 2.0.28 + 4.0.3 1.1.7 - 3.1.0 + 3.2.0 4.10.4 3.5.1 1.0.4 - 3.7.12 + 3.8.0 1.7.15 1.3.8 2.2.21 @@ -208,28 +208,29 @@ 3.0.4 jakarta.servlet-api jakarta.servlet - 6.0.0 + 6.1.0 2.0.17 2.5 2.3_2 - 3.4.11 - 3.2.15 + 4.0.0-RC2 + 4.0.0-RC1 spring-test - 6.4.12 - 6.2.12 + 7.0.0-RC3 + 7.0.0-RC3 1.8.3 5.30.1 2.2.40 - 3.0.0 - 10.1.48 + 3.2.0 + 11.0.13 1.8 - 2.3.20.Final + 2.4.0.Alpha1 + 2.0.0.Alpha1 3.0.4 [3,4) - 3.0.2 + 3.1.1 2.4.1 2.0.1 3.13.1 @@ -444,7 +445,7 @@ ${cxf.resources.base.path}cxf-pmd-ruleset.xml - 11 + 21 false true true @@ -587,7 +588,7 @@ org.apache.groovy groovy - 4.0.29 + 5.0.2 @@ -1098,14 +1099,12 @@ org.apache.johnzon johnzon-core ${cxf.johnzon.version} - jakarta true org.apache.johnzon johnzon-mapper ${cxf.johnzon.version} - jakarta true @@ -1118,7 +1117,6 @@ org.apache.johnzon johnzon-jsonb ${cxf.johnzon.version} - jakarta true @@ -1181,8 +1179,8 @@ ${cxf.jetty.version} - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty.ee11 + jetty-ee11-webapp ${cxf.jetty.version} @@ -1191,18 +1189,18 @@ ${cxf.jetty.version} - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server + org.eclipse.jetty.ee11.websocket + jetty-ee11-websocket-jetty-server ${cxf.jetty.version} - org.eclipse.jetty.ee10 - jetty-ee10-apache-jsp + org.eclipse.jetty.ee11 + jetty-ee11-apache-jsp ${cxf.jetty.version} - org.eclipse.jetty.ee10 - jetty-ee10-servlet + org.eclipse.jetty.ee11 + jetty-ee11-servlet ${cxf.jetty.version} @@ -1252,8 +1250,8 @@ ${cxf.jetty.version} - org.eclipse.jetty.ee10 - jetty-ee10-annotations + org.eclipse.jetty.ee11 + jetty-ee11-annotations ${cxf.jetty.version} @@ -1262,9 +1260,9 @@ ${cxf.undertow.version} - io.undertow + io.undertow.ee undertow-servlet - ${cxf.undertow.version} + ${cxf.undertow.ee.version} org.jboss.logging @@ -1467,6 +1465,11 @@ spring-boot-starter-validation ${cxf.spring.boot.version} + + org.springframework.boot + spring-boot-micrometer-metrics + ${cxf.spring.boot.version} + org.springframework.security spring-security-web @@ -1482,6 +1485,23 @@ spring-boot-starter-actuator ${cxf.spring.boot.version} + + org.springframework.boot + spring-boot-micrometer-tracing-brave + ${cxf.spring.boot.version} + + + org.springframework.boot + spring-boot-micrometer-metrics-test + ${cxf.spring.boot.version} + test + + + org.springframework.boot + spring-boot-micrometer-tracing-test + ${cxf.spring.boot.version} + test + org.apache.olingo olingo-odata2-core diff --git a/pom.xml b/pom.xml index 2cd790c2138..0a970e2591f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 4.0.0 org.apache.cxf cxf - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT Apache CXF Apache CXF is an open-source services framework that aids in the development of services using front-end programming APIs, like JAX-WS @@ -42,7 +42,7 @@ false 4.1.2 4.1.1 - 17 + 21 UTF-8 scp://people.apache.org/www/cxf.apache.org/maven-site 12.1.8 diff --git a/rt/bindings/coloc/pom.xml b/rt/bindings/coloc/pom.xml index e871e5cc9f8..4809745dc78 100644 --- a/rt/bindings/coloc/pom.xml +++ b/rt/bindings/coloc/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/bindings/corba/pom.xml b/rt/bindings/corba/pom.xml index 524b2074b97..d16e1522ba5 100644 --- a/rt/bindings/corba/pom.xml +++ b/rt/bindings/corba/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/bindings/pom.xml b/rt/bindings/pom.xml index a27664b60b6..efc65a71d5e 100644 --- a/rt/bindings/pom.xml +++ b/rt/bindings/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-rt - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT soap diff --git a/rt/bindings/soap/pom.xml b/rt/bindings/soap/pom.xml index 6fe2bdfd4cc..9512dd3ac0e 100644 --- a/rt/bindings/soap/pom.xml +++ b/rt/bindings/soap/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/bindings/xml/pom.xml b/rt/bindings/xml/pom.xml index bdc8d210282..b9b58747660 100644 --- a/rt/bindings/xml/pom.xml +++ b/rt/bindings/xml/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/databinding/aegis/pom.xml b/rt/databinding/aegis/pom.xml index ed02cd424a2..7203ecf8904 100644 --- a/rt/databinding/aegis/pom.xml +++ b/rt/databinding/aegis/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/databinding/jaxb/pom.xml b/rt/databinding/jaxb/pom.xml index 9d000d30848..0e2f26294be 100644 --- a/rt/databinding/jaxb/pom.xml +++ b/rt/databinding/jaxb/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/databinding/pom.xml b/rt/databinding/pom.xml index 75fec1cc50e..f6b89801a55 100644 --- a/rt/databinding/pom.xml +++ b/rt/databinding/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-rt - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT jaxb diff --git a/rt/features/clustering/pom.xml b/rt/features/clustering/pom.xml index da34f5c4cfa..099abf1aac0 100644 --- a/rt/features/clustering/pom.xml +++ b/rt/features/clustering/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/features/logging/pom.xml b/rt/features/logging/pom.xml index 594045b8486..37a0a5d2b2c 100644 --- a/rt/features/logging/pom.xml +++ b/rt/features/logging/pom.xml @@ -3,7 +3,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml cxf-rt-features-logging diff --git a/rt/features/metrics/pom.xml b/rt/features/metrics/pom.xml index 982007db1df..3354629508b 100644 --- a/rt/features/metrics/pom.xml +++ b/rt/features/metrics/pom.xml @@ -3,7 +3,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml cxf-rt-features-metrics diff --git a/rt/features/pom.xml b/rt/features/pom.xml index ad43291bb68..f67aaac5209 100644 --- a/rt/features/pom.xml +++ b/rt/features/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-rt - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT clustering diff --git a/rt/features/throttling/pom.xml b/rt/features/throttling/pom.xml index b3ec9e49be3..651b8479405 100644 --- a/rt/features/throttling/pom.xml +++ b/rt/features/throttling/pom.xml @@ -3,7 +3,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml cxf-rt-features-throttling diff --git a/rt/frontend/jaxrs/pom.xml b/rt/frontend/jaxrs/pom.xml index 14ec94958de..b3536c187a7 100644 --- a/rt/frontend/jaxrs/pom.xml +++ b/rt/frontend/jaxrs/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java index 6f13d95d17e..d380643362c 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java @@ -21,6 +21,8 @@ import java.io.IOException; import java.io.InputStream; import java.net.URI; +import java.util.Arrays; +import java.util.function.Predicate; import jakarta.ws.rs.container.ContainerRequestContext; import jakarta.ws.rs.core.MultivaluedMap; @@ -179,4 +181,16 @@ public void setMethod(String method) throws IllegalStateException { checkNotPreMatch(); super.setMethod(method); } + + @Override + public boolean containsHeaderString(String name, String valueSeparatorRegex, Predicate valuePredicate) { + final String headerString = HttpUtils.getHeaderString(getHeaders().get(name)); + if (headerString == null) { + return false; + } + return Arrays.stream(headerString.split(valueSeparatorRegex)) + .filter(valuePredicate) + .findAny() + .isPresent(); + } } diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerResponseContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerResponseContextImpl.java index fa0b382022f..dcd110fae52 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerResponseContextImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerResponseContextImpl.java @@ -22,9 +22,13 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.List; +import java.util.function.Predicate; import jakarta.ws.rs.container.ContainerResponseContext; import jakarta.ws.rs.core.MultivaluedMap; +import org.apache.cxf.jaxrs.utils.HttpUtils; import org.apache.cxf.jaxrs.utils.InjectionUtils; import org.apache.cxf.message.Message; @@ -77,4 +81,19 @@ public void setEntityStream(OutputStream os) { m.setContent(OutputStream.class, os); } + + @Override + public boolean containsHeaderString(String name, String valueSeparatorRegex, Predicate valuePredicate) { + final List headerStrings = HttpUtils.getHeaderStrings(getHeaders().get(name)); + final String headerString = HttpUtils.getHeaderString(headerStrings); + if (headerString == null) { + return false; + } + return Arrays.stream(headerString.split(valueSeparatorRegex)) + .filter(valuePredicate) + .findAny() + .isPresent(); + } + + } diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java index 2563cb983a1..6c8a29a8565 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java @@ -21,6 +21,7 @@ import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.Date; @@ -32,6 +33,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; +import java.util.function.Predicate; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -374,4 +376,15 @@ public int getLength() { return HttpUtils.getContentLength(values.get(0)); } + @Override + public boolean containsHeaderString(String name, String valueSeparatorRegex, Predicate valuePredicate) { + final String headerString = getHeaderString(name); + if (headerString == null) { + return false; + } + return Arrays.stream(headerString.split(valueSeparatorRegex)) + .filter(valuePredicate) + .findAny() + .isPresent(); + } } diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java index ddb85785a6e..93e3b4e288b 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java @@ -243,4 +243,25 @@ public URI resolve(URI uri) { return HttpUtils.resolve(getBaseUriBuilder(), uri); } + @Override + public String getMatchedResourceTemplate() { + if (stack != null) { + final List templates = new LinkedList<>(); + for (MethodInvocationInfo invocation : stack) { + OperationResourceInfo ori = invocation.getMethodInfo(); + templates.add(ori.getClassResourceInfo().getURITemplate()); + templates.add(ori.getURITemplate()); + } + + if (!templates.isEmpty()) { + UriBuilder builder = UriBuilder.fromPath(templates.get(0).getValue()); + for (int i = 1; i < templates.size(); ++i) { + builder = builder.path(templates.get(i).getValue()); + } + return builder.build().toString(); + } + } + LOG.fine("No resource stack information, returning empty template"); + return ""; + } } diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpHeaders.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpHeaders.java index 7da3ba925cc..a1b82eff079 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpHeaders.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpHeaders.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.function.Predicate; import jakarta.ws.rs.core.Cookie; import jakarta.ws.rs.core.HttpHeaders; @@ -73,4 +74,8 @@ public int getLength() { return get().getLength(); } + @Override + public boolean containsHeaderString(String name, String valueSeparatorRegex, Predicate valuePredicate) { + return get().containsHeaderString(name, valueSeparatorRegex, valuePredicate); + } } diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java index 0b886b1aa6b..8ad5307a2c9 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java @@ -181,6 +181,9 @@ public void setContentLengthLong(long len) { get().setContentLengthLong(len); } - + @Override + public void sendRedirect(String location, int sc, boolean clearBuffer) throws IOException { + get().sendRedirect(location, sc, clearBuffer); + } } diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalUriInfo.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalUriInfo.java index 7074561aee4..e8ebb65893f 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalUriInfo.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalUriInfo.java @@ -109,4 +109,9 @@ public URI relativize(URI uri) { public URI resolve(URI uri) { return get().resolve(uri); } + + @Override + public String getMatchedResourceTemplate() { + return get().getMatchedResourceTemplate(); + } } diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java index 58bbf306fca..1d1449f65d0 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java @@ -339,6 +339,20 @@ public static int getContentLength(String value) { return -1; } } + + // This conversion is needed as some values may not be Strings + public static List getHeaderStrings(List values) { + if (values == null) { + return null; + } + List stringValues = new ArrayList<>(values.size()); + HeaderDelegate hd = HttpUtils.getHeaderDelegate(values.get(0)); + for (Object value : values) { + String actualValue = hd == null ? value.toString() : hd.toString(value); + stringValues.add(actualValue); + } + return stringValues; + } public static String getHeaderString(List values) { if (values == null) { diff --git a/rt/frontend/jaxws/pom.xml b/rt/frontend/jaxws/pom.xml index d68338cf0a1..5711af544f3 100644 --- a/rt/frontend/jaxws/pom.xml +++ b/rt/frontend/jaxws/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/HttpServletResponseAdapter.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/HttpServletResponseAdapter.java index 01ea4a56d06..bbd4b8e56f8 100644 --- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/HttpServletResponseAdapter.java +++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/transport/http_jaxws_spi/HttpServletResponseAdapter.java @@ -196,8 +196,9 @@ public void sendError(int sc) throws IOException { public void sendError(int sc, String msg) throws IOException { this.sendError(sc); } - - public void sendRedirect(String location) throws IOException { + + @Override + public void sendRedirect(String location, int sc, boolean clearBuffer) throws IOException { throw new UnsupportedOperationException(); } diff --git a/rt/frontend/js/pom.xml b/rt/frontend/js/pom.xml index 0df384cc4df..df09c6e2471 100644 --- a/rt/frontend/js/pom.xml +++ b/rt/frontend/js/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/frontend/pom.xml b/rt/frontend/pom.xml index 0c93781c759..1dab122f7b2 100644 --- a/rt/frontend/pom.xml +++ b/rt/frontend/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-rt - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT simple diff --git a/rt/frontend/simple/pom.xml b/rt/frontend/simple/pom.xml index 85033c5d9b8..6d7b13ff878 100644 --- a/rt/frontend/simple/pom.xml +++ b/rt/frontend/simple/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/javascript/javascript-rt/pom.xml b/rt/javascript/javascript-rt/pom.xml index 82763ab80e7..add1bce5238 100644 --- a/rt/javascript/javascript-rt/pom.xml +++ b/rt/javascript/javascript-rt/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-runtime-javascript - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf.js diff --git a/rt/javascript/javascript-tests/pom.xml b/rt/javascript/javascript-tests/pom.xml index 9dfe00ea2b8..356e0fe0d37 100644 --- a/rt/javascript/javascript-tests/pom.xml +++ b/rt/javascript/javascript-tests/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-runtime-javascript - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT org.apache.cxf.js.tests diff --git a/rt/javascript/pom.xml b/rt/javascript/pom.xml index 34825c881c4..9b87207eef5 100644 --- a/rt/javascript/pom.xml +++ b/rt/javascript/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../parent/pom.xml diff --git a/rt/management/pom.xml b/rt/management/pom.xml index 6396d2aeefd..d2f930dfb49 100644 --- a/rt/management/pom.xml +++ b/rt/management/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../parent/pom.xml diff --git a/rt/pom.xml b/rt/pom.xml index 8895424e127..f32a12891fd 100644 --- a/rt/pom.xml +++ b/rt/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT wsdl diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml index a27db71e502..1f816c8893a 100644 --- a/rt/rs/client/pom.xml +++ b/rt/rs/client/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/Client.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/Client.java index ffa9e334cc8..9934e939f11 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/Client.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/Client.java @@ -31,7 +31,7 @@ * Represents common proxy and http-centric client capabilities * */ -public interface Client { +public interface Client extends AutoCloseable { /** * Set HTTP Content-Type header diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java index 2cf922e40cb..f223b3f02e2 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java @@ -322,7 +322,9 @@ public Object invoke(Object o, Method m, Object[] params) throws Throwable { proxyImpl.setConfiguration(getConfiguration()); return JAXRSClientFactory.createProxy(m.getReturnType(), proxyLoader, proxyImpl); } - headers.putAll(paramHeaders); + + // Merge values for same headers + paramHeaders.forEach((k, v) -> headers.addAll(k, v)); getState().setTemplates(getTemplateParametersMap(ori.getURITemplate(), pathParams)); diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java index 0cff81edd68..82b3b471ada 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java @@ -22,7 +22,9 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.net.URI; +import java.util.Arrays; import java.util.List; +import java.util.function.Predicate; import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.ClientRequestContext; @@ -182,4 +184,17 @@ public MultivaluedMap getStringHeaders() { return HttpUtils.getModifiableStringHeaders(m); } + @Override + public boolean containsHeaderString(String name, String valueSeparatorRegex, Predicate valuePredicate) { + final List headerStrings = HttpUtils.getHeaderStrings(getHeaders().get(name)); + final String headerString = HttpUtils.getHeaderString(headerStrings); + if (headerString == null) { + return false; + } + return Arrays.stream(headerString.split(valueSeparatorRegex)) + .filter(valuePredicate) + .findAny() + .isPresent(); + } + } diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientResponseContextImpl.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientResponseContextImpl.java index 7f85872050a..250014d7cc7 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientResponseContextImpl.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientResponseContextImpl.java @@ -20,6 +20,8 @@ import java.io.IOException; import java.io.InputStream; +import java.util.Arrays; +import java.util.function.Predicate; import jakarta.ws.rs.client.ClientResponseContext; import jakarta.ws.rs.core.MultivaluedMap; @@ -71,4 +73,16 @@ public boolean hasEntity() { throw ExceptionUtils.toInternalServerErrorException(ex, null); } } + + @Override + public boolean containsHeaderString(String name, String valueSeparatorRegex, Predicate valuePredicate) { + final String headerString = HttpUtils.getHeaderString(getHeaders().get(name)); + if (headerString == null) { + return false; + } + return Arrays.stream(headerString.split(valueSeparatorRegex)) + .filter(valuePredicate) + .findAny() + .isPresent(); + } } diff --git a/rt/rs/description-common-openapi/pom.xml b/rt/rs/description-common-openapi/pom.xml index 36684f9515c..5160bee4bf4 100644 --- a/rt/rs/description-common-openapi/pom.xml +++ b/rt/rs/description-common-openapi/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/rs/description-microprofile-openapi/pom.xml b/rt/rs/description-microprofile-openapi/pom.xml index 9fded8b8484..ac4f86b420c 100644 --- a/rt/rs/description-microprofile-openapi/pom.xml +++ b/rt/rs/description-microprofile-openapi/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/rs/description-openapi-v3/pom.xml b/rt/rs/description-openapi-v3/pom.xml index 1a395ffc722..dd3ff2ff7f7 100644 --- a/rt/rs/description-openapi-v3/pom.xml +++ b/rt/rs/description-openapi-v3/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/rs/description-swagger-ui/pom.xml b/rt/rs/description-swagger-ui/pom.xml index cfde9a8842e..4dd2f260ea9 100644 --- a/rt/rs/description-swagger-ui/pom.xml +++ b/rt/rs/description-swagger-ui/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/rs/description/pom.xml b/rt/rs/description/pom.xml index 975c680cd70..68a14d3dcd3 100644 --- a/rt/rs/description/pom.xml +++ b/rt/rs/description/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/rs/extensions/json-basic/pom.xml b/rt/rs/extensions/json-basic/pom.xml index 4d3cbef3cba..8db483fbb30 100644 --- a/rt/rs/extensions/json-basic/pom.xml +++ b/rt/rs/extensions/json-basic/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../../parent/pom.xml diff --git a/rt/rs/extensions/providers/pom.xml b/rt/rs/extensions/providers/pom.xml index 3d2b5541aec..833347779ea 100644 --- a/rt/rs/extensions/providers/pom.xml +++ b/rt/rs/extensions/providers/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../../parent/pom.xml @@ -145,5 +145,10 @@ yasson test + + commons-logging + commons-logging + test + diff --git a/rt/rs/extensions/reactivestreams/pom.xml b/rt/rs/extensions/reactivestreams/pom.xml index 1a003b9ed87..6628fd974e9 100644 --- a/rt/rs/extensions/reactivestreams/pom.xml +++ b/rt/rs/extensions/reactivestreams/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../../parent/pom.xml diff --git a/rt/rs/extensions/reactor/pom.xml b/rt/rs/extensions/reactor/pom.xml index feecf49817b..474eaa863be 100644 --- a/rt/rs/extensions/reactor/pom.xml +++ b/rt/rs/extensions/reactor/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../../parent/pom.xml diff --git a/rt/rs/extensions/rx/pom.xml b/rt/rs/extensions/rx/pom.xml index f120634cb5e..5fdd8912852 100644 --- a/rt/rs/extensions/rx/pom.xml +++ b/rt/rs/extensions/rx/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../../parent/pom.xml diff --git a/rt/rs/extensions/rx2/pom.xml b/rt/rs/extensions/rx2/pom.xml index d88755bed5d..96d1520e120 100644 --- a/rt/rs/extensions/rx2/pom.xml +++ b/rt/rs/extensions/rx2/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../../parent/pom.xml diff --git a/rt/rs/extensions/rx3/pom.xml b/rt/rs/extensions/rx3/pom.xml index 8c92979ef4c..06e49d4d6bf 100644 --- a/rt/rs/extensions/rx3/pom.xml +++ b/rt/rs/extensions/rx3/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../../parent/pom.xml diff --git a/rt/rs/extensions/search/pom.xml b/rt/rs/extensions/search/pom.xml index e4e50cbf10b..38802b06c29 100644 --- a/rt/rs/extensions/search/pom.xml +++ b/rt/rs/extensions/search/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../../parent/pom.xml diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hibernate/SearchTypeContributor.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hibernate/SearchTypeContributor.java index 903b8eeb1b3..1af62108511 100644 --- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hibernate/SearchTypeContributor.java +++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hibernate/SearchTypeContributor.java @@ -26,7 +26,6 @@ import org.hibernate.type.SqlTypes; import org.hibernate.type.descriptor.java.EnumJavaType; import org.hibernate.type.descriptor.jdbc.EnumJdbcType; -import org.hibernate.usertype.StaticUserTypeSupport; public class SearchTypeContributor implements TypeContributor { @Override diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hibernate/StaticUserTypeSupport.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hibernate/StaticUserTypeSupport.java new file mode 100644 index 00000000000..dadb2487113 --- /dev/null +++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/hibernate/StaticUserTypeSupport.java @@ -0,0 +1,136 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.cxf.jaxrs.ext.search.hibernate; + +import java.io.Serializable; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +import org.hibernate.HibernateException; +import org.hibernate.type.descriptor.ValueBinder; +import org.hibernate.type.descriptor.ValueExtractor; +import org.hibernate.type.descriptor.WrapperOptions; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; +import org.hibernate.type.descriptor.java.BasicJavaType; +import org.hibernate.type.descriptor.java.JavaType; +import org.hibernate.type.descriptor.java.MutabilityPlan; +import org.hibernate.type.descriptor.jdbc.JdbcType; +import org.hibernate.usertype.UserType; + +/** + * @author Steve Ebersole + */ +class StaticUserTypeSupport implements UserType { + private final BasicJavaType javaType; + private final JdbcType jdbcType; + private final BasicValueConverter valueConverter; + + private final ValueExtractor jdbcValueExtractor; + private final ValueBinder jdbcValueBinder; + + StaticUserTypeSupport(BasicJavaType javaType, JdbcType jdbcType) { + this(javaType, jdbcType, javaType.getMutabilityPlan()); + } + + StaticUserTypeSupport(BasicJavaType javaType, JdbcType jdbcType, MutabilityPlan mutabilityPlan) { + this(javaType, jdbcType, mutabilityPlan, null); + } + + StaticUserTypeSupport(BasicJavaType javaType, JdbcType jdbcType, BasicValueConverter valueConverter) { + this(javaType, jdbcType, javaType.getMutabilityPlan(), valueConverter); + } + + StaticUserTypeSupport(BasicJavaType javaType, JdbcType jdbcType, MutabilityPlan mutabilityPlan, + BasicValueConverter valueConverter) { + this.javaType = javaType; + this.jdbcType = jdbcType; + this.valueConverter = valueConverter; + + //noinspection unchecked + this.jdbcValueExtractor = jdbcType.getExtractor((JavaType) javaType); + //noinspection unchecked + this.jdbcValueBinder = jdbcType.getBinder((JavaType) javaType); + } + + @Override + public int getSqlType() { + return jdbcType.getDdlTypeCode(); + } + + @Override + public Class returnedClass() { + return javaType.getJavaTypeClass(); + } + + @Override + public boolean equals(T x, T y) throws HibernateException { + return javaType.areEqual(x, y); + } + + @Override + public int hashCode(T x) throws HibernateException { + return javaType.extractHashCode(x); + } + + @Override + public T nullSafeGet(ResultSet rs, int position, WrapperOptions options) throws SQLException { + final Object extracted = jdbcValueExtractor.extract(rs, position, options); + + if (valueConverter != null) { + return valueConverter.toDomainValue(extracted); + } + + //noinspection unchecked + return (T) extracted; + } + + @Override + public void nullSafeSet(PreparedStatement st, T value, int index, WrapperOptions options) throws SQLException { + final Object valueToBind; + if (valueConverter != null) { + valueToBind = valueConverter.toRelationalValue(value); + } else { + valueToBind = value; + } + + jdbcValueBinder.bind(st, valueToBind, index, options); + } + + @Override + public T deepCopy(T value) throws HibernateException { + return javaType.getMutabilityPlan().deepCopy(value); + } + + @Override + public boolean isMutable() { + return javaType.getMutabilityPlan().isMutable(); + } + + @Override + public Serializable disassemble(T value) throws HibernateException { + return javaType.getMutabilityPlan().disassemble(value, null); + } + + @Override + public T assemble(Serializable cached, Object owner) throws HibernateException { + return javaType.getMutabilityPlan().assemble(cached, null); + } +} diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/AbstractLuceneQueryVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/AbstractLuceneQueryVisitorTest.java index 2ae4f1aa002..5c59ae79448 100644 --- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/AbstractLuceneQueryVisitorTest.java +++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/AbstractLuceneQueryVisitorTest.java @@ -111,7 +111,7 @@ protected void doTestTextContentMatchWithQuery(Query query) throws Exception { assertEquals(1, hits.length); // Iterate through the results: for (int i = 0; i < hits.length; i++) { - Document hitDoc = isearcher.doc(hits[i].doc); + Document hitDoc = isearcher.storedFields().document(hits[i].doc); assertEquals("name=text", hitDoc.get("contents")); } @@ -130,7 +130,7 @@ protected void doTestIntContentMatchWithQuery(Query query) throws Exception { assertEquals(1, hits.length); // Iterate through the results: for (int i = 0; i < hits.length; i++) { - Document hitDoc = isearcher.doc(hits[i].doc); + Document hitDoc = isearcher.storedFields().document(hits[i].doc); IndexableField field = hitDoc.getField("intfield"); assertEquals(4, field.numericValue().intValue()); } diff --git a/rt/rs/http-sci/pom.xml b/rt/rs/http-sci/pom.xml index 1537234322d..8e360a9954d 100644 --- a/rt/rs/http-sci/pom.xml +++ b/rt/rs/http-sci/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/rs/microprofile-client/pom.xml b/rt/rs/microprofile-client/pom.xml index 0a403c7bffd..1a9eab8268a 100644 --- a/rt/rs/microprofile-client/pom.xml +++ b/rt/rs/microprofile-client/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilder.java b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilder.java index bcb6fa0e2ec..e0e127338e9 100644 --- a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilder.java +++ b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/CxfTypeSafeClientBuilder.java @@ -41,8 +41,11 @@ import jakarta.ws.rs.ProcessingException; import jakarta.ws.rs.core.Configurable; import jakarta.ws.rs.core.Configuration; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.cxf.jaxrs.client.ClientProperties; import org.apache.cxf.jaxrs.client.spec.TLSConfiguration; +import org.apache.cxf.jaxrs.utils.HttpUtils; import org.apache.cxf.microprofile.client.sse.SseMessageBodyReader; import org.eclipse.microprofile.rest.client.RestClientBuilder; import org.eclipse.microprofile.rest.client.annotation.RegisterProvider; @@ -61,6 +64,7 @@ public class CxfTypeSafeClientBuilder implements RestClientBuilder, Configurable private final MicroProfileClientConfigurableImpl configImpl = new MicroProfileClientConfigurableImpl<>(this); private TLSConfiguration secConfig = new TLSConfiguration(); + private final MultivaluedMap headers = new MultivaluedHashMap<>(); private static Collection listeners() { ClassLoader threadContextClassLoader; @@ -146,6 +150,13 @@ public T build(Class aClass) { MicroProfileClientFactoryBean bean = new MicroProfileClientFactoryBean(configImpl, baseUri, aClass, executorService, secConfig); + if (!headers.isEmpty()) { + bean.setHeaders(headers + .entrySet() + .stream() + .collect(Collectors.toMap(Map.Entry::getKey, e -> + HttpUtils.getHeaderString(HttpUtils.getHeaderStrings(e.getValue()))))); + } return bean.create(aClass); } @@ -287,4 +298,10 @@ public RestClientBuilder queryParamStyle(QueryParamStyle style) { public void close() { configImpl.close(); } + + @Override + public RestClientBuilder header(String name, Object value) { + headers.add(name, Objects.requireNonNull(value, "Header value should not be null")); + return this; + } } diff --git a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/cdi/RestClientBean.java b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/cdi/RestClientBean.java index f6f87f2a006..c015ba72843 100644 --- a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/cdi/RestClientBean.java +++ b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/cdi/RestClientBean.java @@ -18,11 +18,14 @@ */ package org.apache.cxf.microprofile.client.cdi; +import java.io.Closeable; import java.io.IOException; import java.io.InputStream; +import java.io.UncheckedIOException; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import java.lang.reflect.Type; +import java.lang.reflect.UndeclaredThrowableException; import java.net.URI; import java.net.URL; import java.security.KeyStore; @@ -134,6 +137,21 @@ public void destroy(Object instance, CreationalContext creationalContext if (builder != null) { builder.close(); } + try { + if (instance instanceof AutoCloseable c) { + c.close(); + } else if (instance instanceof Closeable c) { + c.close(); + } + } catch (final Exception ex) { + if (ex instanceof IOException e) { + throw new UncheckedIOException(e); + } else if (ex instanceof RuntimeException e) { + throw e; + } else { + throw new UndeclaredThrowableException(ex); + } + } } @Override diff --git a/rt/rs/pom.xml b/rt/rs/pom.xml index a05e2a46acc..d5ae7b514c9 100644 --- a/rt/rs/pom.xml +++ b/rt/rs/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-rt - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT client diff --git a/rt/rs/security/cors/pom.xml b/rt/rs/security/cors/pom.xml index 041287f2acd..9273931f668 100644 --- a/rt/rs/security/cors/pom.xml +++ b/rt/rs/security/cors/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../../parent/pom.xml diff --git a/rt/rs/security/http-signature/pom.xml b/rt/rs/security/http-signature/pom.xml index 4d1cc3fddd3..5807f0ceed8 100644 --- a/rt/rs/security/http-signature/pom.xml +++ b/rt/rs/security/http-signature/pom.xml @@ -29,7 +29,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../../parent/pom.xml diff --git a/rt/rs/security/jose-parent/jose-jaxrs/pom.xml b/rt/rs/security/jose-parent/jose-jaxrs/pom.xml index ed8061c8ed5..cd96f07e70c 100644 --- a/rt/rs/security/jose-parent/jose-jaxrs/pom.xml +++ b/rt/rs/security/jose-parent/jose-jaxrs/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../../../parent/pom.xml diff --git a/rt/rs/security/jose-parent/jose/pom.xml b/rt/rs/security/jose-parent/jose/pom.xml index ef4d61dbd33..f13e361c6ec 100644 --- a/rt/rs/security/jose-parent/jose/pom.xml +++ b/rt/rs/security/jose-parent/jose/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../../../parent/pom.xml diff --git a/rt/rs/security/jose-parent/pom.xml b/rt/rs/security/jose-parent/pom.xml index ccd93dad99f..4ff3e573979 100644 --- a/rt/rs/security/jose-parent/pom.xml +++ b/rt/rs/security/jose-parent/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-rt-rs-security - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT jose diff --git a/rt/rs/security/oauth-parent/oauth2-saml/pom.xml b/rt/rs/security/oauth-parent/oauth2-saml/pom.xml index 8937241d1d1..e0cf23176b5 100644 --- a/rt/rs/security/oauth-parent/oauth2-saml/pom.xml +++ b/rt/rs/security/oauth-parent/oauth2-saml/pom.xml @@ -27,7 +27,7 @@ cxf-rt-rs-security-oauth-parent org.apache.cxf - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../pom.xml diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml b/rt/rs/security/oauth-parent/oauth2/pom.xml index 83a29814bfe..0234fb2e2b7 100644 --- a/rt/rs/security/oauth-parent/oauth2/pom.xml +++ b/rt/rs/security/oauth-parent/oauth2/pom.xml @@ -27,7 +27,7 @@ cxf-rt-rs-security-oauth-parent org.apache.cxf - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../pom.xml @@ -115,7 +115,6 @@ org.apache.openjpa openjpa ${cxf.openjpa.version} - jakarta test true @@ -263,7 +262,7 @@ org.apache.maven.plugins maven-surefire-plugin - -javaagent:${org.apache.openjpa:openjpa:jar:jakarta} ${cxf.surefire.fork.vmargs} + -javaagent:${org.apache.openjpa:openjpa:jar} ${cxf.surefire.fork.vmargs} ${project.build.directory} diff --git a/rt/rs/security/oauth-parent/pom.xml b/rt/rs/security/oauth-parent/pom.xml index 85b4a2598cf..3db27bad1d9 100644 --- a/rt/rs/security/oauth-parent/pom.xml +++ b/rt/rs/security/oauth-parent/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../../parent/pom.xml diff --git a/rt/rs/security/pom.xml b/rt/rs/security/pom.xml index 7a8220ebc74..9ef67ae1463 100644 --- a/rt/rs/security/pom.xml +++ b/rt/rs/security/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-rt-rs - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT xml diff --git a/rt/rs/security/sso/oidc/pom.xml b/rt/rs/security/sso/oidc/pom.xml index 4e6211fc2be..39a67fad7b5 100644 --- a/rt/rs/security/sso/oidc/pom.xml +++ b/rt/rs/security/sso/oidc/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../../../parent/pom.xml @@ -71,7 +71,6 @@ org.apache.openjpa openjpa ${cxf.openjpa.version} - jakarta test diff --git a/rt/rs/security/sso/saml/pom.xml b/rt/rs/security/sso/saml/pom.xml index dfac3a3a5b8..b964d69ac13 100644 --- a/rt/rs/security/sso/saml/pom.xml +++ b/rt/rs/security/sso/saml/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../../../parent/pom.xml diff --git a/rt/rs/security/xml/pom.xml b/rt/rs/security/xml/pom.xml index 4a9e29e7872..e314ce2abfd 100644 --- a/rt/rs/security/xml/pom.xml +++ b/rt/rs/security/xml/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../../parent/pom.xml diff --git a/rt/rs/sse/pom.xml b/rt/rs/sse/pom.xml index 3a4f5f62cdd..0ccc97a2441 100644 --- a/rt/rs/sse/pom.xml +++ b/rt/rs/sse/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseBroadcasterImpl.java b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseBroadcasterImpl.java index de1ea2dd70c..0f5df3278ad 100644 --- a/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseBroadcasterImpl.java +++ b/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/SseBroadcasterImpl.java @@ -19,6 +19,7 @@ package org.apache.cxf.jaxrs.sse; import java.io.IOException; +import java.io.UncheckedIOException; import java.util.ArrayList; import java.util.Collection; import java.util.Set; @@ -124,9 +125,22 @@ public void close(boolean cascading) { } if (closed.compareAndSet(false, true)) { - subscribers.forEach(subscriber -> { - subscriber.close(); - }); + UncheckedIOException exception = null; + for (final SseEventSink subscriber: subscribers) { + try { + subscriber.close(); + } catch (final IOException ex) { + if (exception == null) { + exception = new UncheckedIOException(ex); + } else { + exception.addSuppressed(exception); + } + } + } + + if (exception != null) { + throw exception; + } } } } diff --git a/rt/security-saml/pom.xml b/rt/security-saml/pom.xml index be8e42f2a64..053756f44e3 100644 --- a/rt/security-saml/pom.xml +++ b/rt/security-saml/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../parent/pom.xml diff --git a/rt/security/pom.xml b/rt/security/pom.xml index f10c67421e9..c4ef0983d4a 100644 --- a/rt/security/pom.xml +++ b/rt/security/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../parent/pom.xml diff --git a/rt/transports/http-hc/pom.xml b/rt/transports/http-hc/pom.xml index 2458095fecb..be4b4be0d61 100644 --- a/rt/transports/http-hc/pom.xml +++ b/rt/transports/http-hc/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/transports/http-hc5/pom.xml b/rt/transports/http-hc5/pom.xml index 6fe148cdc3c..37929b005d4 100644 --- a/rt/transports/http-hc5/pom.xml +++ b/rt/transports/http-hc5/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/transports/http-jetty/pom.xml b/rt/transports/http-jetty/pom.xml index d6876aeab85..8c6ecdeace0 100644 --- a/rt/transports/http-jetty/pom.xml +++ b/rt/transports/http-jetty/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml @@ -74,8 +74,8 @@ jetty-session - org.eclipse.jetty.ee10 - jetty-ee10-servlet + org.eclipse.jetty.ee11 + jetty-ee11-servlet org.eclipse.jetty diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java index 75950650097..dc164268304 100644 --- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java +++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java @@ -47,7 +47,7 @@ import org.apache.cxf.transport.https.CertConstraintsJaxBUtils; import org.apache.cxf.transport.servlet.ServletDestination; import org.apache.cxf.transports.http.configuration.HTTPServerPolicy; -import org.eclipse.jetty.ee10.servlet.HttpOutput; +import org.eclipse.jetty.ee11.servlet.HttpOutput; public class JettyHTTPDestination extends ServletDestination { diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java index ecd3c77de93..14b9ed77682 100644 --- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java +++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java @@ -28,8 +28,8 @@ import jakarta.servlet.http.HttpServletResponse; import org.apache.cxf.Bus; import org.apache.cxf.transport.http.HttpUrlUtil; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletContextRequest; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletContextRequest; diff --git 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 index e73b9c00b60..9a32cd63bb6 100644 --- 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 @@ -62,13 +62,13 @@ import org.apache.cxf.transport.HttpUriMapper; import org.apache.cxf.transport.http.HttpServerEngineSupport; import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHandler; -import org.eclipse.jetty.ee10.servlet.ServletHandler.Default404Servlet; -import org.eclipse.jetty.ee10.servlet.ServletHandler.MappedServlet; -import org.eclipse.jetty.ee10.servlet.ServletHolder; -import org.eclipse.jetty.ee10.servlet.ServletMapping; -import org.eclipse.jetty.ee10.servlet.SessionHandler; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHandler; +import org.eclipse.jetty.ee11.servlet.ServletHandler.Default404Servlet; +import org.eclipse.jetty.ee11.servlet.ServletHandler.MappedServlet; +import org.eclipse.jetty.ee11.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletMapping; +import org.eclipse.jetty.ee11.servlet.SessionHandler; import org.eclipse.jetty.http.BadMessageException; import org.eclipse.jetty.http.HttpFields.Mutable; import org.eclipse.jetty.http.HttpStatus; @@ -537,7 +537,7 @@ public synchronized void addServant(URL url, JettyHTTPHandler handler) { ex.getMessage() }); } - if (servlet != null && servlet instanceof JettyHTTPHandler && servletHolder.isStarted()) { + if (servlet instanceof JettyHTTPHandler && servletHolder.isStarted()) { try { // the servlet exist with the same path @@ -1078,7 +1078,7 @@ public synchronized void removeServant(URL url) { }); continue; } - if (servlet != null && servlet instanceof JettyHTTPHandler + if (servlet instanceof JettyHTTPHandler && (contextName.equals(contextHandler.getContextPath()) || (StringUtils.isEmpty(contextName) && "/".equals(contextHandler.getContextPath()))) @@ -1405,15 +1405,15 @@ protected boolean generateAcceptableResponse(Request request, Response response, switch (type) { case TEXT_HTML: - writeErrorHtml(request, writer, charset, code, message, cause, showStacks); + writeErrorHtml(request, writer, charset, code, message, cause); break; case TEXT_JSON: case APPLICATION_JSON: - writeErrorJson(request, writer, code, message, cause, showStacks); + writeErrorJson(request, writer, code, message, cause); break; case TEXT_PLAIN: - writeErrorPlain(request, writer, code, message, cause, showStacks); + writeErrorPlain(request, writer, code, message, cause); break; default: throw new IllegalStateException(); diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java index 4ee15f5e227..b3707551c7c 100644 --- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java +++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java @@ -70,8 +70,8 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType; import org.apache.cxf.ws.addressing.EndpointReferenceUtils; import org.apache.cxf.ws.addressing.JAXWSAConstants; -import org.eclipse.jetty.ee10.servlet.ServletRequestHttpWrapper; -import org.eclipse.jetty.ee10.servlet.ServletResponseHttpWrapper; +import org.eclipse.jetty.ee11.servlet.ServletRequestHttpWrapper; +import org.eclipse.jetty.ee11.servlet.ServletResponseHttpWrapper; import org.eclipse.jetty.http.HttpFields; diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java index 0d394abfe44..7fdb03b45ea 100644 --- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java +++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java @@ -42,10 +42,10 @@ import org.apache.cxf.helpers.IOUtils; import org.apache.cxf.management.InstrumentationManager; import org.apache.cxf.testutil.common.TestUtil; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHandler; -import org.eclipse.jetty.ee10.servlet.ServletHandler.MappedServlet; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHandler; +import org.eclipse.jetty.ee11.servlet.ServletHandler.MappedServlet; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jetty.http.pathmap.MatchedResource; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.handler.ContextHandler; diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPTestHandler.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPTestHandler.java index 7bf9bcd2252..93de4c354d1 100644 --- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPTestHandler.java +++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPTestHandler.java @@ -25,7 +25,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.cxf.transport.http.HttpUrlUtil; -import org.eclipse.jetty.ee10.servlet.ServletContextRequest; +import org.eclipse.jetty.ee11.servlet.ServletContextRequest; import org.eclipse.jetty.server.Request; public class JettyHTTPTestHandler extends JettyHTTPHandler { diff --git a/rt/transports/http-netty/netty-client/pom.xml b/rt/transports/http-netty/netty-client/pom.xml index 20f475bec38..ec4fc2548e7 100644 --- a/rt/transports/http-netty/netty-client/pom.xml +++ b/rt/transports/http-netty/netty-client/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../../parent/pom.xml diff --git a/rt/transports/http-netty/netty-server/pom.xml b/rt/transports/http-netty/netty-server/pom.xml index 8f9acd48f2a..af17f9e872d 100644 --- a/rt/transports/http-netty/netty-server/pom.xml +++ b/rt/transports/http-netty/netty-server/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../../parent/pom.xml diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletResponse.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletResponse.java index 8356047d771..6c77d59a6d0 100644 --- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletResponse.java +++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletResponse.java @@ -254,4 +254,13 @@ public Collection getHeaders(String name) { public Collection getHeaderNames() { throw new IllegalStateException("Method 'getHeaderNames' not yet implemented!"); } + + @Override + public void sendRedirect(String location, int sc, boolean clearBuffer) throws IOException { + setStatus(302); + setHeader(LOCATION, location); + if (clearBuffer) { + resetBuffer(); + } + } } diff --git a/rt/transports/http-undertow/pom.xml b/rt/transports/http-undertow/pom.xml index d490c799c86..8c743158252 100644 --- a/rt/transports/http-undertow/pom.xml +++ b/rt/transports/http-undertow/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml @@ -57,7 +57,7 @@ undertow-core - io.undertow + io.undertow.ee undertow-servlet diff --git a/rt/transports/http/pom.xml b/rt/transports/http/pom.xml index f8bd6f757ef..c51a0a7dde1 100644 --- a/rt/transports/http/pom.xml +++ b/rt/transports/http/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookie.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookie.java index ab1c7b327c6..9df4e882b99 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookie.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookie.java @@ -147,7 +147,7 @@ public boolean equals(Object o) { */ public String requestCookieHeader() { StringBuilder b = new StringBuilder(64); - b.append("$Version=\"1\""); + b.append("$Version=1"); b.append("; ").append(getName()) .append('=').append(getValue()); if (getPath() != null && getPath().length() > 0) { diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java index 59a0a977c18..a0be0296ccc 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java @@ -28,8 +28,6 @@ import java.io.PipedInputStream; import java.io.PipedOutputStream; import java.io.PushbackInputStream; -import java.lang.invoke.MethodHandles; -import java.lang.invoke.MethodType; import java.net.ConnectException; import java.net.HttpURLConnection; import java.net.MalformedURLException; @@ -146,28 +144,12 @@ void release() { if (client instanceof AutoCloseable) { try { - // The HttpClient::close may hang during the termination. try { - // Try to call shutdownNow() first - AccessController.doPrivileged((PrivilegedExceptionAction) () -> { - try { - MethodHandles.publicLookup() - .findVirtual(HttpClient.class, "shutdownNow", MethodType.methodType(void.class)) - .bindTo(client) - .invokeExact(); - return null; - } catch (final Throwable ex) { - if (ex instanceof Error) { - throw (Error) ex; - } else { - throw (Exception) ex; - } - } - }); - } catch (final PrivilegedActionException e) { + client.shutdownNow(); + } catch (Exception e) { //ignore } - + ((AutoCloseable)client).close(); } catch (Exception e) { //ignore diff --git a/rt/transports/jms/pom.xml b/rt/transports/jms/pom.xml index 39e71443480..9a8639aeef7 100644 --- a/rt/transports/jms/pom.xml +++ b/rt/transports/jms/pom.xml @@ -19,7 +19,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/transports/local/pom.xml b/rt/transports/local/pom.xml index aadd9adde26..c6ee9bd48eb 100644 --- a/rt/transports/local/pom.xml +++ b/rt/transports/local/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/transports/pom.xml b/rt/transports/pom.xml index b68b35b63e4..e537574b205 100644 --- a/rt/transports/pom.xml +++ b/rt/transports/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-rt - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT local diff --git a/rt/transports/udp/pom.xml b/rt/transports/udp/pom.xml index 37780be3729..8aa2182627a 100644 --- a/rt/transports/udp/pom.xml +++ b/rt/transports/udp/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/transports/websocket/pom.xml b/rt/transports/websocket/pom.xml index 0188f145737..6494d8a8af8 100644 --- a/rt/transports/websocket/pom.xml +++ b/rt/transports/websocket/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml @@ -146,8 +146,8 @@ true - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server + org.eclipse.jetty.ee11.websocket + jetty-ee11-websocket-jetty-server true diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketDestinationFactory.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketDestinationFactory.java index 0c089f92324..dd611000746 100644 --- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketDestinationFactory.java +++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketDestinationFactory.java @@ -43,7 +43,7 @@ public class WebSocketDestinationFactory implements HttpDestinationFactory { probeClass("org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory"); private static final boolean UNDERTOW_AVAILABLE = probeClass("org.apache.cxf.transport.http_undertow.UndertowHTTPServerEngineFactory"); - private static final Constructor JETTY11_WEBSOCKET_DESTINATION_CTR = + private static final Constructor JETTY12_WEBSOCKET_DESTINATION_CTR = probeConstructor("org.apache.cxf.transport.websocket.jetty12.Jetty12WebSocketDestination"); private static final Constructor UNDERTOW_WEBSOCKET_DESTINATION_CTR = probeUndertowConstructor("org.apache.cxf.transport.websocket.undertow.UndertowWebSocketDestination"); @@ -110,7 +110,7 @@ public AbstractHTTPDestination createDestination(EndpointInfo endpointInfo, Bus // for the embedded mode, we stick to jetty if jetty is available JettyHTTPServerEngineFactory serverEngineFactory = bus .getExtension(JettyHTTPServerEngineFactory.class); - return createJettyHTTPDestination(JETTY11_WEBSOCKET_DESTINATION_CTR, bus, registry, + return createJettyHTTPDestination(JETTY12_WEBSOCKET_DESTINATION_CTR, bus, registry, endpointInfo, serverEngineFactory); } else if (UNDERTOW_AVAILABLE) { // use UndertowWebSocketDestination @@ -132,7 +132,7 @@ public AbstractHTTPDestination createDestination(EndpointInfo endpointInfo, Bus endpointInfo.getAddress()); } // use jetty-websocket - return createJettyHTTPDestination(JETTY11_WEBSOCKET_DESTINATION_CTR, bus, registry, + return createJettyHTTPDestination(JETTY12_WEBSOCKET_DESTINATION_CTR, bus, registry, endpointInfo, null); } diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletRequest.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletRequest.java index 38bf7a3939a..824b02f0a86 100644 --- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletRequest.java +++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletRequest.java @@ -55,6 +55,8 @@ import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.transport.websocket.InvalidPathException; import org.apache.cxf.transport.websocket.WebSocketUtils; +import org.eclipse.jetty.ee11.servlet.ServletApiRequest; +import org.eclipse.jetty.ee11.servlet.ServletChannel; import org.eclipse.jetty.websocket.api.Session; import static java.nio.charset.StandardCharsets.UTF_8; @@ -70,8 +72,10 @@ public class WebSocketVirtualServletRequest implements HttpServletRequest { private Map requestHeaders; private Map attributes; - public WebSocketVirtualServletRequest(WebSocketServletHolder websocket, InputStream in, Session session) + public WebSocketVirtualServletRequest(ServletApiRequest req, WebSocketServletHolder websocket, + InputStream in, Session session) throws IOException { + this.webSocketHolder = websocket; this.in = in; @@ -93,6 +97,9 @@ public WebSocketVirtualServletRequest(WebSocketServletHolder websocket, InputStr if (v != null) { attributes.put("org.apache.cxf.transport.endpoint.address", v); } + if (req.getServletRequestInfo() != null) { + attributes.put(ServletChannel.class.getName(), req.getServletRequestInfo().getServletChannel()); + } } @Override diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletResponse.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletResponse.java index 6346c7550f4..c808f926023 100644 --- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletResponse.java +++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletResponse.java @@ -374,5 +374,10 @@ public void setStatus(int sc, String sm) { responseHeaders.put(WebSocketUtils.SC_KEY, Integer.toString(sc)); } - + @Override + public void sendRedirect(String location, int sc, boolean clearBuffer) throws IOException { + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "sendRedirect({0}, {1}, {2})", new Object[]{location, sc, clearBuffer}); + } + } } diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty12/Jetty12WebSocketDestination.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty12/Jetty12WebSocketDestination.java index 12fedaffb8e..e5ce55d5f96 100644 --- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty12/Jetty12WebSocketDestination.java +++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty12/Jetty12WebSocketDestination.java @@ -53,13 +53,15 @@ import org.apache.cxf.transport.websocket.jetty.WebSocketVirtualServletRequest; import org.apache.cxf.transport.websocket.jetty.WebSocketVirtualServletResponse; import org.apache.cxf.workqueue.WorkQueueManager; -import org.eclipse.jetty.ee10.websocket.server.JettyServerUpgradeRequest; -import org.eclipse.jetty.ee10.websocket.server.JettyServerUpgradeResponse; -import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketCreator; -import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer; +import org.eclipse.jetty.ee11.servlet.ServletApiRequest; +import org.eclipse.jetty.ee11.websocket.server.JettyServerUpgradeRequest; +import org.eclipse.jetty.ee11.websocket.server.JettyServerUpgradeResponse; +import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketCreator; +import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServerContainer; import org.eclipse.jetty.websocket.api.Callback; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.UpgradeRequest; +import org.eclipse.jetty.websocket.server.internal.CompletedUpgradeRequest; /** @@ -169,7 +171,8 @@ public void shutdown() { super.shutdown(); } - private void invoke(final byte[] data, final int offset, final int length, final Session session) { + private void invoke(final ServletApiRequest req, final byte[] data, final int offset, + final int length, final Session session) { // invoke the service asynchronously as the jetty websocket's onMessage is synchronously blocked // make sure the byte array passed to this method is immutable, as the websocket framework // may corrupt the byte array after this method is returned (i.e., before the data is returned in @@ -181,7 +184,7 @@ public void run() { try { WebSocketServletHolder holder = new Jetty12WebSocketHolder(session); response = createServletResponse(holder); - HttpServletRequest request = createServletRequest(data, offset, length, holder, session); + HttpServletRequest request = createServletRequest(req, data, offset, length, holder, session); String reqid = request.getHeader(REQUEST_ID_KEY); if (reqid != null) { if (WebSocketUtils.isContainingCRLF(reqid)) { @@ -221,11 +224,10 @@ private void reportErrorStatus(Session session, int i, HttpServletResponse resp) e.printStackTrace(); } } - private WebSocketVirtualServletRequest createServletRequest(byte[] data, int offset, int length, - WebSocketServletHolder holder, - Session session) - throws IOException { - return new WebSocketVirtualServletRequest(holder, new ByteArrayInputStream(data, offset, length), session); + + private WebSocketVirtualServletRequest createServletRequest(ServletApiRequest req, byte[] data, + int offset, int length, WebSocketServletHolder holder, Session session) throws IOException { + return new WebSocketVirtualServletRequest(req, holder, new ByteArrayInputStream(data, offset, length), session); } private WebSocketVirtualServletResponse createServletResponse(WebSocketServletHolder holder) throws IOException { @@ -237,7 +239,7 @@ private final class Creator implements JettyWebSocketCreator { @Override public Object createWebSocket(JettyServerUpgradeRequest req, JettyServerUpgradeResponse resp) { - return new Jetty12WebSocket(); + return new Jetty12WebSocket(req); } } @@ -251,7 +253,7 @@ public String getAuthType() { return null; } public String getContextPath() { - return getHttpServletRequest(session.getUpgradeRequest()).getContextPath(); + return getContextPath(session.getUpgradeRequest()); } public String getLocalAddr() { return null; @@ -319,7 +321,7 @@ public Principal getUserPrincipal() { public Object getAttribute(String name) { try { final UpgradeRequest upgradeRequest = session.getUpgradeRequest(); - return getHttpServletRequest(upgradeRequest).getAttribute(name); + return getAttribute(upgradeRequest, name); } catch (Exception ex) { if (name.equals("org.apache.cxf.transport.endpoint.address")) { return address; @@ -333,9 +335,25 @@ public void write(byte[] data, int offset, int length) throws IOException { session.sendBinary(ByteBuffer.wrap(data, offset, length), null); } - private HttpServletRequest getHttpServletRequest(final UpgradeRequest upgradeRequest) { - if (upgradeRequest instanceof JettyServerUpgradeRequest) { - return ((JettyServerUpgradeRequest)upgradeRequest).getHttpServletRequest(); + private Object getAttribute(final UpgradeRequest upgradeRequest, final String name) { + if (upgradeRequest instanceof JettyServerUpgradeRequest r) { + return r.getHttpServletRequest().getAttribute(name); + } else if (upgradeRequest instanceof CompletedUpgradeRequest r) { + if (name.equals("org.apache.cxf.transport.endpoint.address")) { + return address; + } else { + return null; /* no request attributes */ + } + } else { + throw new IllegalStateException("Unsupported upgrade request class: " + upgradeRequest.getClass()); + } + } + + private String getContextPath(final UpgradeRequest upgradeRequest) { + if (upgradeRequest instanceof JettyServerUpgradeRequest r) { + return r.getHttpServletRequest().getContextPath(); + } else if (upgradeRequest instanceof CompletedUpgradeRequest r) { + return r.getRequestURI().getPath(); } else { throw new IllegalStateException("Unsupported upgrade request class: " + upgradeRequest.getClass()); } @@ -345,6 +363,12 @@ private HttpServletRequest getHttpServletRequest(final UpgradeRequest upgradeReq @org.eclipse.jetty.websocket.api.annotations.WebSocket public class Jetty12WebSocket { volatile Session session; + private final ServletApiRequest req; + + public Jetty12WebSocket(JettyServerUpgradeRequest req) { + this.req = (ServletApiRequest) req.getServletAttributes() + .get(org.eclipse.jetty.websocket.core.WebSocketConstants.WEBSOCKET_WRAPPED_REQUEST_ATTRIBUTE); + } @org.eclipse.jetty.websocket.api.annotations.OnWebSocketOpen public void onOpen(Session sess) { @@ -365,7 +389,7 @@ public void onMessage(String message) { public void onBinaryMessage(ByteBuffer message, Callback callback) { byte[] payload = new byte[message.remaining()]; message.get(payload); - invoke(payload, 0, payload.length, session); + invoke(req, payload, 0, payload.length, session); } diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty12/JettyWebSocketHandler.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty12/JettyWebSocketHandler.java index 941ce69e670..c0ccd354dd7 100644 --- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty12/JettyWebSocketHandler.java +++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty12/JettyWebSocketHandler.java @@ -25,9 +25,9 @@ import jakarta.servlet.http.HttpServletResponse; import org.apache.cxf.transport.http_jetty.JettyHTTPDestination; import org.apache.cxf.transport.http_jetty.JettyHTTPHandler; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer; -import org.eclipse.jetty.ee10.websocket.server.config.JettyWebSocketServletContainerInitializer; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServerContainer; +import org.eclipse.jetty.ee11.websocket.server.config.JettyWebSocketServletContainerInitializer; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.websocket.core.WebSocketComponents; import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents; diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletResponse.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletResponse.java index 51beae4cc3c..2811cea1096 100644 --- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletResponse.java +++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletResponse.java @@ -370,4 +370,11 @@ public void setStatus(int sc, String sm) { } responseHeaders.put(WebSocketUtils.SC_KEY, Integer.toString(sc)); } + + @Override + public void sendRedirect(String location, int sc, boolean clearBuffer) throws IOException { + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "sendRedirect({0}, {1}, {2})", new Object[]{location, sc, clearBuffer}); + } + } } diff --git a/rt/ws/addr/pom.xml b/rt/ws/addr/pom.xml index b2221cec99f..8e516ad6ef8 100644 --- a/rt/ws/addr/pom.xml +++ b/rt/ws/addr/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/ws/eventing/pom.xml b/rt/ws/eventing/pom.xml index a4a82d23cd8..3760d7ad91a 100644 --- a/rt/ws/eventing/pom.xml +++ b/rt/ws/eventing/pom.xml @@ -9,7 +9,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/ws/mex/pom.xml b/rt/ws/mex/pom.xml index 351e32cf793..1857cbfe1d1 100644 --- a/rt/ws/mex/pom.xml +++ b/rt/ws/mex/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/ws/policy/pom.xml b/rt/ws/policy/pom.xml index d80b4bb1dd2..798d96a1f12 100644 --- a/rt/ws/policy/pom.xml +++ b/rt/ws/policy/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/ws/pom.xml b/rt/ws/pom.xml index c86e7bf4968..85c83574c20 100644 --- a/rt/ws/pom.xml +++ b/rt/ws/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-rt - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT policy diff --git a/rt/ws/rm/pom.xml b/rt/ws/rm/pom.xml index 4c4cc7dd625..69c7c5c7d20 100644 --- a/rt/ws/rm/pom.xml +++ b/rt/ws/rm/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml index e769ca7f843..aacf6b2fdc6 100644 --- a/rt/ws/security/pom.xml +++ b/rt/ws/security/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/ws/transfer/pom.xml b/rt/ws/transfer/pom.xml index 694e17e9ade..bd3699350be 100644 --- a/rt/ws/transfer/pom.xml +++ b/rt/ws/transfer/pom.xml @@ -9,7 +9,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/rt/wsdl/pom.xml b/rt/wsdl/pom.xml index ed1c1978e42..576307975d0 100644 --- a/rt/wsdl/pom.xml +++ b/rt/wsdl/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../parent/pom.xml diff --git a/services/pom.xml b/services/pom.xml index 06271838478..d1646efa771 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -28,7 +28,7 @@ org.apache.cxf cxf ../pom.xml - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT sts diff --git a/services/sts/pom.xml b/services/sts/pom.xml index 6fbf3b16289..5aebddafd52 100644 --- a/services/sts/pom.xml +++ b/services/sts/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.services cxf-services - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../pom.xml diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml index 4832cfffaec..dec86ffae53 100644 --- a/services/sts/sts-core/pom.xml +++ b/services/sts/sts-core/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/services/sts/systests/advanced/pom.xml b/services/sts/systests/advanced/pom.xml index c3753a38e55..72ccdee2bf9 100644 --- a/services/sts/systests/advanced/pom.xml +++ b/services/sts/systests/advanced/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../../parent/pom.xml diff --git a/services/sts/systests/basic/pom.xml b/services/sts/systests/basic/pom.xml index abb412d4119..bd5cece7340 100644 --- a/services/sts/systests/basic/pom.xml +++ b/services/sts/systests/basic/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../../parent/pom.xml diff --git a/services/sts/systests/pom.xml b/services/sts/systests/pom.xml index ca2ed93a04d..af17d09f31c 100644 --- a/services/sts/systests/pom.xml +++ b/services/sts/systests/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.services.sts cxf-services-sts - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT basic diff --git a/services/sts/systests/sts-osgi/pom.xml b/services/sts/systests/sts-osgi/pom.xml index 348d62787f5..74680dd2c5f 100644 --- a/services/sts/systests/sts-osgi/pom.xml +++ b/services/sts/systests/sts-osgi/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../../parent/pom.xml diff --git a/services/ws-discovery/pom.xml b/services/ws-discovery/pom.xml index 52be4a446f4..0191040c866 100644 --- a/services/ws-discovery/pom.xml +++ b/services/ws-discovery/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.services cxf-services - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../pom.xml diff --git a/services/ws-discovery/ws-discovery-api/pom.xml b/services/ws-discovery/ws-discovery-api/pom.xml index 5c0143a8eaa..d07d0045777 100644 --- a/services/ws-discovery/ws-discovery-api/pom.xml +++ b/services/ws-discovery/ws-discovery-api/pom.xml @@ -28,7 +28,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/services/ws-discovery/ws-discovery-service/pom.xml b/services/ws-discovery/ws-discovery-service/pom.xml index e36c81456b6..d640926a196 100644 --- a/services/ws-discovery/ws-discovery-service/pom.xml +++ b/services/ws-discovery/ws-discovery-service/pom.xml @@ -28,7 +28,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/services/wsn/pom.xml b/services/wsn/pom.xml index 68421393a23..35207e70fa6 100644 --- a/services/wsn/pom.xml +++ b/services/wsn/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.services cxf-services - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../pom.xml diff --git a/services/wsn/wsn-api/pom.xml b/services/wsn/wsn-api/pom.xml index 700f938f091..e4837a401be 100644 --- a/services/wsn/wsn-api/pom.xml +++ b/services/wsn/wsn-api/pom.xml @@ -28,7 +28,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/services/wsn/wsn-core/pom.xml b/services/wsn/wsn-core/pom.xml index f050f225aec..df47cc06215 100644 --- a/services/wsn/wsn-core/pom.xml +++ b/services/wsn/wsn-core/pom.xml @@ -28,7 +28,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/services/wsn/wsn-osgi/pom.xml b/services/wsn/wsn-osgi/pom.xml index e6853289603..62df709289a 100644 --- a/services/wsn/wsn-osgi/pom.xml +++ b/services/wsn/wsn-osgi/pom.xml @@ -28,7 +28,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/services/xkms/pom.xml b/services/xkms/pom.xml index ea32e7fd882..93e698d528c 100644 --- a/services/xkms/pom.xml +++ b/services/xkms/pom.xml @@ -28,7 +28,7 @@ org.apache.cxf.services cxf-services - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../pom.xml diff --git a/services/xkms/xkms-client/pom.xml b/services/xkms/xkms-client/pom.xml index e801c5fb4f0..9e567c29ec1 100644 --- a/services/xkms/xkms-client/pom.xml +++ b/services/xkms/xkms-client/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/services/xkms/xkms-common/pom.xml b/services/xkms/xkms-common/pom.xml index a503e357e34..f79355fa701 100644 --- a/services/xkms/xkms-common/pom.xml +++ b/services/xkms/xkms-common/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/services/xkms/xkms-service/pom.xml b/services/xkms/xkms-service/pom.xml index 5c7d2e1d110..03e1ebcb009 100644 --- a/services/xkms/xkms-service/pom.xml +++ b/services/xkms/xkms-service/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/services/xkms/xkms-war/pom.xml b/services/xkms/xkms-war/pom.xml index 4fd1caf9e37..458d3439a50 100644 --- a/services/xkms/xkms-war/pom.xml +++ b/services/xkms/xkms-war/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/services/xkms/xkms-x509-handlers/pom.xml b/services/xkms/xkms-x509-handlers/pom.xml index a559a09a73f..049edef3b1e 100644 --- a/services/xkms/xkms-x509-handlers/pom.xml +++ b/services/xkms/xkms-x509-handlers/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml diff --git a/services/xkms/xkms-x509-repo-ldap/pom.xml b/services/xkms/xkms-x509-repo-ldap/pom.xml index 2f1eaa47303..b72599f7c16 100644 --- a/services/xkms/xkms-x509-repo-ldap/pom.xml +++ b/services/xkms/xkms-x509-repo-ldap/pom.xml @@ -3,7 +3,7 @@ org.apache.cxf cxf-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../../parent/pom.xml org.apache.cxf.services.xkms diff --git a/systests/cdi/base/pom.xml b/systests/cdi/base/pom.xml index 5c6ce18aad1..468b149a099 100644 --- a/systests/cdi/base/pom.xml +++ b/systests/cdi/base/pom.xml @@ -22,7 +22,7 @@ cxf-systests-cdi org.apache.cxf.systests - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT 4.0.0 @@ -39,12 +39,12 @@ jetty-server - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty.ee11 + jetty-ee11-webapp - org.eclipse.jetty.ee10 - jetty-ee10-servlet + org.eclipse.jetty.ee11 + jetty-ee11-servlet org.apache.cxf diff --git a/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/jetty/AbstractJettyServer.java b/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/jetty/AbstractJettyServer.java index e8d1a813d3a..771be686cb3 100644 --- a/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/jetty/AbstractJettyServer.java +++ b/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/jetty/AbstractJettyServer.java @@ -22,9 +22,9 @@ import org.apache.cxf.cdi.CXFCdiServlet; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; -import org.eclipse.jetty.ee10.webapp.WebAppContext; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; +import org.eclipse.jetty.ee11.webapp.WebAppContext; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.DefaultHandler; diff --git a/systests/cdi/cdi-owb/cdi-multiple-apps-owb/pom.xml b/systests/cdi/cdi-owb/cdi-multiple-apps-owb/pom.xml index 94ca953f34d..9f9b3746770 100644 --- a/systests/cdi/cdi-owb/cdi-multiple-apps-owb/pom.xml +++ b/systests/cdi/cdi-owb/cdi-multiple-apps-owb/pom.xml @@ -21,7 +21,7 @@ org.apache.cxf.systests cxf-systests-cdi-owb - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../ 4.0.0 diff --git a/systests/cdi/cdi-owb/cdi-no-apps-owb/pom.xml b/systests/cdi/cdi-owb/cdi-no-apps-owb/pom.xml index a738ffcfdaf..0185a39f5c5 100644 --- a/systests/cdi/cdi-owb/cdi-no-apps-owb/pom.xml +++ b/systests/cdi/cdi-owb/cdi-no-apps-owb/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf.systests cxf-systests-cdi-owb - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../ 4.0.0 diff --git a/systests/cdi/cdi-owb/cdi-producers-owb/pom.xml b/systests/cdi/cdi-owb/cdi-producers-owb/pom.xml index a4dfc61cfd8..0a3b7dd57d4 100644 --- a/systests/cdi/cdi-owb/cdi-producers-owb/pom.xml +++ b/systests/cdi/cdi-owb/cdi-producers-owb/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf.systests cxf-systests-cdi-owb - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../ 4.0.0 diff --git a/systests/cdi/cdi-owb/pom.xml b/systests/cdi/cdi-owb/pom.xml index d3898d2ef3f..ef10810a6cc 100644 --- a/systests/cdi/cdi-owb/pom.xml +++ b/systests/cdi/cdi-owb/pom.xml @@ -21,7 +21,7 @@ org.apache.cxf.systests cxf-systests-cdi - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../ 4.0.0 @@ -58,7 +58,6 @@ org.apache.openwebbeans openwebbeans-impl ${cxf.openwebbeans.version} - jakarta org.apache.openwebbeans @@ -70,19 +69,16 @@ org.apache.openwebbeans openwebbeans-el22 ${cxf.openwebbeans.version} - jakarta org.apache.openwebbeans openwebbeans-spi ${cxf.openwebbeans.version} - jakarta org.apache.openwebbeans openwebbeans-web ${cxf.openwebbeans.version} - jakarta org.apache.openwebbeans diff --git a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/pom.xml b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/pom.xml index 03bc76e960c..7d53bb5a4f7 100644 --- a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/pom.xml +++ b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/pom.xml @@ -21,7 +21,7 @@ org.apache.cxf.systests cxf-systests-cdi-weld - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../ 4.0.0 diff --git a/systests/cdi/cdi-weld/cdi-no-apps-weld/pom.xml b/systests/cdi/cdi-weld/cdi-no-apps-weld/pom.xml index 898a018ae30..d219d056b1e 100644 --- a/systests/cdi/cdi-weld/cdi-no-apps-weld/pom.xml +++ b/systests/cdi/cdi-weld/cdi-no-apps-weld/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf.systests cxf-systests-cdi-weld - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../ 4.0.0 diff --git a/systests/cdi/cdi-weld/cdi-producers-weld/pom.xml b/systests/cdi/cdi-weld/cdi-producers-weld/pom.xml index 475fecdd589..9a9aa0c316d 100644 --- a/systests/cdi/cdi-weld/cdi-producers-weld/pom.xml +++ b/systests/cdi/cdi-weld/cdi-producers-weld/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf.systests cxf-systests-cdi-weld - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../ 4.0.0 diff --git a/systests/cdi/cdi-weld/pom.xml b/systests/cdi/cdi-weld/pom.xml index ed2ed0642c7..b56716caa85 100644 --- a/systests/cdi/cdi-weld/pom.xml +++ b/systests/cdi/cdi-weld/pom.xml @@ -21,7 +21,7 @@ org.apache.cxf.systests cxf-systests-cdi - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../ 4.0.0 diff --git a/systests/cdi/pom.xml b/systests/cdi/pom.xml index 1426d566f5b..c1765d907be 100644 --- a/systests/cdi/pom.xml +++ b/systests/cdi/pom.xml @@ -21,7 +21,7 @@ cxf-parent org.apache.cxf - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../parent/pom.xml 4.0.0 diff --git a/systests/container-integration/grizzly/pom.xml b/systests/container-integration/grizzly/pom.xml index 26ba5a95f03..bc98a4443ee 100644 --- a/systests/container-integration/grizzly/pom.xml +++ b/systests/container-integration/grizzly/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf.systests cxf-systests-container-integration - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../pom.xml cxf-systests-ci-grizzly diff --git a/systests/container-integration/pom.xml b/systests/container-integration/pom.xml index 575e74ca873..b303486f7f3 100644 --- a/systests/container-integration/pom.xml +++ b/systests/container-integration/pom.xml @@ -21,7 +21,7 @@ cxf-parent org.apache.cxf - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../parent/pom.xml 4.0.0 diff --git a/systests/container-integration/webapp/pom.xml b/systests/container-integration/webapp/pom.xml index b5144c8bab9..47e21f17afb 100644 --- a/systests/container-integration/webapp/pom.xml +++ b/systests/container-integration/webapp/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf.systests cxf-systests-container-integration - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../pom.xml cxf-systests-ci-webapp diff --git a/systests/databinding/pom.xml b/systests/databinding/pom.xml index e0115f05919..7ac209ab516 100644 --- a/systests/databinding/pom.xml +++ b/systests/databinding/pom.xml @@ -21,7 +21,7 @@ cxf-parent org.apache.cxf - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../parent/pom.xml 4.0.0 @@ -192,8 +192,8 @@ jetty-server - org.eclipse.jetty.ee10 - jetty-ee10-webapp + org.eclipse.jetty.ee11 + jetty-ee11-webapp org.apache.cxf diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java index e607e151a26..210b964c0cc 100644 --- a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java +++ b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java @@ -21,7 +21,7 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -import org.eclipse.jetty.ee10.webapp.WebAppContext; +import org.eclipse.jetty.ee11.webapp.WebAppContext; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.handler.DefaultHandler; diff --git a/systests/forked/pom.xml b/systests/forked/pom.xml index 7c3cf62334f..4e667f1d8e0 100644 --- a/systests/forked/pom.xml +++ b/systests/forked/pom.xml @@ -21,7 +21,7 @@ cxf-parent org.apache.cxf - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../parent/pom.xml 4.0.0 diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml index a9977082f0b..2566d77423a 100644 --- a/systests/jaxrs/pom.xml +++ b/systests/jaxrs/pom.xml @@ -21,7 +21,7 @@ cxf-parent org.apache.cxf - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT ../../parent/pom.xml 4.0.0 @@ -48,8 +48,8 @@ ${cxf.hibernate.validator.version} - org.eclipse.jetty.ee10 - jetty-ee10-apache-jsp + org.eclipse.jetty.ee11 + jetty-ee11-apache-jsp jakarta.json @@ -181,8 +181,8 @@ ${project.version} - org.eclipse.jetty.ee10.websocket - jetty-ee10-websocket-jetty-server + org.eclipse.jetty.ee11.websocket + jetty-ee11-websocket-jetty-server test @@ -367,6 +367,12 @@ ${cxf.spring.security.version} test + + org.springframework.security + spring-security-access + ${cxf.spring.security.version} + test + org.springframework.security spring-security-config diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java index b470fc1581f..c898eb83e6c 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java @@ -20,7 +20,7 @@ package org.apache.cxf.systest.jaxrs; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -import org.eclipse.jetty.ee10.webapp.WebAppContext; +import org.eclipse.jetty.ee11.webapp.WebAppContext; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.handler.DefaultHandler; import org.eclipse.jetty.util.resource.ResourceFactory; diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookCxfContinuationServlet3Server.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookCxfContinuationServlet3Server.java index c2db32f688c..05bfd980b90 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookCxfContinuationServlet3Server.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookCxfContinuationServlet3Server.java @@ -25,9 +25,9 @@ import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; import org.apache.cxf.transport.servlet.CXFNonSpringServlet; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jetty.server.Server; public class BookCxfContinuationServlet3Server extends AbstractBusTestServerBase { diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java index 5a6f4c818f6..8c3460e6768 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java @@ -349,7 +349,7 @@ public void testGetBookDescriptionHttpResponse() throws Exception { WebClient wc = WebClient.create(address); WebClient.getConfig(wc).getInInterceptors().add(new LoggingInInterceptor()); Response r = wc.get(); - assertEquals("text/plain", r.getMediaType().toString()); + assertEquals("text/plain;charset=iso-8859-1", r.getMediaType().toString()); assertEquals("Good Book", r.readEntity(String.class)); } @@ -2199,14 +2199,14 @@ public void testGetBookByMatrixParametersInTheMiddle() throws Exception { public void testGetBookByHeader() throws Exception { getAndCompareAsStrings("http://localhost:" + PORT + "/bookstore/bookheaders", "resources/expected_get_book123.txt", - "application/xml;q=0.5,text/xml", "text/xml", 200); + "application/xml;q=0.5,text/xml", "text/xml;charset=utf-8", 200); } @Test public void testGetBookByHeaderPerRequest() throws Exception { getAndCompareAsStrings("http://localhost:" + PORT + "/bookstore2/bookheaders", "resources/expected_get_book123.txt", - "application/xml;q=0.5,text/xml", "text/xml", 200); + "application/xml;q=0.5,text/xml", "text/xml;charset=utf-8", 200); } @Test @@ -2256,7 +2256,7 @@ public void testGetBookByHeaderPerRequestContextFault() throws Exception { public void testGetBookByHeaderDefault() throws Exception { getAndCompareAsStrings("http://localhost:" + PORT + "/bookstore/bookheaders2", "resources/expected_get_book123.txt", - "application/xml;q=0.5,text/xml", "text/xml", 200); + "application/xml;q=0.5,text/xml", "text/xml;charset=utf-8", 200); } @Test @@ -2487,7 +2487,7 @@ public void testGetChapterWithParentIds() throws Exception { public void testGetBook123ReturnString() throws Exception { getAndCompareAsStrings("http://localhost:" + PORT + "/bookstore/booknames/123", "resources/expected_get_book123_returnstring.txt", - "text/plain", "text/plain", 200); + "text/plain", "text/plain;charset=iso-8859-1", 200); } @Test @@ -2800,7 +2800,7 @@ public void testUriInfoMatchedResources() throws Exception { "[class org.apache.cxf.systest.jaxrs.Chapter, " + "class org.apache.cxf.systest.jaxrs.Book, " + "class org.apache.cxf.systest.jaxrs.BookStore]", - "text/plain", "text/plain", 200); + "text/plain", "text/plain;charset=iso-8859-1", 200); } @Test @@ -2810,7 +2810,7 @@ public void testUriInfoMatchedResourcesWithObject() throws Exception { "[class org.apache.cxf.systest.jaxrs.Chapter, " + "class org.apache.cxf.systest.jaxrs.Book, " + "class org.apache.cxf.systest.jaxrs.BookStore]", - "text/plain", "text/plain", 200); + "text/plain", "text/plain;charset=iso-8859-1", 200); } @Test @@ -2821,7 +2821,7 @@ public void testUriInfoMatchedUrisDecode() throws Exception { + "bookstore]"; getAndCompare("http://localhost:" + PORT + "/bookstore/" + "booksubresource/123/chapters/sub/1/matched!uris?decode=true", - expected, "text/plain", "text/plain", 200); + expected, "text/plain", "text/plain;charset=iso-8859-1", 200); } @Test diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java index 8707b2c68b2..155981038b8 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java @@ -74,8 +74,8 @@ private void doTestGetBookHTML(String endpointAddress) throws Exception { assertEquals("CXF Rocks", value); Object contentType = client.getResponse().getHeaders().getFirst(HttpHeaders.CONTENT_TYPE); assertNotNull("Content-Type should be present", contentType); - assertEquals(MediaType.TEXT_HTML, contentType.toString()); - assertEquals(MediaType.TEXT_HTML_TYPE, client.getResponse().getMediaType()); + assertEquals(MediaType.TEXT_HTML + ";charset=utf-8", contentType.toString()); + assertEquals(MediaType.TEXT_HTML_TYPE.withCharset("utf-8"), client.getResponse().getMediaType()); } @Test diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/AbstractOpenApiServiceDescriptionTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/AbstractOpenApiServiceDescriptionTest.java index b7ee757e1e4..2d08cba439a 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/AbstractOpenApiServiceDescriptionTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/AbstractOpenApiServiceDescriptionTest.java @@ -255,7 +255,7 @@ public void testUiRootResource() { try (Response response = uiClient.get()) { String html = response.readEntity(String.class); assertThat(html, containsString("