This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git.
from 348a01f [CAMEL-13644]CxfConsumer - Should not create server in constructor new 652f74a CAMEL-13563 - Update Jetty to 9.4.18 + fix client authentication issues new a61ba9a Some fixes for the last merge 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: .../resources/org/apache/camel/util}/service.jks | Bin .../org/apache/camel/util}/truststore.jks | Bin components/camel-ahc/pom.xml | 74 ----------- .../component/ahc/AhcProducerSessionTest.java | 2 + .../apache/camel/component/ahc/BaseAhcTest.java | 31 ++--- .../camel/component/cometd/CometdComponent.java | 28 ++-- .../camel/component/jetty/JettyHttpComponent.java | 12 +- .../jetty/rest/RestHttpsClientAuthRouteTest.java | 141 +++++++++++++++++++++ .../src/test/resources/service.jks | Bin .../src/test/resources/truststore.jks | Bin .../rest/swagger/Jetty94ServerFactory.java | 2 +- .../internal/client/SalesforceHttpRequest.java | 2 +- .../salesforce/BulkApiIntegrationTest.java | 2 +- .../salesforce/RestApiIntegrationTest.java | 4 +- .../internal/SessionIntegrationTest.java | 2 +- .../component/websocket/WebsocketComponent.java | 10 +- ...=> WebsocketSSLClientAuthRouteExampleTest.java} | 38 +++--- .../WebsocketSSLContextGlobalRouteExampleTest.java | 25 ++-- .../WebsocketSSLContextInUriRouteExampleTest.java | 25 ++-- .../websocket/WebsocketSSLRouteExampleTest.java | 24 ++-- examples/camel-example-cxf/pom.xml | 1 - .../example/camel/transport/CamelDestination.xml | 2 +- parent/pom.xml | 5 +- .../camel-spring-boot-dependencies/pom.xml | 56 ++++---- 24 files changed, 274 insertions(+), 212 deletions(-) copy {components/camel-coap/src/test/resources => camel-core/src/test/resources/org/apache/camel/util}/service.jks (100%) copy {components/camel-coap/src/test/resources => camel-core/src/test/resources/org/apache/camel/util}/truststore.jks (100%) create mode 100644 components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestHttpsClientAuthRouteTest.java copy components/{camel-coap => camel-jetty9}/src/test/resources/service.jks (100%) copy components/{camel-coap => camel-jetty9}/src/test/resources/truststore.jks (100%) copy components/camel-websocket/src/test/java/org/apache/camel/component/websocket/{WebsocketSSLRouteExampleTest.java => WebsocketSSLClientAuthRouteExampleTest.java} (84%)