[cxf] branch dependabot/maven/cxf.xnio.version-3.8.10.Final created (now 4fb041f18b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/cxf.xnio.version-3.8.10.Final in repository https://gitbox.apache.org/repos/asf/cxf.git at 4fb041f18b Bump cxf.xnio.version from 3.8.9.Final to 3.8.10.Final No new revisions were added by this update.
svn commit: r1084166 - in /websites/production/cxf/content: cache/docs.pageCache docs/using-micrometer-observation.html
Author: buildbot Date: Thu Sep 14 01:42:50 2023 New Revision: 1084166 Log: Production update by buildbot for cxf Modified: websites/production/cxf/content/cache/docs.pageCache websites/production/cxf/content/docs/using-micrometer-observation.html Modified: websites/production/cxf/content/cache/docs.pageCache == Binary files - no diff available. Modified: websites/production/cxf/content/docs/using-micrometer-observation.html == --- websites/production/cxf/content/docs/using-micrometer-observation.html (original) +++ websites/production/cxf/content/docs/using-micrometer-observation.html Thu Sep 14 01:42:50 2023 @@ -98,7 +98,7 @@ Apache CXF -- Using Micrometer Observati -Overviewhttps://micrometer.io/"; rel="nofollow">Micrometer is a metrics instrumentation library for JVM-based applications that Apache CXF https://cwiki.apache.org/confluence/display/CXF20DOC/Micrometer";>provides the support for. Starting from https://micrometer.io/"; rel="nofollow">Micrometer 1.10, https://micrometer.io/"; rel="nofollow">Micrometer provides the https://micrometer.io/docs/observation"; rel="nofollow">Observation API and a plugin mechanism that allows to add capabilities including the tracing features. Starting from 4.0.3 release, the Apache CXF fully supports integration (through cxf-integration-tracing-micrometer module) with https://micrometer.io/docs/tracing"; rel="nofollow">Micrometer Tracing distributed tracing capabilities using https://micrometer.io/docs/observation"; rel="nofollow">Micrometer Observation APIs.The section https://cwiki.apache.org/confluence/display/CXF20DOC/Using+Apache+HTrace";>dedicated to Apache HTrace has pretty good introduction into distributed tracing, however https://micrometer.io/docs/observation"; rel="nofollow">Micrometer Observation uses own, more generic, terminology and provides the general APIs to denote the Observation lifecycle (which somewhat is analogous to Span) and injection points to propagate the context across many distributed components. As such, the intrinsic details about HTTP headers f.e. becomes an integral part of the distributed tracer of your cho ice, out of reach for Apache CXF.Distributed Tracing in Apache CXF using Micrometer ObservationThe current integration of the https://micrometer.io/docs/observation"; rel="nofollow">Micrometer Observation's distributed tracing in http://cxf.apache.org/";>Apache CXF supports https://micrometer.io/docs/observation"; rel="nofollow">Micrometer Observation 1.10.x / https://micrometer.io/docs/tracing"; rel="nofollow">Micrometer Tracing 1.10.x and provides full-fledged support of JAX-RS 2.x / JAX-WS applications. From high-level prospective, the JAX-RS integration consists of three main parts:TracerContext (injectable through @Context annotation)ObservationProvider (server-side JAX-RS provider) and ObservationClientProvider (client-side JAX-RS provider)ObservationFeature (server-side JAX-RS feature) to simplify the configuration and integrationSimilarly, from high-level perspective, JAX-WS integration includes:ObservationStartInterceptor / ObservationStopInterceptor / ObservationFeature http://cxf.apache.org/";>Apache CXF feature (server-side JAX-WS support)ObservationClientStartInterceptor / ObservationClientStopInterceptor / ObservationClientFeature http://cxf.apache.org/";>Apache CXF feature (client-side JAX-WS suppo rt) +Overviewhttps://micrometer.io/"; rel="nofollow">Micrometer is a metrics instrumentation library for JVM-based applications that Apache CXF https://cwiki.apache.org/confluence/display/CXF20DOC/Micrometer";>provides the support for. Starting from https://micrometer.io/"; rel="nofollow">Micrometer 1.10, https://micrometer.io/"; rel="nofollow">Micrometer provides the https://micrometer.io/docs/observation"; rel="nofollow">Observation API and a plugin mechanism that allows to add capabilities including the tracing features. Starting from 4.0.3 release, the Apache CXF fully supports integration (through cxf-integration-tracing-micrometer module) with https://micrometer.io/docs/tracing"; rel="nofollow">Micrometer Tracing distributed tracing capabilities using https://micrometer.io/docs/observation"; rel="nofollow">Micrometer Observation APIs.The section https://cwiki.apache.org/confluence/display/CXF20DOC/Using+Apache+HTrace";>dedicated to Apache HTrace has pretty good introduction into distributed tracing, however https://micrometer.io/docs/observation"; rel="nofollow">Micrometer Observation uses own, more generic, terminology and provides the general APIs to denote the Observation lifecycle (which somewhat is analogous to Span) and injection points to propagate the context across many distributed components. As such, the intrinsic details about HTTP headers
svn commit: r1084165 - in /websites/production/cxf/content: cache/docs.pageCache docs/using-micrometer-observation.html
Author: buildbot Date: Wed Sep 13 23:42:52 2023 New Revision: 1084165 Log: Production update by buildbot for cxf Modified: websites/production/cxf/content/cache/docs.pageCache websites/production/cxf/content/docs/using-micrometer-observation.html Modified: websites/production/cxf/content/cache/docs.pageCache == Binary files - no diff available. Modified: websites/production/cxf/content/docs/using-micrometer-observation.html == --- websites/production/cxf/content/docs/using-micrometer-observation.html (original) +++ websites/production/cxf/content/docs/using-micrometer-observation.html Wed Sep 13 23:42:52 2023 @@ -98,7 +98,7 @@ Apache CXF -- Using Micrometer Observati -Overviewhttps://micrometer.io/"; rel="nofollow">Micrometer is a metrics instrumentation library for JVM-based applications that Apache CXF https://cwiki.apache.org/confluence/display/CXF20DOC/Micrometer";>provides the support for. Starting from https://micrometer.io/"; rel="nofollow">Micrometer 1.10, https://micrometer.io/"; rel="nofollow">Micrometer provides the https://micrometer.io/docs/observation"; rel="nofollow">Observation API and a plugin mechanism that allows to add capabilities including the tracing features. Starting from 4.0.3 release, the Apache CXF fully supports integration (through cxf-integration-tracing-micrometer module) with https://micrometer.io/docs/tracing"; rel="nofollow">Micrometer Tracing distributed tracing capabilities.The section https://cwiki.apache.org/confluence/display/CXF20DOC/Using+Apache+HTrace";>dedicated to Apache HTrace has pretty good introduction into distributed tracing, however https://micrometer.io/docs/tracing"; rel="nofollow">Micrometer Tracing uses own terminology and provides the general APIs to denote the Observation lifecycle and injection points to propagate the context across many distributed components. As such, the intrinsic details about HTTP headers f.e. becomes an integral part of the distributed tracer of your choice, out of reach for Apache CXF.Distributed Tracing in Apache CXF using Micrometer ObservationTBD +Overviewhttps://micrometer.io/"; rel="nofollow">Micrometer is a metrics instrumentation library for JVM-based applications that Apache CXF https://cwiki.apache.org/confluence/display/CXF20DOC/Micrometer";>provides the support for. Starting from https://micrometer.io/"; rel="nofollow">Micrometer 1.10, https://micrometer.io/"; rel="nofollow">Micrometer provides the https://micrometer.io/docs/observation"; rel="nofollow">Observation API and a plugin mechanism that allows to add capabilities including the tracing features. Starting from 4.0.3 release, the Apache CXF fully supports integration (through cxf-integration-tracing-micrometer module) with https://micrometer.io/docs/tracing"; rel="nofollow">Micrometer Tracing distributed tracing capabilities using https://micrometer.io/docs/observation"; rel="nofollow">Micrometer Observation APIs.The section https://cwiki.apache.org/confluence/display/CXF20DOC/Using+Apache+HTrace";>dedicated to Apache HTrace has pretty good introduction into distributed tracing, however https://micrometer.io/docs/observation"; rel="nofollow">Micrometer Observation uses own, more generic, terminology and provides the general APIs to denote the Observation lifecycle (which somewhat is analogous to Span) and injection points to propagate the context across many distributed components. As such, the intrinsic details about HTTP headers f.e. becomes an integral part of the distributed tracer of your cho ice, out of reach for Apache CXF.Distributed Tracing in Apache CXF using Micrometer ObservationThe current integration of the https://micrometer.io/docs/observation"; rel="nofollow">Micrometer Observation's distributed tracing in http://cxf.apache.org/";>Apache CXF supports https://micrometer.io/docs/observation"; rel="nofollow">Micrometer Observation 1.10.x / https://micrometer.io/docs/tracing"; rel="nofollow">Micrometer Tracing 1.10.x and provides full-fledged support of JAX-RS 2.x / JAX-WS applications. From high-level prospective, the JAX-RS integration consists of three main parts:TracerContext (injectable through @Context annotation)ObservationProvider (server-side JAX-RS provider) and ObservationClientProvider (client-side JAX-RS provider)ObservationFeature (server-side JAX-RS feature) to simplify the configuration and integrationSimilarly, from high-level perspective, JAX-WS integration includes:ObservationStartInterceptor / ObservationStopInterceptor / ObservationFeature http://cxf.apache.org/";>Apache CXF feature (server-side JAX-WS support)ObservationClientStartInterceptor / ObservationClientStopInterceptor / ObservationClientFeature http://cxf.apache.org/";>Apache CXF feature (client-side JAX
svn commit: r1084164 - in /websites/production/cxf/content: cache/docs.pageCache docs/using-micrometer-observation.html
Author: buildbot Date: Wed Sep 13 22:42:50 2023 New Revision: 1084164 Log: Production update by buildbot for cxf Modified: websites/production/cxf/content/cache/docs.pageCache websites/production/cxf/content/docs/using-micrometer-observation.html Modified: websites/production/cxf/content/cache/docs.pageCache == Binary files - no diff available. Modified: websites/production/cxf/content/docs/using-micrometer-observation.html == --- websites/production/cxf/content/docs/using-micrometer-observation.html (original) +++ websites/production/cxf/content/docs/using-micrometer-observation.html Wed Sep 13 22:42:50 2023 @@ -98,7 +98,7 @@ Apache CXF -- Using Micrometer Observati -OverviewTBDDistributed Tracing in Apache CXF using Micrometer ObservationTBD +Overviewhttps://micrometer.io/"; rel="nofollow">Micrometer is a metrics instrumentation library for JVM-based applications that Apache CXF https://cwiki.apache.org/confluence/display/CXF20DOC/Micrometer";>provides the support for. Starting from https://micrometer.io/"; rel="nofollow">Micrometer 1.10, https://micrometer.io/"; rel="nofollow">Micrometer provides the https://micrometer.io/docs/observation"; rel="nofollow">Observation API and a plugin mechanism that allows to add capabilities including the tracing features. Starting from 4.0.3 release, the Apache CXF fully supports integration (through cxf-integration-tracing-micrometer module) with https://micrometer.io/docs/tracing"; rel="nofollow">Micrometer Tracing distributed tracing capabilities.The section https://cwiki.apache.org/confluence/display/CXF20DOC/Using+Apache+HTrace";>dedicated to Apache HTrace has pretty good introduction into distributed tracing, however https://micrometer.io/docs/tracing"; rel="nofollow">Micrometer Tracing uses own terminology and provides the general APIs to denote the Observation lifecycle and injection points to propagate the context across many distributed components. As such, the intrinsic details about HTTP headers f.e. becomes an integral part of the distributed tracer of your choice, out of reach for Apache CXF.Distributed Tracing in Apache CXF using Micrometer ObservationTBD
[cxf] annotated tag cxf-4.0.3 created (now 48b2939b15)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to annotated tag cxf-4.0.3 in repository https://gitbox.apache.org/repos/asf/cxf.git at 48b2939b15 (tag) tagging 4adb1dc8bbd08f0910c5daef628182fea436523d (commit) replaces cxf-4.0.2 by Daniel Kulp on Wed Sep 13 13:16:01 2023 -0400 - Log - [maven-release-plugin] copy for tag cxf-4.0.3 --- No new revisions were added by this update.
[cxf] 01/02: Fix pom for release
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 59631a11f4df7fe556bc12442516b7608567e198
Author: Daniel Kulp
AuthorDate: Wed Sep 13 13:10:37 2023 -0400
Fix pom for release
---
.../release/samples/jax_rs/tracing_opentelemetry/pom.xml | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
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 f1eca202e1..126db79c37 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
@@ -83,33 +83,33 @@
org.apache.cxf
cxf-rt-transports-http
-${cxf.version}
+4.0.3-SNAPSHOT
org.apache.cxf
cxf-rt-transports-http-jetty
-${cxf.version}
+4.0.3-SNAPSHOT
org.apache.cxf
cxf-rt-frontend-jaxrs
-${cxf.version}
+4.0.3-SNAPSHOT
org.apache.cxf
cxf-rt-rs-client
-${cxf.version}
-
+4.0.3-SNAPSHOT
+
org.apache.cxf
cxf-integration-tracing-opentelemetry
-${cxf.version}
+4.0.3-SNAPSHOT
org.apache.cxf
cxf-rt-rs-extension-providers
-${cxf.version}
+4.0.3-SNAPSHOT
jakarta.json
[cxf] branch main updated (251b21b314 -> 4adb1dc8bb)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from 251b21b314 Switch from wiremock to wiremock-standalone to eliminate dependency issues new 59631a11f4 Fix pom for release new 4adb1dc8bb [maven-release-plugin] prepare release cxf-4.0.3 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: bom/pom.xml | 2 +- core/pom.xml | 2 +- distribution/javadoc/pom.xml | 2 +- distribution/manifest/pom.xml| 2 +- distribution/pom.xml | 2 +- distribution/src/main/release/samples/aegis/pom.xml | 10 +- .../src/main/release/samples/aegis_standalone/pom.xml| 4 ++-- distribution/src/main/release/samples/callback/pom.xml | 8 .../release/samples/configuration_interceptor/pom.xml| 8 distribution/src/main/release/samples/corba/bank/pom.xml | 2 +- .../release/samples/corba/bank_ws_addressing/pom.xml | 2 +- .../src/main/release/samples/corba/hello_world/pom.xml | 8 .../main/release/samples/groovy_spring_support/pom.xml | 2 +- .../src/main/release/samples/in_jvm_transport/pom.xml| 10 +- .../src/main/release/samples/java_first_jaxws/pom.xml| 2 +- .../samples/java_first_jaxws_factory_bean/pom.xml| 8 .../src/main/release/samples/java_first_jms/pom.xml | 6 +++--- .../src/main/release/samples/java_first_pojo/pom.xml | 8 .../release/samples/java_first_spring_support/pom.xml| 2 +- .../src/main/release/samples/jax_rs/basic/pom.xml| 8 .../release/samples/jax_rs/basic_http2_jetty/pom.xml | 2 +- .../release/samples/jax_rs/basic_http2_netty/pom.xml | 2 +- .../release/samples/jax_rs/basic_http2_undertow/pom.xml | 2 +- .../src/main/release/samples/jax_rs/basic_https/pom.xml | 2 +- .../src/main/release/samples/jax_rs/basic_oidc/pom.xml | 2 +- .../src/main/release/samples/jax_rs/big_query/pom.xml| 2 +- .../release/samples/jax_rs/content_negotiation/pom.xml | 10 +- .../description_openapi_microprofile_spring/pom.xml | 2 +- .../samples/jax_rs/description_openapi_v3/pom.xml| 2 +- .../samples/jax_rs/description_openapi_v3_spring/pom.xml | 2 +- .../samples/jax_rs/description_openapi_v3_web/pom.xml| 2 +- .../main/release/samples/jax_rs/graalvm_basic/pom.xml| 2 +- .../src/main/release/samples/jax_rs/odata/pom.xml| 2 +- .../src/main/release/samples/jax_rs/search/pom.xml | 14 +++--- .../src/main/release/samples/jax_rs/spring_boot/pom.xml | 2 +- .../samples/jax_rs/spring_boot_scan/application/pom.xml | 2 +- .../samples/jax_rs/spring_boot_scan/client/pom.xml | 2 +- .../jax_rs/spring_boot_scan/eureka-registry/pom.xml | 2 +- .../main/release/samples/jax_rs/spring_security/pom.xml | 8 .../src/main/release/samples/jax_rs/sse_cdi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_client/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_spring/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_tomcat/pom.xml | 2 +- .../main/release/samples/jax_rs/tracing_brave/pom.xml| 4 ++-- .../release/samples/jax_rs/tracing_opentelemetry/pom.xml | 16 .../samples/jax_rs/tracing_opentelemetry_camel/pom.xml | 2 +- .../release/samples/jax_rs/tracing_opentracing/pom.xml | 14 +++--- .../src/main/release/samples/jax_rs/websocket/pom.xml| 10 +- .../main/release/samples/jax_rs/websocket_web/pom.xml| 2 +- .../main/release/samples/jax_server_aegis_client/pom.xml | 10 +- .../src/main/release/samples/jaxws_async/pom.xml | 10 +- .../main/release/samples/jaxws_dispatch_provider/pom.xml | 8 .../src/main/release/samples/jaxws_graalvm/pom.xml | 2 +- .../release/samples/jaxws_graalvm_dynamic/client/pom.xml | 2 +- .../release/samples/jaxws_graalvm_dynamic/server/pom.xml | 2 +- .../src/main/release/samples/jaxws_handlers/pom.xml | 8 .../src/main/release/samples/jaxws_spring_boot/pom.xml | 2 +- distribution/src/main/release/samples/jms_pubsub/pom.xml | 4 ++-- distribution/src/main/release/samples/jms_queue/pom.xml | 6 +++--- .../src/main/release/samples/jms_spec_demo/pom.xml | 6 +++--- .../src/main/release/samples/jms_spring_config/pom.xml | 2 +- .../release/samples/js_browser_client_java_first/pom.xml | 10 +- .../release/samples/js_browser_client_simple/pom.xml | 10 +- distribution/src/main/release/samples/js_c
[cxf] annotated tag cxf-3.6.2 created (now db85c64878)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to annotated tag cxf-3.6.2 in repository https://gitbox.apache.org/repos/asf/cxf.git at db85c64878 (tag) tagging 752fbd67181d7ae2bf68a632857e5c2f7c6dec6f (commit) replaces cxf-3.6.1 by Daniel Kulp on Wed Sep 13 12:37:28 2023 -0400 - Log - [maven-release-plugin] copy for tag cxf-3.6.2 --- No new revisions were added by this update.
[cxf] 01/02: Fix pom for release
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 28b52b5f07282ebedf4fb7900640a97b8ed39b3c
Author: Daniel Kulp
AuthorDate: Wed Sep 13 12:30:32 2023 -0400
Fix pom for release
---
.../release/samples/jax_rs/tracing_opentelemetry/pom.xml | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
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 24f69f478d..9fd6cf1f55 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
@@ -83,33 +83,33 @@
org.apache.cxf
cxf-rt-transports-http
-${cxf.version}
+3.6.2-SNAPSHOT
org.apache.cxf
cxf-rt-transports-http-jetty
-${cxf.version}
+3.6.2-SNAPSHOT
org.apache.cxf
cxf-rt-frontend-jaxrs
-${cxf.version}
+3.6.2-SNAPSHOT
org.apache.cxf
cxf-rt-rs-client
-${cxf.version}
-
+3.6.2-SNAPSHOT
+
org.apache.cxf
cxf-integration-tracing-opentelemetry
-${cxf.version}
+3.6.2-SNAPSHOT
org.apache.cxf
cxf-rt-rs-extension-providers
-${cxf.version}
+3.6.2-SNAPSHOT
jakarta.json
[cxf] branch 3.6.x-fixes updated (212a18113a -> 752fbd6718)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 212a18113a Recording .gitmergeinfo Changes new 28b52b5f07 Fix pom for release new 752fbd6718 [maven-release-plugin] prepare release cxf-3.6.2 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: bom/pom.xml | 2 +- core/pom.xml | 2 +- distribution/javadoc/pom.xml | 2 +- distribution/manifest/pom.xml| 2 +- distribution/pom.xml | 2 +- distribution/src/main/release/samples/aegis/pom.xml | 10 +- .../src/main/release/samples/aegis_standalone/pom.xml| 4 ++-- distribution/src/main/release/samples/callback/pom.xml | 8 .../samples/clustering/failover_jaxws_osgi/pom.xml | 8 .../release/samples/clustering/failover_server/pom.xml | 10 +- .../release/samples/configuration_interceptor/pom.xml| 8 distribution/src/main/release/samples/corba/bank/pom.xml | 2 +- .../release/samples/corba/bank_ws_addressing/pom.xml | 2 +- .../src/main/release/samples/corba/hello_world/pom.xml | 8 .../main/release/samples/groovy_spring_support/pom.xml | 2 +- .../src/main/release/samples/in_jvm_transport/pom.xml| 10 +- .../src/main/release/samples/java_first_jaxws/pom.xml| 2 +- .../samples/java_first_jaxws_factory_bean/pom.xml| 8 .../src/main/release/samples/java_first_jms/pom.xml | 6 +++--- .../src/main/release/samples/java_first_pojo/pom.xml | 8 .../release/samples/java_first_spring_support/pom.xml| 2 +- .../src/main/release/samples/jax_rs/basic/pom.xml| 8 .../release/samples/jax_rs/basic_http2_jetty/pom.xml | 2 +- .../release/samples/jax_rs/basic_http2_netty/pom.xml | 2 +- .../release/samples/jax_rs/basic_http2_undertow/pom.xml | 2 +- .../src/main/release/samples/jax_rs/basic_https/pom.xml | 2 +- .../src/main/release/samples/jax_rs/basic_oidc/pom.xml | 2 +- .../src/main/release/samples/jax_rs/big_query/pom.xml| 2 +- .../release/samples/jax_rs/content_negotiation/pom.xml | 10 +- .../description_openapi_microprofile_spring/pom.xml | 2 +- .../samples/jax_rs/description_openapi_v3/pom.xml| 2 +- .../samples/jax_rs/description_openapi_v3_osgi/pom.xml | 2 +- .../samples/jax_rs/description_openapi_v3_spring/pom.xml | 2 +- .../samples/jax_rs/description_openapi_v3_web/pom.xml| 2 +- .../release/samples/jax_rs/description_swagger2/pom.xml | 8 .../samples/jax_rs/description_swagger2_osgi/pom.xml | 8 .../samples/jax_rs/description_swagger2_spring/pom.xml | 10 +- .../samples/jax_rs/description_swagger2_web/pom.xml | 2 +- .../main/release/samples/jax_rs/graalvm_basic/pom.xml| 2 +- .../src/main/release/samples/jax_rs/minimal_osgi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/odata/pom.xml| 2 +- .../src/main/release/samples/jax_rs/search/pom.xml | 14 +++--- .../src/main/release/samples/jax_rs/spring_boot/pom.xml | 2 +- .../samples/jax_rs/spring_boot_scan/application/pom.xml | 2 +- .../samples/jax_rs/spring_boot_scan/client/pom.xml | 2 +- .../jax_rs/spring_boot_scan/eureka-registry/pom.xml | 2 +- .../main/release/samples/jax_rs/spring_security/pom.xml | 8 .../src/main/release/samples/jax_rs/sse_cdi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_client/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_osgi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_spring/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_tomcat/pom.xml | 2 +- .../main/release/samples/jax_rs/tracing_brave/pom.xml| 4 ++-- .../release/samples/jax_rs/tracing_brave_osgi/pom.xml| 2 +- .../release/samples/jax_rs/tracing_opentelemetry/pom.xml | 16 .../samples/jax_rs/tracing_opentelemetry_osgi/pom.xml| 2 +- .../release/samples/jax_rs/tracing_opentracing/pom.xml | 14 +++--- .../samples/jax_rs/tracing_opentracing_camel/pom.xml | 2 +- .../samples/jax_rs/tracing_opentracing_osgi/pom.xml | 4 ++-- .../src/main/release/samples/jax_rs/websocket/pom.xml| 10 +- .../main/release/samples/jax_rs/websocket_osgi/pom.xml | 2 +- .../main/release/samples/jax_rs/websocket_web/pom.xml| 2 +- .../main/release/samples/jax_server_aegis_client/pom.xml | 10 +- .../src/main/release/samples/jaxws_async/pom.xml | 10 +- .../main/releas
[cxf] branch main updated: Switch from wiremock to wiremock-standalone to eliminate dependency issues
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 251b21b314 Switch from wiremock to wiremock-standalone to eliminate
dependency issues
251b21b314 is described below
commit 251b21b314f14e1a2b5cc38a15d26baa19993033
Author: Andriy Redko
AuthorDate: Wed Sep 13 11:24:01 2023 -0400
Switch from wiremock to wiremock-standalone to eliminate dependency issues
---
systests/jaxrs/pom.xml | 8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index 59074a5fc2..d3d0a65710 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -524,15 +524,9 @@
org.wiremock
-wiremock
+wiremock-standalone
${cxf.wiremock.version}
test
-
-
-ch.qos.logback
-logback-classic
-
-
jakarta.json.bind
[cxf] branch 3.5.x-fixes updated (b234adecce -> 4b3f0ec20c)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from b234adecce Recording .gitmergeinfo Changes new 523e3cc81b Fix pom for release new 4b3f0ec20c [maven-release-plugin] prepare release cxf-3.5.7 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: bom/pom.xml | 2 +- core/pom.xml | 2 +- distribution/javadoc/pom.xml | 2 +- distribution/manifest/pom.xml| 2 +- distribution/pom.xml | 2 +- distribution/src/main/release/samples/aegis/pom.xml | 10 +- .../src/main/release/samples/aegis_standalone/pom.xml| 4 ++-- distribution/src/main/release/samples/callback/pom.xml | 8 .../samples/clustering/failover_jaxws_osgi/pom.xml | 8 .../release/samples/clustering/failover_server/pom.xml | 10 +- .../release/samples/configuration_interceptor/pom.xml| 8 distribution/src/main/release/samples/corba/bank/pom.xml | 2 +- .../release/samples/corba/bank_ws_addressing/pom.xml | 2 +- .../src/main/release/samples/corba/hello_world/pom.xml | 8 .../main/release/samples/groovy_spring_support/pom.xml | 2 +- .../src/main/release/samples/in_jvm_transport/pom.xml| 10 +- .../src/main/release/samples/java_first_jaxws/pom.xml| 2 +- .../samples/java_first_jaxws_factory_bean/pom.xml| 8 .../src/main/release/samples/java_first_jms/pom.xml | 6 +++--- .../src/main/release/samples/java_first_pojo/pom.xml | 8 .../release/samples/java_first_spring_support/pom.xml| 2 +- .../src/main/release/samples/jax_rs/basic/pom.xml| 8 .../release/samples/jax_rs/basic_http2_jetty/pom.xml | 2 +- .../release/samples/jax_rs/basic_http2_netty/pom.xml | 2 +- .../release/samples/jax_rs/basic_http2_undertow/pom.xml | 2 +- .../src/main/release/samples/jax_rs/basic_https/pom.xml | 2 +- .../src/main/release/samples/jax_rs/basic_oidc/pom.xml | 2 +- .../src/main/release/samples/jax_rs/big_query/pom.xml| 2 +- .../release/samples/jax_rs/content_negotiation/pom.xml | 10 +- .../description_openapi_microprofile_spring/pom.xml | 2 +- .../samples/jax_rs/description_openapi_v3/pom.xml| 2 +- .../samples/jax_rs/description_openapi_v3_osgi/pom.xml | 2 +- .../samples/jax_rs/description_openapi_v3_spring/pom.xml | 2 +- .../samples/jax_rs/description_openapi_v3_web/pom.xml| 2 +- .../release/samples/jax_rs/description_swagger2/pom.xml | 8 .../samples/jax_rs/description_swagger2_osgi/pom.xml | 8 .../samples/jax_rs/description_swagger2_spring/pom.xml | 10 +- .../samples/jax_rs/description_swagger2_web/pom.xml | 2 +- .../main/release/samples/jax_rs/graalvm_basic/pom.xml| 2 +- .../src/main/release/samples/jax_rs/minimal_osgi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/odata/pom.xml| 2 +- .../src/main/release/samples/jax_rs/search/pom.xml | 14 +++--- .../src/main/release/samples/jax_rs/spring_boot/pom.xml | 2 +- .../samples/jax_rs/spring_boot_scan/application/pom.xml | 2 +- .../samples/jax_rs/spring_boot_scan/client/pom.xml | 2 +- .../jax_rs/spring_boot_scan/eureka-registry/pom.xml | 2 +- .../main/release/samples/jax_rs/spring_security/pom.xml | 8 .../src/main/release/samples/jax_rs/sse_cdi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_client/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_osgi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_spring/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_tomcat/pom.xml | 2 +- .../main/release/samples/jax_rs/tracing_brave/pom.xml| 4 ++-- .../release/samples/jax_rs/tracing_brave_osgi/pom.xml| 2 +- .../release/samples/jax_rs/tracing_opentelemetry/pom.xml | 14 +++--- .../samples/jax_rs/tracing_opentelemetry_osgi/pom.xml| 2 +- .../release/samples/jax_rs/tracing_opentracing/pom.xml | 14 +++--- .../samples/jax_rs/tracing_opentracing_camel/pom.xml | 2 +- .../samples/jax_rs/tracing_opentracing_osgi/pom.xml | 4 ++-- .../src/main/release/samples/jax_rs/websocket/pom.xml| 10 +- .../main/release/samples/jax_rs/websocket_osgi/pom.xml | 2 +- .../main/release/samples/jax_rs/websocket_web/pom.xml| 2 +- .../main/release/samples/jax_server_aegis_client/pom.xml | 10 +- .../src/main/release/samples/jaxws_async/pom.xml | 10 +- .../main/release/
[cxf] annotated tag cxf-3.5.7 created (now aa6e941b25)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to annotated tag cxf-3.5.7 in repository https://gitbox.apache.org/repos/asf/cxf.git at aa6e941b25 (tag) tagging 4b3f0ec20cc77ff8b3c04fee44f1cb8ca525f331 (commit) replaces cxf-3.5.6 by Daniel Kulp on Wed Sep 13 10:00:42 2023 -0400 - Log - [maven-release-plugin] copy for tag cxf-3.5.7 --- No new revisions were added by this update.
[cxf] 01/02: Fix pom for release
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 523e3cc81bd14ba07716150da1d7c29ad26b8b01
Author: Daniel Kulp
AuthorDate: Wed Sep 13 09:46:59 2023 -0400
Fix pom for release
---
.../release/samples/jax_rs/tracing_opentelemetry/pom.xml | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
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 f4002209b5..46ddf77372 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
@@ -83,33 +83,33 @@
org.apache.cxf
cxf-rt-transports-http
-${cxf.version}
+3.5.7-SNAPSHOT
org.apache.cxf
cxf-rt-transports-http-jetty
-${cxf.version}
+3.5.7-SNAPSHOT
org.apache.cxf
cxf-rt-frontend-jaxrs
-${cxf.version}
+3.5.7-SNAPSHOT
org.apache.cxf
cxf-rt-rs-client
-${cxf.version}
+3.5.7-SNAPSHOT
org.apache.cxf
cxf-integration-tracing-opentelemetry
-${cxf.version}
+3.5.7-SNAPSHOT
org.apache.cxf
cxf-rt-rs-extension-providers
-${cxf.version}
+3.5.7-SNAPSHOT
jakarta.json
[cxf] branch 3.6.x-fixes updated (bd6b02a5e8 -> 212a18113a)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from bd6b02a5e8 Recording .gitmergeinfo Changes new 0203ba6ede Replace hoverfly with wiremock new bfaafa62bb Update Project Reactor to 3.5.10 new 212a18113a Recording .gitmergeinfo Changes The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitmergeinfo | 1 + parent/pom.xml | 3 +- systests/jaxrs/pom.xml | 6 +-- .../jaxrs/metrics/JAXRSClientMetricsTest.java | 59 ++ 4 files changed, 32 insertions(+), 37 deletions(-)
[cxf] 02/03: Update Project Reactor to 3.5.10
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit bfaafa62bbb9d6cfaa97c1164055b3aec3c4a5d2 Author: Andriy Redko AuthorDate: Wed Sep 13 08:45:29 2023 -0400 Update Project Reactor to 3.5.10 (cherry picked from commit b2af6143b4d0c185f45cf58c1f84e1c40c04f6fb) --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9ff64f2b33..0ca0ddf9cd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -191,7 +191,7 @@ 4.8.0 3.5.1 1.0.4 -3.5.9 +3.5.10 1.7.14 1.3.8 2.2.21
[cxf] 01/03: Replace hoverfly with wiremock
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0203ba6ede0b5aa3785c950598a25feccd62df6f
Author: Andriy Redko
AuthorDate: Wed Sep 13 08:39:48 2023 -0400
Replace hoverfly with wiremock
(cherry picked from commit 876c1bafe90bb361e5d3c7c7a469ae7d1fb74ec7)
# Conflicts:
# parent/pom.xml
#
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/metrics/JAXRSClientMetricsTest.java
---
parent/pom.xml | 1 -
systests/jaxrs/pom.xml | 6 +--
.../jaxrs/metrics/JAXRSClientMetricsTest.java | 59 ++
3 files changed, 30 insertions(+), 36 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 94f5348a53..9ff64f2b33 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -106,7 +106,6 @@
3.10.8
3.0.3
3.0.2
-0.15.0
1.0.1
1.1.1
1.4
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index a8a4eacf96..2f2307210d 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -527,9 +527,9 @@
test
-io.specto
-hoverfly-java
-${cxf.hoverfly.version}
+com.github.tomakehurst
+wiremock-jre8-standalone
+${cxf.wiremock.version}
test
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/metrics/JAXRSClientMetricsTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/metrics/JAXRSClientMetricsTest.java
index 1417727631..b5fe7ba835 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/metrics/JAXRSClientMetricsTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/metrics/JAXRSClientMetricsTest.java
@@ -28,6 +28,7 @@ import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.core.MediaType;
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
@@ -39,11 +40,7 @@ import org.apache.cxf.metrics.MetricsProvider;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.springframework.util.SocketUtils;
-import io.specto.hoverfly.junit.core.SimulationSource;
-import io.specto.hoverfly.junit.rule.HoverflyRule;
-
import org.junit.Before;
-import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -51,16 +48,19 @@ import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
-import static io.specto.hoverfly.junit.core.HoverflyConfig.localConfigs;
-import static io.specto.hoverfly.junit.dsl.HoverflyDsl.response;
-import static io.specto.hoverfly.junit.dsl.HoverflyDsl.service;
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static
com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.times;
@RunWith(MockitoJUnitRunner.class)
public class JAXRSClientMetricsTest {
-@ClassRule public static HoverflyRule hoverflyRule =
HoverflyRule.inSimulationMode(localConfigs().asWebServer());
+@Rule public WireMockRule wireMockRule = new
WireMockRule(wireMockConfig().dynamicPort());
@Rule public ExpectedException expectedException =
ExpectedException.none();
private MetricsProvider provider;
@@ -95,14 +95,13 @@ public class JAXRSClientMetricsTest {
public void usingClientProxyStopIsCalledWhenServerReturnsNotFound() throws
Exception {
final JAXRSClientFactoryBean factory = new JAXRSClientFactoryBean();
factory.setResourceClass(Library.class);
-factory.setAddress("http://localhost:"; + hoverflyRule.getProxyPort() +
"/");
+factory.setAddress("http://localhost:"; + wireMockRule.port() + "/");
factory.setFeatures(Arrays.asList(new MetricsFeature(provider)));
factory.setProvider(JacksonJsonProvider.class);
-hoverflyRule.simulate(SimulationSource.dsl(
-service("localhost")
-.get("/books/10")
-.willReturn(response().status(404;
+stubFor(get(urlEqualTo("/books/10"))
+.willReturn(aResponse()
+.withStatus(404)));
try {
final Library
[cxf] 03/03: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 212a18113a73e3c8dce1511e0e4664143cd5f36b Author: Andriy Redko AuthorDate: Wed Sep 13 09:33:58 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 162e6c77f1..8b0363555b 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -452,6 +452,7 @@ M 8394701f3327adaac409d950a1756eca9fc7a0c8 M 84e897dfbda3bff1d6be3c3b44ef36c039cb8c92 M 8502ca81b4b7711e803ed124173581b5050ae4cc M 85d952cfdd706a1a91ff2a82fbbe9e52da88595a +M 876c1bafe90bb361e5d3c7c7a469ae7d1fb74ec7 M 88e8ec843c77ce0d556b850a8751308b9b746419 M 890195ced00f76d0be680def9c6f08d85d63cbcd M 89785db77ee8150570fbfc1279eba6cee07e777c
[cxf] branch 3.5.x-fixes updated: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/3.5.x-fixes by this push: new b234adecce Recording .gitmergeinfo Changes b234adecce is described below commit b234adeccec608bfb4693d42637a54b0ac077af7 Author: Daniel Kulp AuthorDate: Wed Sep 13 09:11:30 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 4 1 file changed, 4 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 45df5769d3..10bfdf30d2 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -101,6 +101,7 @@ B 493e3b1a9ba7f31ddcf8ccb2cfd82604a988b5cc B 4a7a8b57e712dd05e187cf4de6fd58b9b1236847 B 4b63dbb428488f3a6d0b7114632404b31458a521 B 4cf375c5436f3e806293a73a5bb6a8510f7ac961 +B 4dbfe49da75fe4b036b095ad0bbf92e195f07fcf B 4dd1a221c07430e83a5087206c964a2dc205d3d0 B 4e49ccab53e40384a5bc3cd966b7a8f2636dcbb3 B 4e9cc3b98770fc42065104441e85cc4785626616 @@ -181,6 +182,7 @@ B 86c4b4960df71674490b3bc84fb3ffd72ba5bea5 B 86fb83b21a14bce8cb61fa10e776078162b9d842 B 8782609de7640644614573b0aa728cd229a67a75 B 88e18536962917e2913f25981ded2c9c46558c6a +B 894725bd8bc96397cf6aebda284f70813e03ed96 B 899cd7b1dd6d1cb7a802edcab9d8595a2082d7b8 B 8aad9a1fed5b7f924270c9054cfe50255a17595e B 8ac5ce609c88585fbf4d96907c0a8d947153b27b @@ -206,6 +208,7 @@ B 9741a874147130334dea5ff6d8fa788eb11e822d B 9a6a39f27c261f8bf00d94dd20db922c5675c6a5 B 9b7ce5889159569bcce447da2ed303ed26fc752a B 9bedf1086b69068942ebaf7fb973961912ef275f +B 9c8ae75223a83c618a68adc504d4484d050b68f2 B 9d3cbdb8b30745e1820c7d8a6f904d7b6ca7f08a B 9df8b7373946cc71a7b75ca5c42b4a54103fcc2a B 9dfd633b251479e76ab4a912ae24bb90263e2328 @@ -257,6 +260,7 @@ B ba839e6b1f3ee5c26fd600834ea10227dd4cc317 B baa236c1b3cea938aecb29c5d4aaa704e08c79f9 B bb201d414c49b727865e004db0a6f28d125ad879 B bd27b0d19f960ebbaa98d08e0e4f352ac8c67de4 +B bd6b02a5e8a32ed6109f1a076693adf9b2098c73 B bdcbca177e6daaca70ececf722966a5db5de463d B be8074c6a9186f81e2d6ac6304ac68a4c5c655a4 B bf3c8a94434247be91967465347080191b1165ee
[cxf] branch 3.6.x-fixes updated (4dbfe49da7 -> bd6b02a5e8)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 4dbfe49da7 Update version of ActiveMQ used for testing new 9c8ae75223 Bump io.specto:hoverfly-java from 0.14.4 to 0.15.0 new bd6b02a5e8 Recording .gitmergeinfo Changes The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitmergeinfo | 3 +++ parent/pom.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
[cxf] 02/02: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit bd6b02a5e8a32ed6109f1a076693adf9b2098c73 Author: Daniel Kulp AuthorDate: Wed Sep 13 08:19:46 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 0ac243ad93..162e6c77f1 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -40,6 +40,7 @@ B 3a25cab6172083d26f2cc5f29a134c11214d5131 B 3a9583d5edf20a16dd2fa739a9fb8fbce8168a23 B 3b700961ead8a1c23ef945275bfe4defe22ea81d B 3bb3b0dbe55e2d29b489ea983f6f15fd140bd010 +B 3ca892e21d2c2a778099ac77c262fff9cd34e266 B 3d5564dbff38b782837e291871cd210351acbfc2 B 400ed2294f316c46f5bce5190314e6ab1f504ba8 B 419e1849157cfe0146227dfc3e8da7c693c71045 @@ -332,6 +333,7 @@ M 470e03a82c05c5f353dde861c2b5442acad4f9ad M 474317828798de64b29483f212a43ec03ecf1d39 M 48595425eb69a8db662233991a409fb4e2b38149 M 48a2c301cdb8cc4ffce0480e670b694cca3e6249 +M 49aed0282e3bb6e54a966a342f5ec4f12976c553 M 49b9b597344089ec143129b441eed62e959c81f8 M 4b96bea6a3a2241ce891196fd6eacb34dce0e91d M 4bb4154125648a04d88cb7999f4d054a00e5c79b @@ -677,6 +679,7 @@ M f05bdcfeafebdbe93c6d189514e084ae1d40cac0 M f125c9675817f159fbfc565c0cc0406dcfd2216d M f2ad3c15f9ed98cdbc7cb2abdaa0afda13faae24 M f355ccc3a4bfc7d47485f1b623723e5b2cac96f5 +M f36255ff679264b71a2eda196182c1fcd866d112 M f3ff0735a7e0d8816bf0b43f5d97b54d5f034ff5 M f422bd4caf99c59083cf336f350ec666eeebad26 M f48dc57d5bb4a8848f3b4f9ef5cedcfd9d8ab1b7
[cxf] 01/02: Bump io.specto:hoverfly-java from 0.14.4 to 0.15.0
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 9c8ae75223a83c618a68adc504d4484d050b68f2 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Sep 13 02:49:20 2023 + Bump io.specto:hoverfly-java from 0.14.4 to 0.15.0 Bumps [io.specto:hoverfly-java](https://github.com/SpectoLabs/hoverfly-java) from 0.14.4 to 0.15.0. - [Commits](https://github.com/SpectoLabs/hoverfly-java/compare/0.14.4...0.15.0) --- updated-dependencies: - dependency-name: io.specto:hoverfly-java dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit 49aed0282e3bb6e54a966a342f5ec4f12976c553) --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 8b0cfba156..94f5348a53 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -106,7 +106,7 @@ 3.10.8 3.0.3 3.0.2 -0.14.4 +0.15.0 1.0.1 1.1.1 1.4
[cxf] 02/02: Update Project Reactor to 3.5.10
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git commit b2af6143b4d0c185f45cf58c1f84e1c40c04f6fb Author: Andriy Redko AuthorDate: Wed Sep 13 08:45:29 2023 -0400 Update Project Reactor to 3.5.10 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index f68665457d..903bff2a32 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -199,7 +199,7 @@ 4.8.0 3.5.1 1.0.4 -3.5.9 +3.5.10 1.7.14 1.3.8 2.2.21
[cxf] 01/02: Replace hoverfly with wiremock
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 876c1bafe90bb361e5d3c7c7a469ae7d1fb74ec7
Author: Andriy Redko
AuthorDate: Wed Sep 13 08:39:48 2023 -0400
Replace hoverfly with wiremock
---
parent/pom.xml | 1 -
systests/jaxrs/pom.xml | 6 +--
.../jaxrs/metrics/JAXRSClientMetricsTest.java | 59 ++
3 files changed, 30 insertions(+), 36 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index d6e56bd95e..f68665457d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -114,7 +114,6 @@
3.10.8
3.0.3
3.0.2
-0.15.0
2.1.1
1.1.1
1.0.15
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index 611b81ec51..59074a5fc2 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -523,9 +523,9 @@
test
-io.specto
-hoverfly-java
-${cxf.hoverfly.version}
+org.wiremock
+wiremock
+${cxf.wiremock.version}
test
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/metrics/JAXRSClientMetricsTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/metrics/JAXRSClientMetricsTest.java
index f25f5afaf9..a46b632dd5 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/metrics/JAXRSClientMetricsTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/metrics/JAXRSClientMetricsTest.java
@@ -22,6 +22,7 @@ package org.apache.cxf.systest.jaxrs.metrics;
import java.util.Arrays;
import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
import jakarta.ws.rs.NotFoundException;
import jakarta.ws.rs.ProcessingException;
@@ -38,11 +39,7 @@ import org.apache.cxf.metrics.MetricsProvider;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.testutil.common.TestUtil;
-import io.specto.hoverfly.junit.core.SimulationSource;
-import io.specto.hoverfly.junit.rule.HoverflyRule;
-
import org.junit.Before;
-import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -50,16 +47,19 @@ import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
-import static io.specto.hoverfly.junit.core.HoverflyConfig.localConfigs;
-import static io.specto.hoverfly.junit.dsl.HoverflyDsl.response;
-import static io.specto.hoverfly.junit.dsl.HoverflyDsl.service;
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static
com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.times;
@RunWith(MockitoJUnitRunner.class)
public class JAXRSClientMetricsTest {
-@ClassRule public static HoverflyRule hoverflyRule =
HoverflyRule.inSimulationMode(localConfigs().asWebServer());
+@Rule public WireMockRule wireMockRule = new
WireMockRule(wireMockConfig().dynamicPort());
@Rule public ExpectedException expectedException =
ExpectedException.none();
private MetricsProvider provider;
@@ -94,14 +94,13 @@ public class JAXRSClientMetricsTest {
public void usingClientProxyStopIsCalledWhenServerReturnsNotFound() throws
Exception {
final JAXRSClientFactoryBean factory = new JAXRSClientFactoryBean();
factory.setResourceClass(Library.class);
-factory.setAddress("http://localhost:"; + hoverflyRule.getProxyPort() +
"/");
+factory.setAddress("http://localhost:"; + wireMockRule.port() + "/");
factory.setFeatures(Arrays.asList(new MetricsFeature(provider)));
factory.setProvider(JacksonJsonProvider.class);
-hoverflyRule.simulate(SimulationSource.dsl(
-service("localhost")
-.get("/books/10")
-.willReturn(response().status(404;
+stubFor(get(urlEqualTo("/books/10"))
+.willReturn(aResponse()
+.withStatus(404)));
try {
final Library client = factory.create(Library.class);
@@ -123,15 +122,14 @@ public class JAXRSClientMetricsTest {
.register(new MetricsFeature(provider))
.register(JacksonJsonProvider.class);
-hoverflyRule.simulate(SimulationSource.dsl(
-
[cxf] branch main updated (49aed0282e -> b2af6143b4)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from 49aed0282e Bump io.specto:hoverfly-java from 0.14.4 to 0.15.0 new 876c1bafe9 Replace hoverfly with wiremock new b2af6143b4 Update Project Reactor to 3.5.10 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: parent/pom.xml | 3 +- systests/jaxrs/pom.xml | 6 +-- .../jaxrs/metrics/JAXRSClientMetricsTest.java | 59 ++ 3 files changed, 31 insertions(+), 37 deletions(-)
[cxf] branch dependabot/maven/io.specto-hoverfly-java-0.15.0 deleted (was 854fd4a7e1)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.specto-hoverfly-java-0.15.0 in repository https://gitbox.apache.org/repos/asf/cxf.git was 854fd4a7e1 Bump io.specto:hoverfly-java from 0.14.4 to 0.15.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[cxf] branch main updated: Bump io.specto:hoverfly-java from 0.14.4 to 0.15.0
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 49aed0282e Bump io.specto:hoverfly-java from 0.14.4 to 0.15.0 49aed0282e is described below commit 49aed0282e3bb6e54a966a342f5ec4f12976c553 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Sep 13 02:49:20 2023 + Bump io.specto:hoverfly-java from 0.14.4 to 0.15.0 Bumps [io.specto:hoverfly-java](https://github.com/SpectoLabs/hoverfly-java) from 0.14.4 to 0.15.0. - [Commits](https://github.com/SpectoLabs/hoverfly-java/compare/0.14.4...0.15.0) --- updated-dependencies: - dependency-name: io.specto:hoverfly-java dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 891931edf8..d6e56bd95e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -114,7 +114,7 @@ 3.10.8 3.0.3 3.0.2 -0.14.4 +0.15.0 2.1.1 1.1.1 1.0.15
[cxf] branch main updated (bf398b0adf -> 3ca892e21d)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from bf398b0adf Add some tests for attachments to both invalid ports and invalid paths add f36255ff67 Update version of xnio used add 3ca892e21d Update release notes for 4.0.3 No new revisions were added by this update. Summary of changes: distribution/src/main/release/release_notes.txt | 103 ++-- parent/pom.xml | 12 +++ rt/transports/http-undertow/pom.xml | 8 ++ systests/rs-sse/rs-sse-undertow/pom.xml | 10 +++ 4 files changed, 90 insertions(+), 43 deletions(-)
