You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2023/10/20 09:05:07 UTC
[camel] branch CAMEL-19481/upgrade-jetty-10 updated (2f507b84722 -> 92071be3480)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch CAMEL-19481/upgrade-jetty-10
in repository https://gitbox.apache.org/repos/asf/camel.git
omit 2f507b84722 CAMEL-19481: Upgrade to Jetty 10
add 9540d1071f4 camel-jbang - Upgrade to hawtio 2.17.4
add 98911009b3b Add skipTests property to release profile
add df60d44d91c CAMEL-19486: camel-jbang - Must use #name instead of for parameter placeholder substitution
add 8cec47c0a7b Upgrade undertow 2.2.25
add 6cf4ff50896 Revert "CAMEL-19130: Upgrade to snakeyaml 2.x (#10450)" (#10474)
add 552cc4cff6c [CAMEL-19503] Upgrade to maven-resolver 1.9.13
add 6f5fd015c6d CAMEL-19499: camel-yaml-dsl: Missing rest-configuration in YAML DSL schema (#10492)
add 6c390bd0e1a Regen for commit 6f5fd015c6dd9f05d7cb891cffed20ce7560ffcd (#10499)
add a7edeaa7386 CAMEL-19489: camel-minio - Update docs
add e6e8d12737f CAMEL-19509: camel-yaml-dsl - Add support for kamelet binding with no sink
add feff82f8c47 Add possibility to override LRAClient (#10505)
add 0d51aec9266 [CAMEL-19479] Add `threadId` to simple language (#10475)
add 2ddb366db85 CAMEL-19502 Netty4-http SNI configuration using SSLContextParameters (#10516)
add d06e8c1ce9d CAMEL-19512: Add javadoc to StreamCache useage
add dd078741933 Regen for commit d06e8c1ce9dc9d4e970474a226b51e52115d06ce
add 341860d5c18 Camel-Bindy: Use isEmpty instead of comparing with empty String
add aaee62ec9c8 Camel Azure Files component 3.x (#10460)
add ff0267d405d CAMEL-19279 - Added Azure-files component to kit
add cd36ad10599 CAMEL-19279 - Added Azure-files component to kit
add 36a09a97690 CAMEL-19279 - Added Azure-files component to kit
add 609e2410418 CAMEL-19279 - Use Azure Storage Files share version from Azure SDK BOM
add 3f9b2020d9f CAMEL-19285: prevent Kafka client from entering an endless loop
add 655a8ca89c6 Remove Spring Boot component reference
add ffea0ebe5c7 Add component docs to Azure group
add 02f59e756af Regen for commit ffea0ebe5c7378b372643942ebbceeb0033e4beb
add 9d271f79e6d improve reproducible builds
add f063baed51e Regen for commit 9d271f79e6d5e2fbfac8a2ae11880424848bf901
add f7f237acce8 CAMEL-19577: Fix ugly INFO logging from maven downloader due to jbang using different id than standard maven.
add a626c9e2160 CAMEL-19577: Upgrade camel-jbang to 3.21.0 release.
add 648f78748cc CAMEL-19580: camel-catalog-maven - Add getClassLoader API
add c6aad40240c CAMEL-19279: Align with main due to some syntax fixes and CS
add ad401df1ed7 Bump for next version
add 53353a2e85e CAMEL-19279: Polished
add 699bb70a662 Regen
add fd27d882fb6 Regen for commit 699bb70a662f6a403cae944990b07c6c2f2fcf1c (#10601)
add 7c636184aa7 CAMEL-19581: Upgrade to picocli 4.7.4
add 07d66b71c03 Fix camel-jira to add assignee using the id (#10602) (#10610)
add fd2e4d45fe5 camel-jbang - Fix log http summary on reload to only output if something was changed.
add 3e393d178c0 [CAMEL-19575] Fixes bug in camel-rabbitmq - RabbitMQConsumer keeps on consuming even when route shutdown is triggered. (#10604)
add fcd862f7414 Regen for commit 3e393d178c01b35b577e6876b5f89ff52792ff95
add a80d6b519ac [CAMEL-18837] OpenSearch component (#10608)
add c9d8cbed026 Revert "[CAMEL-18837] OpenSearch component (#10608)"
add 8ab98180a1c Camel-Kubernetes: Namespace URI option is not consumer only
add 2c7d0475c62 Regen for commit 8ab98180a1c6c51059645059be0c8fc3faf0f01a
add 7f9132bdbd7 Regen for commit 2c7d0475c626288b6ff8ccf51bd41156d97ced19
add f519c9747fe Update camel releases
add 792a8948cf8 CAMEL-19601: StreamCaching can configure allow/deny list of classes to control what can be cached or not.
add 3790072c19b CAMEL-19601: StreamCaching can configure allow/deny list of classes to control what can be cached or not.
add a6c1764c1ce Regen for commit 3790072c19b4bb8af28c5f06e4902db5a8691cb5
add 76776fe8ebc Downgrade artemis
add 91c1949212f Regen for commit 76776fe8ebc5f3a3e9169ddfa04757473765b331
add 196e860be09 CAMEL-19603: camel-core - configureVault should be done general so its also done for Spring Boot and Quarkus and not only camel-main/camel-jbang.
add 2d5fe6d7ea6 CAMEL-19603: camel-core - configureVault should be done general so its also done for Spring Boot and Quarkus and not only camel-main/camel-jbang.
add bd5d46c621d Fix doc build for website
add 52fe2f6bcfa Regen for commit bd5d46c621d5d8a48307db79a96523ce0f71e534
add 5a9027f4e4b Fix broken link in docs for website
add 9569b167a0b CAMEL-19607: camel-core - Fix error handler redeliveryPolicyRef
add fb4de0466de CAMEL-19607: camel-core - Fix error handler redeliveryPolicyRef
add 8d98fc1d5ca CAMEL-19607: camel-core - Fix error handler redeliveryPolicyRef
add 985506e5ddf Regen for commit 8d98fc1d5ca22e027489af0b8c76570cea9c66b4
add 04043f52cfc CAMEL-19594: camel-jbang - Upgrade to hawtio 2.17.5
add e44a7e7d66c fix!: specify array name when fetching collections instead of inferring the array name since it's not always going to work (#10715)
add a8d04342eff Upgrade batik version to 1.16 (#9718) (#10722)
add a562db030b6 Updating californium to 2.7.4 (#10729)
add 7e68c948a29 Bugfix for californium update, as Netty 2.7.4 dependency isn't in maven central (#10734)
add ee0d39eb188 Regen for commit 7e68c948a2910cd1d63aeda1472a5c1fc44818a7 (#10738)
add b786035ebbd CAMEL-19615 chmodDirectory option try for each junk to change the directory permission and fails (#10730)
add 80ceee8b53c Updating Hazelcast to 5.2.4 (#10746)
add 3797633d61e Updating drill to 1.21.1 (#10752)
add e3d3f9c4e6c camel-jbang - Run change version should handle RC and M versions
add 6e66358cd83 Upgrade Johnzon JsonB to version 1.2.21 (#10763)
add d7c4e55f857 CAMEL-19646: camel-health - Routes controlled by superviser controller that is exhausted should report DOWN. (#10819)
add 832d842e3bc CAMEL-19279: Fix checkstyle violations (#10829)
add c6d4331317c CAMEL-19562: aws sqs visibility extender is running forever (#10828)
add 5b314ff577e Regen for commit c6d4331317c6c541f2284e776fe41f89315f626f (#10833)
add e158a82b347 CAMEL-19650: Camel Kafka doesn't honor 'workerPool' configuration (#10827)
add 9b9f7491b8d CAMEL-19660: Improve support for MapStruct mappers defined as abstract classes
add d4db2c31814 CAMEL-18234: Exception building aws2-sqs route when certificate valid… (#10837)
add 80b55726eb9 CAMEL-19663: camel-core - ToD EIP multi-value property lost problem. Thanks to EvanMi for the PR.
add e8aa74536b4 CAMEL-19662: camel-bindy - Add option to @CvsRecord to turn on|off trimming line. (#10857)
add 0dbdbd4b340 CAMEL-19491: aws2-sqs - use `ScheduledPollConsumerHealthCheck` (#10847) (#10860)
add 321032763b0 CAMEL-19654: Deprecate camel-corda component
add 678a1c58a3f CAMEL-19663: camel-core - ToD EIP multi-value property lost problem. Thanks to EvanMi for the PR.
add 757bce5bf7f Regen
add 3c2de4ee1ca Regen for commit 757bce5bf7f3aeea8da6d7a29eca5a7970b7cd35 (#10868)
add b8730e2c004 CAMEL-19491: aws2-sqs - use ScheduledPollConsumerHealthCheck
add bfd952a4084 CAMEL-19491: aws2-sqs - use ScheduledPollConsumerHealthCheck
add 06fccc01dc7 CAMEL-19491: use ScheduledPollConsumerHealthCheck
add 0f11b2e9473 Regen for commit 06fccc01dc705688d089fc03af59db81f6b9424b (#10875)
add ace7020a11d CAMEL-19664: fix multiple concurrency issues in camel-test-infra-artemis (#10854) (#10883)
add 2476d166b0b support more MLLP charsets (#10880)
add 9166e779092 CAMEL-19676: camel-core: Do not log sensitive endpoint uri, if route … (#10889)
add 80802e177d3 Regen for commit 2476d166b0b78686f549b6a6d36c48bd3f1f6f44 (#10891)
add 5a46047ed4c CAMEL-19679: camel-flatpack - Strange concurrency with DataSet iterator
add 8f0d6253763 Upgrade aws to 2.20.57
add 30730d0b8d1 Regen
add 77c8fcc0ca7 Regen for commit 8f0d6253763b1db91e0c45287c5abd5bd7fbf1ca (#10898)
add 9fb67318f7b Regen for commit 8f0d6253763b1db91e0c45287c5abd5bd7fbf1ca (#10899)
add 999a34548ea Update camel releases in camel-catalog
add 1ad44027b5a Regen for commit 999a34548eaba8ac0d17d8bdd4285f9bcfe4a047 (#10909)
add 0c736fbcc91 CAMEL-19671: camel-sql: Oracle JDBC driver issue with getting metadata. Thanks to Dmitrii Antonov for patch. (#10912)
add 88b4e7ecda6 CAMEL-19686 - Deprecate Camel-Atlasmap
add d517a89b22c CAMEL-19670: camel-core - UnitOfWork should not use stream caching in useOriginalMessage if not enabled. (#10925)
add 6f2452f4da2 Regen for commit d517a89b22cb4d8ac222856f462777479f6435b2 (#10926)
add 1812025da7d (chores) camel-core-model: fixed checkstyle
add f63145ba747 Regen for commit 6f2452f4da208abdb3b2f3b074fc555b0d39e91b (#10931)
add 4cc464ba09b Update camel releases in catalog
add 2db75789439 (chores) camel-flatpack: fixed checkstyle issue
add 6f5e1086447 Backport CAMEL-19670 (#10939)
add 5bc271e2ad3 Regen for commit 6f5e10864476f8feaca1b675a6097ca671452e7f (#10941)
add 1602a89c5a7 CAMEL-19675: fixed not copying safe copy properties
add 145af6559a0 CAMEL-19675: added test case for aggregation strategy with attachment (#10895)
add 83446a65cfb Upgrade shiro 1.12.0
add f29f3bbb73f Upgrade jackrabbit 2.21.18
add 9cf882a4d4d CAMEL-19675: ensure the safeCopyProperties is present before copying (#10960)
add dee37c785a8 CAMEL-19695: camel-google-bigquery - Bump org.json to 20230618 (#10967)
add f896dd8058f CAMEL-19487: camel-bean - Fix concurrency issue in BeanInfo cache when EIPs are using an existing bean instance. (#10950) (#10953)
add b9031cfd2db Update releases in camel-catalog
add dfb5407ef60 CAMEL-19701: camel-main - Filter out k8s injected service ENV variables that can cause camel-main to fail startup. (#10971)
add e1fd90ec91d CAMEL-19691: camel-kafka - Allow sslKeystorePassword to be blank. (#10973)
add 7a171d72a4a exception in onCompletionProcessor should be suppressed, other than be lost (#10944)
add 028e0dfa6ac Regen for commit e1fd90ec91dd0d5df57832942fe25c569eee3825 (#10987)
add 6f82708a0c0 CAMEL-19498: camel-core - Pool for non-singleton polling consumer should be limite to capacity size, to avoid growing unlimited and leak memory. (#11013)
add 134cc113d43 CAMEL-19685: increase logging in camel-mock
add 78055afd0ef (chores) camel-mock: avoid costly boxing/unboxing operations for integer operations (#11020)
add 8405bc47be3 (chores) camel-jcr: try reusing forks to reduce test duration
add 1e9d2fc833f (chores) camel-jcr: avoid recreating the repository for every single test (#11011)
add 3305910901f CAMEL-19719: camel-vertx-http - Infinite loop when maximumRedeliveries > 0
add f303ee7e7cb Camel-19627: paho-mqtt5 allow optional password when username provided (#11043)
add bedfe0c8566 refactor!: remove itemType param in get/collection operation (#11068)
add b5f7e3493ac docs: remove duplication in DHIS2 component docs (#11074)
add e98ab58a7c1 [CAMEL-19736] Add 'secret' as sensitive key for logging purposes. (#11087)
add f7edf7cd2d6 Regen for commit e98ab58a7c11481bb685fb95ed31bb789f53fad7 (#11089)
add 16f32a78aa0 CAMEL-19738: camel-core - Loop EIP can have wrong pending inflight in case of early loop exit due to exception
add 7320ea081f1 Upgrade spring-security 5.8.5
add 3fdb66c3ceb CAMEL-19751: disable misbehaved camel-xchange tests (#11114) (#11119)
add c94420582f8 Camel 19756 throw error operation does not set processor 3.21.x (#11144)
add 6cb45ab99a6 CAMEL-19758: netty-http in proxy mode generates IllegalReferenceCountException for every success request. (#11146)
add c3b1ca24f3f CAMEL-19744: camel-core - Backlog tracer capturing data as json when its not json
add 6db384eb5d8 Backport CAMEL-19766: Fix issue with not setting routeConfiguration on XML routes (#11152) (#11157)
add a92298471ff Version upgrades (maven-war-plugin, spring-integration, spring-batch) (#11166)
add c0e0beb42ed CAMEL-19760: netty-http:prevent the usage of proxy protocol in producer endpoint (#11165)
add 50fcf9bd862 CAMEL-19777: Fix usage of FQQN with toD (#11178)
add 667617021ca fix!: change way collection items are transformed into domain objects (#11186)
add 34d342e110a CAMEL-19777: Fix usage of FQQN with toD (#11178)
add 3d3b6167d7e Upgrade spring stuff in preparation for next Spring Boot release
add d30d1485ea1 Upgrade to groovy 3.0.19
add 46c9957ff47 Regen for commit d30d1485ea1af44f10a0b82062e2a3add122d173 (#11192)
add a7ee4072ba2 Provide a dependencyManagement entry for snappy-java to ensure we use 1.1.10.3 (#11199)
add e21d0f9ccb5 Upgrade Ivy to version 2.5.2 (#11215)
add da54d68194e Regen for commit e21d0f9ccb57df613a8c919d574778852d678869 (#11218)
add 07346225025 CAMEL-19776: Added tracing strategy for OpenTelemetry to trace processors (#11213)
add 0c4855e7d3d Fix CS
add 9d4801308a7 Fix CS
add 5bf013f47de CAMEL-19731 AS2: Fixed null pointer exception (#11229)
add e92208094fc CAMEL-19814: camel-rest - Should filter out query parameters that are… (#11252)
add afff9b70cea CAMEL-19822: must not ensure relative because target expects absolute (#11272)
add 9e41f0f7698 camel-netty - Fix doc about SSL configuration
add d21b4c766ac CAMEL-19752: camel-elasticsearch - Add a doc-only mode to ease migration (#11287)
add a4c5c22b3a6 CAMEL-19840: camel-core-api - Warn when the key store cannot be found (#11317)
add d73797f0450 Updating Kudu to 1.17.0 (#11323) (#11324)
add a702ba02fc9 Upgrade sshd 2.10.0 (#11338)
add 4f046181bac Updating Jakarta El to 3.0.4 (#11370)
add 6a11f07f2fc CAMEL-19852 - Camel-platform-http-vertx: Always use normalized path from context (#11367)
add 8941c51acab CAMEL-19871: camel-jooq - Set the proper scope to all test dependencies (#11415)
add ba78dd7f67a Revert "CAMEL-19871: camel-jooq - Set the proper scope to all test dependencies (#11415)" (#11425)
add 65bf979f9e9 CAMEL-19870 Camel AS2: Should accept MDN field name Disposition as case insensitive (#11431)
add fe9a5f41040 CAMEL-19780: camel-jbang - Run to support relative files or parent files.
add 1a7769bb25e Upgrade to Jetty 9.4.52
add 04d6e7cbbc2 Upgrade aws 2.20.99
add 059b16cb1f7 Upgrade spring 5.3.30
add 3c0dc59dc65 Upgrade micrometer 1.10.11 and tracing 1.0.10
add 050f7a0e283 CAMEL-19871: camel-jooq - Set the proper scope to all test dependencies (#11466)
add 16cfbdcb835 CAMEL-18759: read the messages from the latest offset in the pausable consumer (#11473)
add 5234eff02ce Upgrade Spring Security to version 5.8.7 (#11484)
add c3573ae4bfa CAMEL-19895 - Fix to respect absolute path for output directory for (#11505)
add 6876a429270 Regen for commit c3573ae4bfa93e43b6068840242e6970245322bf (#11513)
add fcbe5ed61da CAMEL-19901: Prepare for upgrade to SB 2.7.16
add ac8c5fe8109 CAMEL-19920 - camel-mina - Upgrade to newer versions - version 2.1.8 (#11570)
add 3aa1675d689 CAMEL-19921 - Update default values of kafka client configuration (#11579) (#11592)
add aa65933d18e Regen for commit 3aa1675d6890853a3aa8f3cfebded03f6fe6df24 (#11596)
add cf7fa2a68dc Upgrade to CXF 3.6.2 (#11606)
add a749e8742e8 docs: correct DSL examples (#11649)
add b2866af6361 CAMEL-19962 - Camel-Azure-Datalake: Headers metadata are wrong (#11658)
add b2932b11ead Regen for commit b2866af63617125b159e5a680332d0a6513b1243 (#11662)
add f2034db6047 Mapstruct: Method must be public in DefaultMapStructFinder.discoverMappings (#11261)
add 70402190986 CAMEL-19970 - Avoid IllegalArgumentException for file without (#11684)
add ecb300421ac Regen for commit 70402190986dab6b0e92bef766be9832da4ac138 (#11686)
add df0c24c2848 Upgrade Netty to version 4.1.100.Final (#11697)
add a18099f55f0 Regen for commit df0c24c2848b56668aa80c5f9b58adcf6a4eb9d4 (#11699)
add 5be242b6e61 Upgrade Jetty to version 9.4.53.v20231009 (#11706)
add ebfb162106e Regen for commit 5be242b6e61e771a5066bafe8587081dca4d26e9 (#11710)
add 2204d1dedb6 CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure CamelContext is inject eager. This fixes a problem with using global route configurations in Java and XML DSLs mixed. (#11719)
add 01460f132c7 CAMEL-19968: The Tracing Strategy is failing when using pollEnrich wi… (#11724)
add bc61bc87ee5 CAMEL-19996 avoid NPE when handling exception without coordinator (#11733)
add 59db808ce9e CAMEL-20010 (#11759)
add 0fa9a190a58 camel-kafka - fix typo in the description of linger.ms (#11771)
new 92071be3480 CAMEL-19481: Upgrade to Jetty 10
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (2f507b84722)
\
N -- N -- N refs/heads/CAMEL-19481/upgrade-jetty-10 (92071be3480)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
apache-camel/pom.xml | 2 +-
archetypes/camel-archetype-api-component/pom.xml | 2 +-
archetypes/camel-archetype-cdi/pom.xml | 2 +-
archetypes/camel-archetype-component/pom.xml | 2 +-
archetypes/camel-archetype-dataformat/pom.xml | 2 +-
archetypes/camel-archetype-java/pom.xml | 2 +-
archetypes/camel-archetype-main/pom.xml | 2 +-
archetypes/camel-archetype-spring/pom.xml | 2 +-
archetypes/pom.xml | 2 +-
bom/camel-bom/pom.xml | 7 +-
bom/pom.xml | 2 +-
buildingtools/pom.xml | 2 +-
camel-dependencies/pom.xml | 73 +-
catalog/camel-allcomponents/pom.xml | 7 +-
catalog/camel-catalog-console/pom.xml | 2 +-
catalog/camel-catalog-lucene/pom.xml | 2 +-
catalog/camel-catalog-maven/pom.xml | 2 +-
.../camel/catalog/maven/MavenVersionManager.java | 12 +-
catalog/camel-catalog/pom.xml | 2 +-
.../camel/catalog/archetypes/archetype-catalog.xml | 14 +-
.../org/apache/camel/catalog/components.properties | 1 +
.../apache/camel/catalog/components/activemq.json | 2 +-
.../org/apache/camel/catalog/components/amqp.json | 2 +-
.../apache/camel/catalog/components/arangodb.json | 2 +-
.../org/apache/camel/catalog/components/as2.json | 2 +-
.../apache/camel/catalog/components/asterisk.json | 2 +-
.../apache/camel/catalog/components/atlasmap.json | 4 +-
.../org/apache/camel/catalog/components/atmos.json | 2 +-
.../catalog/components/atmosphere-websocket.json | 2 +-
.../org/apache/camel/catalog/components/atom.json | 2 +-
.../org/apache/camel/catalog/components/avro.json | 2 +-
.../camel/catalog/components/aws-cloudtrail.json | 2 +-
.../catalog/components/aws-secrets-manager.json | 2 +-
.../camel/catalog/components/aws2-athena.json | 2 +-
.../apache/camel/catalog/components/aws2-cw.json | 2 +-
.../apache/camel/catalog/components/aws2-ddb.json | 2 +-
.../camel/catalog/components/aws2-ddbstream.json | 2 +-
.../apache/camel/catalog/components/aws2-ec2.json | 4 +-
.../apache/camel/catalog/components/aws2-ecs.json | 2 +-
.../apache/camel/catalog/components/aws2-eks.json | 2 +-
.../camel/catalog/components/aws2-eventbridge.json | 2 +-
.../apache/camel/catalog/components/aws2-iam.json | 2 +-
.../catalog/components/aws2-kinesis-firehose.json | 2 +-
.../camel/catalog/components/aws2-kinesis.json | 2 +-
.../apache/camel/catalog/components/aws2-kms.json | 2 +-
.../camel/catalog/components/aws2-lambda.json | 2 +-
.../apache/camel/catalog/components/aws2-mq.json | 2 +-
.../apache/camel/catalog/components/aws2-msk.json | 2 +-
.../apache/camel/catalog/components/aws2-s3.json | 2 +-
.../apache/camel/catalog/components/aws2-ses.json | 2 +-
.../apache/camel/catalog/components/aws2-sns.json | 2 +-
.../apache/camel/catalog/components/aws2-sqs.json | 2 +-
.../apache/camel/catalog/components/aws2-sts.json | 2 +-
.../camel/catalog/components/aws2-translate.json | 2 +-
.../camel/catalog/components/azure-cosmosdb.json | 2 +-
.../camel/catalog/components/azure-eventhubs.json | 2 +-
.../camel/catalog/components/azure-files.json | 143 +
.../camel/catalog/components/azure-key-vault.json | 2 +-
.../camel/catalog/components/azure-servicebus.json | 2 +-
.../catalog/components/azure-storage-blob.json | 2 +-
.../catalog/components/azure-storage-datalake.json | 126 +-
.../catalog/components/azure-storage-queue.json | 2 +-
.../camel/catalog/components/bean-validator.json | 2 +-
.../org/apache/camel/catalog/components/bean.json | 2 +-
.../apache/camel/catalog/components/bonita.json | 2 +-
.../org/apache/camel/catalog/components/box.json | 2 +-
.../apache/camel/catalog/components/braintree.json | 2 +-
.../apache/camel/catalog/components/browse.json | 2 +-
.../camel/catalog/components/caffeine-cache.json | 2 +-
.../catalog/components/caffeine-loadcache.json | 2 +-
.../camel/catalog/components/chatscript.json | 2 +-
.../org/apache/camel/catalog/components/chunk.json | 2 +-
.../org/apache/camel/catalog/components/class.json | 2 +-
.../apache/camel/catalog/components/cm-sms.json | 2 +-
.../apache/camel/catalog/components/coap+tcp.json | 2 +-
.../org/apache/camel/catalog/components/coap.json | 2 +-
.../apache/camel/catalog/components/coaps+tcp.json | 2 +-
.../org/apache/camel/catalog/components/coaps.json | 2 +-
.../apache/camel/catalog/components/cometd.json | 2 +-
.../apache/camel/catalog/components/cometds.json | 2 +-
.../apache/camel/catalog/components/consul.json | 2 +-
.../camel/catalog/components/controlbus.json | 2 +-
.../org/apache/camel/catalog/components/corda.json | 4 +-
.../apache/camel/catalog/components/couchbase.json | 2 +-
.../apache/camel/catalog/components/couchdb.json | 2 +-
.../org/apache/camel/catalog/components/cql.json | 2 +-
.../org/apache/camel/catalog/components/cron.json | 2 +-
.../apache/camel/catalog/components/crypto.json | 2 +-
.../org/apache/camel/catalog/components/cxf.json | 2 +-
.../org/apache/camel/catalog/components/cxfrs.json | 2 +-
.../camel/catalog/components/dataformat.json | 2 +-
.../camel/catalog/components/dataset-test.json | 2 +-
.../apache/camel/catalog/components/dataset.json | 2 +-
.../camel/catalog/components/debezium-db2.json | 2 +-
.../camel/catalog/components/debezium-mongodb.json | 2 +-
.../camel/catalog/components/debezium-mysql.json | 2 +-
.../camel/catalog/components/debezium-oracle.json | 2 +-
.../catalog/components/debezium-postgres.json | 2 +-
.../catalog/components/debezium-sqlserver.json | 2 +-
.../camel/catalog/components/digitalocean.json | 2 +-
.../apache/camel/catalog/components/direct-vm.json | 2 +-
.../apache/camel/catalog/components/direct.json | 2 +-
.../camel/catalog/components/disruptor-vm.json | 2 +-
.../apache/camel/catalog/components/disruptor.json | 2 +-
.../org/apache/camel/catalog/components/djl.json | 2 +-
.../org/apache/camel/catalog/components/dns.json | 2 +-
.../apache/camel/catalog/components/docker.json | 2 +-
.../org/apache/camel/catalog/components/drill.json | 2 +-
.../apache/camel/catalog/components/dropbox.json | 2 +-
.../camel/catalog/components/dynamic-router.json | 2 +-
.../apache/camel/catalog/components/ehcache.json | 2 +-
.../catalog/components/elasticsearch-rest.json | 2 +-
.../camel/catalog/components/elasticsearch.json | 7 +-
.../org/apache/camel/catalog/components/etcd3.json | 2 +-
.../org/apache/camel/catalog/components/exec.json | 2 +-
.../apache/camel/catalog/components/facebook.json | 2 +-
.../org/apache/camel/catalog/components/fhir.json | 2 +-
.../camel/catalog/components/file-watch.json | 2 +-
.../org/apache/camel/catalog/components/file.json | 2 +-
.../apache/camel/catalog/components/flatpack.json | 2 +-
.../org/apache/camel/catalog/components/flink.json | 2 +-
.../org/apache/camel/catalog/components/fop.json | 2 +-
.../camel/catalog/components/freemarker.json | 2 +-
.../org/apache/camel/catalog/components/ftp.json | 2 +-
.../org/apache/camel/catalog/components/ftps.json | 2 +-
.../apache/camel/catalog/components/geocoder.json | 2 +-
.../org/apache/camel/catalog/components/git.json | 2 +-
.../apache/camel/catalog/components/github.json | 2 +-
.../catalog/components/google-bigquery-sql.json | 2 +-
.../camel/catalog/components/google-bigquery.json | 2 +-
.../catalog/components/google-calendar-stream.json | 2 +-
.../camel/catalog/components/google-calendar.json | 2 +-
.../camel/catalog/components/google-drive.json | 2 +-
.../camel/catalog/components/google-functions.json | 2 +-
.../catalog/components/google-mail-stream.json | 2 +-
.../camel/catalog/components/google-mail.json | 2 +-
.../camel/catalog/components/google-pubsub.json | 2 +-
.../catalog/components/google-secret-manager.json | 2 +-
.../catalog/components/google-sheets-stream.json | 2 +-
.../camel/catalog/components/google-sheets.json | 2 +-
.../camel/catalog/components/google-storage.json | 2 +-
.../org/apache/camel/catalog/components/gora.json | 2 +-
.../org/apache/camel/catalog/components/grape.json | 2 +-
.../apache/camel/catalog/components/graphql.json | 2 +-
.../org/apache/camel/catalog/components/grpc.json | 2 +-
.../camel/catalog/components/guava-eventbus.json | 2 +-
.../camel/catalog/components/hashicorp-vault.json | 2 +-
.../catalog/components/hazelcast-atomicvalue.json | 2 +-
.../catalog/components/hazelcast-instance.json | 2 +-
.../camel/catalog/components/hazelcast-list.json | 2 +-
.../camel/catalog/components/hazelcast-map.json | 2 +-
.../catalog/components/hazelcast-multimap.json | 2 +-
.../camel/catalog/components/hazelcast-queue.json | 2 +-
.../components/hazelcast-replicatedmap.json | 2 +-
.../catalog/components/hazelcast-ringbuffer.json | 2 +-
.../camel/catalog/components/hazelcast-seda.json | 2 +-
.../camel/catalog/components/hazelcast-set.json | 2 +-
.../camel/catalog/components/hazelcast-topic.json | 2 +-
.../org/apache/camel/catalog/components/hbase.json | 2 +-
.../org/apache/camel/catalog/components/hdfs.json | 2 +-
.../org/apache/camel/catalog/components/http.json | 2 +-
.../org/apache/camel/catalog/components/https.json | 2 +-
.../camel/catalog/components/hwcloud-dms.json | 2 +-
.../camel/catalog/components/hwcloud-frs.json | 2 +-
.../catalog/components/hwcloud-functiongraph.json | 2 +-
.../camel/catalog/components/hwcloud-iam.json | 2 +-
.../components/hwcloud-imagerecognition.json | 2 +-
.../camel/catalog/components/hwcloud-obs.json | 2 +-
.../camel/catalog/components/hwcloud-smn.json | 2 +-
.../catalog/components/hyperledger-aries.json | 2 +-
.../camel/catalog/components/iec60870-client.json | 2 +-
.../camel/catalog/components/iec60870-server.json | 2 +-
.../camel/catalog/components/ignite-cache.json | 2 +-
.../camel/catalog/components/ignite-compute.json | 2 +-
.../camel/catalog/components/ignite-events.json | 2 +-
.../camel/catalog/components/ignite-idgen.json | 2 +-
.../camel/catalog/components/ignite-messaging.json | 2 +-
.../camel/catalog/components/ignite-queue.json | 2 +-
.../camel/catalog/components/ignite-set.json | 2 +-
.../org/apache/camel/catalog/components/imap.json | 2 +-
.../org/apache/camel/catalog/components/imaps.json | 2 +-
.../catalog/components/infinispan-embedded.json | 2 +-
.../camel/catalog/components/infinispan.json | 2 +-
.../apache/camel/catalog/components/influxdb.json | 2 +-
.../apache/camel/catalog/components/influxdb2.json | 4 +-
.../org/apache/camel/catalog/components/iota.json | 2 +-
.../org/apache/camel/catalog/components/ipfs.json | 2 +-
.../org/apache/camel/catalog/components/irc.json | 2 +-
.../apache/camel/catalog/components/ironmq.json | 2 +-
.../org/apache/camel/catalog/components/jbpm.json | 2 +-
.../apache/camel/catalog/components/jcache.json | 2 +-
.../apache/camel/catalog/components/jclouds.json | 2 +-
.../org/apache/camel/catalog/components/jcr.json | 2 +-
.../org/apache/camel/catalog/components/jdbc.json | 2 +-
.../org/apache/camel/catalog/components/jetty.json | 2 +-
.../camel/catalog/components/jgroups-raft.json | 2 +-
.../apache/camel/catalog/components/jgroups.json | 2 +-
.../org/apache/camel/catalog/components/jira.json | 3 +-
.../org/apache/camel/catalog/components/jms.json | 2 +-
.../org/apache/camel/catalog/components/jmx.json | 2 +-
.../org/apache/camel/catalog/components/jolt.json | 2 +-
.../org/apache/camel/catalog/components/jooq.json | 2 +-
.../org/apache/camel/catalog/components/jpa.json | 2 +-
.../org/apache/camel/catalog/components/jslt.json | 2 +-
.../camel/catalog/components/json-patch.json | 2 +-
.../camel/catalog/components/json-validator.json | 2 +-
.../apache/camel/catalog/components/jsonata.json | 2 +-
.../org/apache/camel/catalog/components/jt400.json | 2 +-
.../org/apache/camel/catalog/components/kafka.json | 14 +-
.../apache/camel/catalog/components/kamelet.json | 2 +-
.../apache/camel/catalog/components/knative.json | 2 +-
.../catalog/components/kubernetes-config-maps.json | 4 +-
.../components/kubernetes-custom-resources.json | 4 +-
.../catalog/components/kubernetes-deployments.json | 4 +-
.../catalog/components/kubernetes-events.json | 6 +-
.../camel/catalog/components/kubernetes-hpa.json | 4 +-
.../camel/catalog/components/kubernetes-job.json | 4 +-
.../catalog/components/kubernetes-namespaces.json | 4 +-
.../camel/catalog/components/kubernetes-nodes.json | 4 +-
.../kubernetes-persistent-volumes-claims.json | 3 +-
.../components/kubernetes-persistent-volumes.json | 3 +-
.../camel/catalog/components/kubernetes-pods.json | 4 +-
.../kubernetes-replication-controllers.json | 4 +-
.../components/kubernetes-resources-quota.json | 3 +-
.../catalog/components/kubernetes-secrets.json | 3 +-
.../components/kubernetes-service-accounts.json | 3 +-
.../catalog/components/kubernetes-services.json | 4 +-
.../org/apache/camel/catalog/components/kudu.json | 2 +-
.../apache/camel/catalog/components/language.json | 2 +-
.../org/apache/camel/catalog/components/ldap.json | 2 +-
.../org/apache/camel/catalog/components/ldif.json | 2 +-
.../org/apache/camel/catalog/components/log.json | 2 +-
.../org/apache/camel/catalog/components/lpr.json | 2 +-
.../apache/camel/catalog/components/lucene.json | 2 +-
.../camel/catalog/components/lumberjack.json | 2 +-
.../apache/camel/catalog/components/mapstruct.json | 2 +-
.../apache/camel/catalog/components/master.json | 2 +-
.../apache/camel/catalog/components/metrics.json | 2 +-
.../camel/catalog/components/micrometer.json | 2 +-
.../catalog/components/microprofile-metrics.json | 2 +-
.../camel/catalog/components/milo-browse.json | 2 +-
.../camel/catalog/components/milo-client.json | 2 +-
.../camel/catalog/components/milo-server.json | 2 +-
.../org/apache/camel/catalog/components/mina.json | 2 +-
.../org/apache/camel/catalog/components/minio.json | 2 +-
.../org/apache/camel/catalog/components/mllp.json | 2 +-
.../org/apache/camel/catalog/components/mock.json | 2 +-
.../camel/catalog/components/mongodb-gridfs.json | 2 +-
.../apache/camel/catalog/components/mongodb.json | 2 +-
.../apache/camel/catalog/components/mustache.json | 2 +-
.../org/apache/camel/catalog/components/mvel.json | 2 +-
.../camel/catalog/components/mybatis-bean.json | 2 +-
.../apache/camel/catalog/components/mybatis.json | 2 +-
.../org/apache/camel/catalog/components/nats.json | 2 +-
.../camel/catalog/components/netty-http.json | 2 +-
.../org/apache/camel/catalog/components/netty.json | 2 +-
.../apache/camel/catalog/components/nitrite.json | 2 +-
.../apache/camel/catalog/components/oaipmh.json | 2 +-
.../apache/camel/catalog/components/olingo2.json | 2 +-
.../apache/camel/catalog/components/olingo4.json | 2 +-
.../components/openshift-build-configs.json | 3 +-
.../camel/catalog/components/openshift-builds.json | 3 +-
.../components/openshift-deploymentconfigs.json | 4 +-
.../camel/catalog/components/openstack-cinder.json | 2 +-
.../camel/catalog/components/openstack-glance.json | 2 +-
.../catalog/components/openstack-keystone.json | 2 +-
.../catalog/components/openstack-neutron.json | 2 +-
.../camel/catalog/components/openstack-nova.json | 2 +-
.../camel/catalog/components/openstack-swift.json | 2 +-
.../camel/catalog/components/optaplanner.json | 2 +-
.../camel/catalog/components/paho-mqtt5.json | 2 +-
.../org/apache/camel/catalog/components/paho.json | 2 +-
.../org/apache/camel/catalog/components/pdf.json | 2 +-
.../catalog/components/pg-replication-slot.json | 2 +-
.../apache/camel/catalog/components/pgevent.json | 2 +-
.../camel/catalog/components/platform-http.json | 2 +-
.../org/apache/camel/catalog/components/plc4x.json | 4 +-
.../org/apache/camel/catalog/components/pop3.json | 2 +-
.../org/apache/camel/catalog/components/pop3s.json | 2 +-
.../apache/camel/catalog/components/pubnub.json | 2 +-
.../apache/camel/catalog/components/pulsar.json | 2 +-
.../apache/camel/catalog/components/quartz.json | 2 +-
.../apache/camel/catalog/components/quickfix.json | 2 +-
.../apache/camel/catalog/components/rabbitmq.json | 2 +-
.../camel/catalog/components/reactive-streams.json | 2 +-
.../org/apache/camel/catalog/components/ref.json | 2 +-
.../apache/camel/catalog/components/rest-api.json | 2 +-
.../camel/catalog/components/rest-openapi.json | 2 +-
.../camel/catalog/components/rest-swagger.json | 2 +-
.../org/apache/camel/catalog/components/rest.json | 2 +-
.../apache/camel/catalog/components/resteasy.json | 2 +-
.../camel/catalog/components/robotframework.json | 2 +-
.../apache/camel/catalog/components/rocketmq.json | 4 +-
.../org/apache/camel/catalog/components/rss.json | 2 +-
.../org/apache/camel/catalog/components/saga.json | 2 +-
.../camel/catalog/components/salesforce.json | 2 +-
.../camel/catalog/components/sap-netweaver.json | 2 +-
.../apache/camel/catalog/components/scheduler.json | 2 +-
.../camel/catalog/components/schematron.json | 2 +-
.../org/apache/camel/catalog/components/scp.json | 2 +-
.../org/apache/camel/catalog/components/seda.json | 2 +-
.../apache/camel/catalog/components/service.json | 2 +-
.../camel/catalog/components/servicenow.json | 2 +-
.../apache/camel/catalog/components/servlet.json | 2 +-
.../org/apache/camel/catalog/components/sftp.json | 2 +-
.../org/apache/camel/catalog/components/sjms.json | 2 +-
.../org/apache/camel/catalog/components/sjms2.json | 2 +-
.../org/apache/camel/catalog/components/slack.json | 2 +-
.../org/apache/camel/catalog/components/smpp.json | 2 +-
.../org/apache/camel/catalog/components/smpps.json | 2 +-
.../org/apache/camel/catalog/components/smtp.json | 2 +-
.../org/apache/camel/catalog/components/smtps.json | 2 +-
.../org/apache/camel/catalog/components/snmp.json | 2 +-
.../org/apache/camel/catalog/components/solr.json | 2 +-
.../apache/camel/catalog/components/solrCloud.json | 2 +-
.../org/apache/camel/catalog/components/solrs.json | 2 +-
.../org/apache/camel/catalog/components/spark.json | 2 +-
.../camel/catalog/components/splunk-hec.json | 2 +-
.../apache/camel/catalog/components/splunk.json | 2 +-
.../camel/catalog/components/spring-batch.json | 2 +-
.../camel/catalog/components/spring-event.json | 2 +-
.../catalog/components/spring-integration.json | 2 +-
.../camel/catalog/components/spring-jdbc.json | 2 +-
.../camel/catalog/components/spring-ldap.json | 2 +-
.../camel/catalog/components/spring-rabbitmq.json | 2 +-
.../camel/catalog/components/spring-redis.json | 2 +-
.../apache/camel/catalog/components/spring-ws.json | 2 +-
.../camel/catalog/components/sql-stored.json | 2 +-
.../org/apache/camel/catalog/components/sql.json | 2 +-
.../org/apache/camel/catalog/components/ssh.json | 2 +-
.../org/apache/camel/catalog/components/stax.json | 2 +-
.../apache/camel/catalog/components/stitch.json | 2 +-
.../org/apache/camel/catalog/components/stomp.json | 2 +-
.../apache/camel/catalog/components/stream.json | 2 +-
.../camel/catalog/components/string-template.json | 2 +-
.../org/apache/camel/catalog/components/stub.json | 2 +-
.../apache/camel/catalog/components/telegram.json | 2 +-
.../apache/camel/catalog/components/thrift.json | 2 +-
.../org/apache/camel/catalog/components/tika.json | 2 +-
.../org/apache/camel/catalog/components/timer.json | 2 +-
.../apache/camel/catalog/components/twilio.json | 2 +-
.../catalog/components/twitter-directmessage.json | 2 +-
.../camel/catalog/components/twitter-search.json | 2 +-
.../camel/catalog/components/twitter-timeline.json | 2 +-
.../apache/camel/catalog/components/undertow.json | 2 +-
.../apache/camel/catalog/components/validator.json | 2 +-
.../apache/camel/catalog/components/velocity.json | 2 +-
.../camel/catalog/components/vertx-http.json | 2 +-
.../camel/catalog/components/vertx-websocket.json | 2 +-
.../org/apache/camel/catalog/components/vertx.json | 2 +-
.../org/apache/camel/catalog/components/vm.json | 2 +-
.../apache/camel/catalog/components/weather.json | 2 +-
.../org/apache/camel/catalog/components/web3j.json | 2 +-
.../apache/camel/catalog/components/webhook.json | 2 +-
.../camel/catalog/components/websocket-jsr356.json | 2 +-
.../apache/camel/catalog/components/websocket.json | 2 +-
.../org/apache/camel/catalog/components/weka.json | 2 +-
.../apache/camel/catalog/components/whatsapp.json | 2 +-
.../apache/camel/catalog/components/wordpress.json | 2 +-
.../apache/camel/catalog/components/workday.json | 2 +-
.../apache/camel/catalog/components/xchange.json | 2 +-
.../org/apache/camel/catalog/components/xj.json | 2 +-
.../camel/catalog/components/xmlsecurity-sign.json | 2 +-
.../catalog/components/xmlsecurity-verify.json | 2 +-
.../org/apache/camel/catalog/components/xmpp.json | 2 +-
.../apache/camel/catalog/components/xquery.json | 2 +-
.../camel/catalog/components/xslt-saxon.json | 2 +-
.../org/apache/camel/catalog/components/xslt.json | 2 +-
.../org/apache/camel/catalog/components/zeebe.json | 2 +-
.../apache/camel/catalog/components/zendesk.json | 2 +-
.../camel/catalog/components/zookeeper-master.json | 2 +-
.../apache/camel/catalog/components/zookeeper.json | 2 +-
.../apache/camel/catalog/dataformats/any23.json | 2 +-
.../org/apache/camel/catalog/dataformats/asn1.json | 2 +-
.../org/apache/camel/catalog/dataformats/avro.json | 2 +-
.../camel/catalog/dataformats/avroJackson.json | 2 +-
.../apache/camel/catalog/dataformats/barcode.json | 2 +-
.../apache/camel/catalog/dataformats/base64.json | 2 +-
.../apache/camel/catalog/dataformats/bindyCsv.json | 2 +-
.../camel/catalog/dataformats/bindyFixed.json | 2 +-
.../apache/camel/catalog/dataformats/bindyKvp.json | 2 +-
.../org/apache/camel/catalog/dataformats/cbor.json | 2 +-
.../apache/camel/catalog/dataformats/crypto.json | 2 +-
.../org/apache/camel/catalog/dataformats/csv.json | 2 +-
.../apache/camel/catalog/dataformats/fastjson.json | 2 +-
.../apache/camel/catalog/dataformats/fhirJson.json | 2 +-
.../apache/camel/catalog/dataformats/fhirXml.json | 2 +-
.../apache/camel/catalog/dataformats/flatpack.json | 2 +-
.../org/apache/camel/catalog/dataformats/grok.json | 2 +-
.../org/apache/camel/catalog/dataformats/gson.json | 2 +-
.../camel/catalog/dataformats/gzipDeflater.json | 2 +-
.../org/apache/camel/catalog/dataformats/hl7.json | 2 +-
.../org/apache/camel/catalog/dataformats/ical.json | 2 +-
.../apache/camel/catalog/dataformats/jackson.json | 2 +-
.../camel/catalog/dataformats/jacksonXml.json | 2 +-
.../org/apache/camel/catalog/dataformats/jaxb.json | 2 +-
.../apache/camel/catalog/dataformats/johnzon.json | 2 +-
.../apache/camel/catalog/dataformats/jsonApi.json | 2 +-
.../apache/camel/catalog/dataformats/jsonb.json | 2 +-
.../org/apache/camel/catalog/dataformats/lzf.json | 2 +-
.../camel/catalog/dataformats/mimeMultipart.json | 2 +-
.../org/apache/camel/catalog/dataformats/pgp.json | 2 +-
.../apache/camel/catalog/dataformats/protobuf.json | 2 +-
.../camel/catalog/dataformats/protobufJackson.json | 2 +-
.../org/apache/camel/catalog/dataformats/rss.json | 2 +-
.../camel/catalog/dataformats/snakeYaml.json | 2 +-
.../org/apache/camel/catalog/dataformats/soap.json | 2 +-
.../apache/camel/catalog/dataformats/swiftMt.json | 4 +-
.../apache/camel/catalog/dataformats/swiftMx.json | 4 +-
.../apache/camel/catalog/dataformats/syslog.json | 2 +-
.../apache/camel/catalog/dataformats/tarFile.json | 2 +-
.../apache/camel/catalog/dataformats/thrift.json | 2 +-
.../camel/catalog/dataformats/univocityCsv.json | 2 +-
.../camel/catalog/dataformats/univocityFixed.json | 2 +-
.../camel/catalog/dataformats/univocityTsv.json | 2 +-
.../camel/catalog/dataformats/xmlSecurity.json | 2 +-
.../apache/camel/catalog/dataformats/xstream.json | 2 +-
.../camel/catalog/dataformats/xstreamJson.json | 2 +-
.../camel/catalog/dataformats/zipDeflater.json | 2 +-
.../apache/camel/catalog/dataformats/zipFile.json | 2 +-
.../org/apache/camel/catalog/languages/bean.json | 2 +-
.../apache/camel/catalog/languages/constant.json | 2 +-
.../apache/camel/catalog/languages/csimple.json | 2 +-
.../apache/camel/catalog/languages/datasonnet.json | 2 +-
.../camel/catalog/languages/exchangeProperty.json | 2 +-
.../org/apache/camel/catalog/languages/file.json | 2 +-
.../org/apache/camel/catalog/languages/groovy.json | 2 +-
.../org/apache/camel/catalog/languages/header.json | 2 +-
.../apache/camel/catalog/languages/hl7terser.json | 2 +-
.../org/apache/camel/catalog/languages/joor.json | 2 +-
.../org/apache/camel/catalog/languages/jq.json | 2 +-
.../org/apache/camel/catalog/languages/js.json | 4 +-
.../apache/camel/catalog/languages/jsonpath.json | 2 +-
.../org/apache/camel/catalog/languages/mvel.json | 2 +-
.../org/apache/camel/catalog/languages/ognl.json | 2 +-
.../org/apache/camel/catalog/languages/python.json | 2 +-
.../org/apache/camel/catalog/languages/ref.json | 2 +-
.../org/apache/camel/catalog/languages/simple.json | 2 +-
.../org/apache/camel/catalog/languages/spel.json | 2 +-
.../apache/camel/catalog/languages/tokenize.json | 2 +-
.../org/apache/camel/catalog/languages/xpath.json | 2 +-
.../org/apache/camel/catalog/languages/xquery.json | 2 +-
.../apache/camel/catalog/languages/xtokenize.json | 2 +-
.../main/camel-main-configuration-metadata.json | 2 +
.../apache/camel/catalog/main/sensitive-keys.json | 1 +
.../camel/catalog/models/deadLetterChannel.json | 4 +-
.../camel/catalog/models/defaultErrorHandler.json | 4 +-
.../catalog/models/jtaTransactionErrorHandler.json | 4 +-
.../apache/camel/catalog/models/onCompletion.json | 2 +-
.../apache/camel/catalog/models/onException.json | 4 +-
.../models/springTransactionErrorHandler.json | 4 +-
.../apache/camel/catalog/others/attachments.json | 2 +-
.../org/apache/camel/catalog/others/aws-xray.json | 2 +-
.../camel/catalog/others/caffeine-lrucache.json | 2 +-
.../org/apache/camel/catalog/others/cdi-jta.json | 2 +-
.../org/apache/camel/catalog/others/cdi-main.json | 2 +-
.../org/apache/camel/catalog/others/cdi.json | 2 +-
.../apache/camel/catalog/others/cli-connector.json | 2 +-
.../org/apache/camel/catalog/others/cloud.json | 2 +-
.../apache/camel/catalog/others/cloudevents.json | 2 +-
.../org/apache/camel/catalog/others/cluster.json | 2 +-
.../apache/camel/catalog/others/componentdsl.json | 2 +-
.../org/apache/camel/catalog/others/console.json | 2 +-
.../apache/camel/catalog/others/csimple-joor.json | 2 +-
.../org/apache/camel/catalog/others/debug.json | 2 +-
.../apache/camel/catalog/others/dsl-modeline.json | 2 +-
.../apache/camel/catalog/others/dsl-support.json | 2 +-
.../org/apache/camel/catalog/others/elytron.json | 2 +-
.../apache/camel/catalog/others/endpointdsl.json | 2 +-
.../apache/camel/catalog/others/groovy-dsl.json | 2 +-
.../apache/camel/catalog/others/headersmap.json | 2 +-
.../org/apache/camel/catalog/others/health.json | 2 +-
.../org/apache/camel/catalog/others/jasypt.json | 2 +-
.../apache/camel/catalog/others/java-joor-dsl.json | 2 +-
.../org/apache/camel/catalog/others/jfr.json | 2 +-
.../org/apache/camel/catalog/others/js-dsl.json | 2 +-
.../org/apache/camel/catalog/others/jsh-dsl.json | 2 +-
.../org/apache/camel/catalog/others/jta.json | 2 +-
.../apache/camel/catalog/others/kamelet-main.json | 2 +-
.../apache/camel/catalog/others/kotlin-dsl.json | 2 +-
.../org/apache/camel/catalog/others/leveldb.json | 2 +-
.../org/apache/camel/catalog/others/lra.json | 2 +-
.../camel/catalog/others/mail-microsoft-oauth.json | 2 +-
.../org/apache/camel/catalog/others/main.json | 2 +-
.../apache/camel/catalog/others/management.json | 2 +-
.../camel/catalog/others/microprofile-config.json | 2 +-
.../others/microprofile-fault-tolerance.json | 2 +-
.../camel/catalog/others/microprofile-health.json | 2 +-
.../apache/camel/catalog/others/observation.json | 2 +-
.../apache/camel/catalog/others/openapi-java.json | 2 +-
.../apache/camel/catalog/others/opentelemetry.json | 2 +-
.../apache/camel/catalog/others/opentracing.json | 2 +-
.../camel/catalog/others/platform-http-vertx.json | 2 +-
.../catalog/others/reactive-executor-tomcat.json | 2 +-
.../catalog/others/reactive-executor-vertx.json | 2 +-
.../org/apache/camel/catalog/others/reactor.json | 2 +-
.../org/apache/camel/catalog/others/redis.json | 2 +-
.../apache/camel/catalog/others/resilience4j.json | 2 +-
.../catalog/others/resourceresolver-github.json | 2 +-
.../org/apache/camel/catalog/others/rxjava.json | 2 +-
.../org/apache/camel/catalog/others/shiro.json | 2 +-
.../apache/camel/catalog/others/spring-main.json | 2 +-
.../camel/catalog/others/spring-security.json | 2 +-
.../apache/camel/catalog/others/spring-xml.json | 2 +-
.../apache/camel/catalog/others/swagger-java.json | 2 +-
.../org/apache/camel/catalog/others/test-cdi.json | 2 +-
.../apache/camel/catalog/others/test-junit5.json | 2 +-
.../camel/catalog/others/test-spring-junit5.json | 2 +-
.../apache/camel/catalog/others/test-spring.json | 2 +-
.../catalog/others/threadpoolfactory-vertx.json | 2 +-
.../org/apache/camel/catalog/others/tracing.json | 2 +-
.../catalog/others/undertow-spring-security.json | 2 +-
.../org/apache/camel/catalog/others/wal.json | 4 +-
.../apache/camel/catalog/others/xml-io-dsl.json | 2 +-
.../apache/camel/catalog/others/xml-jaxb-dsl.json | 2 +-
.../org/apache/camel/catalog/others/yaml-dsl.json | 2 +-
.../org/apache/camel/catalog/others/zipkin.json | 2 +-
.../catalog/releases/camel-quarkus-releases.json | 10 +
.../camel/catalog/releases/camel-releases.json | 19 +
.../apache/camel/catalog/schemas/camel-spring.xsd | 172 +-
.../camel/catalog/DefaultVersionManager.java | 5 +
.../org/apache/camel/catalog/VersionManager.java | 5 +
catalog/camel-csimple-maven-plugin/pom.xml | 2 +-
catalog/camel-report-maven-plugin/pom.xml | 2 +-
catalog/camel-route-parser/pom.xml | 2 +-
catalog/dummy-component/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/dummy/dummy.json | 2 +-
catalog/pom.xml | 2 +-
components/camel-activemq/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/activemq/activemq.json | 2 +-
components/camel-amqp/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/amqp/amqp.json | 2 +-
components/camel-any23/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../org/apache/camel/dataformat/any23/any23.json | 2 +-
components/camel-arangodb/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/arangodb/arangodb.json | 2 +-
components/camel-as2/camel-as2-api/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/as2-api.json | 2 +-
.../component/as2/api/entity/DispositionMode.java | 10 +-
.../component/as2/api/entity/EntityParser.java | 8 +-
.../DispositionNotificationContentUtilsTest.java | 14 +
components/camel-as2/camel-as2-component/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/as2/as2.json | 2 +-
.../camel/component/as2/AS2ClientManagerIT.java | 56 +
components/camel-as2/pom.xml | 2 +-
components/camel-asn1/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../org/apache/camel/dataformat/asn1/asn1.json | 2 +-
components/camel-asterisk/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/asterisk/asterisk.json | 2 +-
components/camel-atlasmap/pom.xml | 4 +-
.../services/org/apache/camel/component.properties | 4 +-
.../apache/camel/component/atlasmap/atlasmap.json | 4 +-
.../src/main/docs/atlasmap-component.adoc | 5 +-
components/camel-atmos/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/atmos/atmos.json | 2 +-
components/camel-atmosphere-websocket/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../atmosphere/websocket/atmosphere-websocket.json | 2 +-
components/camel-atom/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/atom/atom.json | 2 +-
components/camel-attachments/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/attachments.json | 2 +-
.../MulticastAggregationStrategyTest.java | 83 +
.../camel-avro-rpc-component/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/avro/avro.json | 2 +-
.../camel-avro-rpc/camel-avro-rpc-jetty/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/avro-rpc-jetty.json | 2 +-
.../camel-avro-rpc/camel-avro-rpc-spi/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/avro-rpc-spi.json | 2 +-
components/camel-avro-rpc/pom.xml | 2 +-
components/camel-avro/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../org/apache/camel/dataformat/avro/avro.json | 2 +-
components/camel-aws/camel-aws-cloudtrail/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/aws/cloudtrail/aws-cloudtrail.json | 2 +-
.../aws/cloudtrail/CloudtrailConsumer.java | 19 -
.../cloudtrail/CloudtrailConsumerHealthCheck.java | 74 -
.../impl/CloudtrailClientIAMOptimizedImpl.java | 7 +-
.../client/impl/CloudtrailClientStandardImpl.java | 7 +-
.../camel-aws/camel-aws-secrets-manager/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../aws/secretsmanager/aws-secrets-manager.json | 2 +-
.../impl/SecretsManagerClientIAMOptimized.java | 7 +-
.../impl/SecretsManagerClientStandardImpl.java | 7 +-
components/camel-aws/camel-aws-xray/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/aws-xray.json | 2 +-
components/camel-aws/camel-aws2-athena/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/aws2/athena/aws2-athena.json | 2 +-
components/camel-aws/camel-aws2-cw/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/aws2/cw/aws2-cw.json | 2 +-
.../cw/client/impl/Cw2ClientIAMOptimizedImpl.java | 7 +-
.../aws2/cw/client/impl/Cw2ClientStandardImpl.java | 7 +-
components/camel-aws/camel-aws2-ddb/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/aws2/ddb/aws2-ddb.json | 2 +-
.../component/aws2/ddbstream/aws2-ddbstream.json | 2 +-
.../component/aws2/ddb/Ddb2ClientHealthCheck.java | 70 -
.../camel/component/aws2/ddb/Ddb2Endpoint.java | 14 -
.../client/impl/Ddb2ClientIAMOptimizedImpl.java | 7 +-
.../ddb/client/impl/Ddb2ClientStandardImpl.java | 7 +-
.../aws2/ddbstream/Ddb2StreamConsumer.java | 21 -
.../ddbstream/Ddb2StreamConsumerHealthCheck.java | 75 -
.../aws2/ddbstream/Ddb2StreamEndpoint.java | 57 -
.../impl/Ddb2StreamClientIAMOptimizedImpl.java | 7 +-
.../client/impl/Ddb2StreamClientStandardImpl.java | 7 +-
.../ddb/Ddb2ClientHealthCheckProfileCredsTest.java | 8 +-
.../ddb/Ddb2ClientHealthCheckStaticCredsTest.java | 8 +-
.../ddbstream/Ddb2StreamConsumerHealthCheckIT.java | 92 +
...2StreamConsumerHealthCheckProfileCredsTest.java | 106 -
...b2StreamConsumerHealthCheckStaticCredsTest.java | 101 -
.../Ddb2StreamConsumerHealthCustomClientTest.java | 104 -
components/camel-aws/camel-aws2-ec2/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/aws2/ec2/aws2-ec2.json | 4 +-
.../client/impl/AWS2EC2ClientIAMOptimizedImpl.java | 7 +-
.../ec2/client/impl/AWS2EC2ClientStandardImpl.java | 7 +-
components/camel-aws/camel-aws2-ecs/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/aws2/ecs/aws2-ecs.json | 2 +-
.../client/impl/ECS2ClientIAMOptimizedImpl.java | 7 +-
.../ecs/client/impl/ECS2ClientStandardImpl.java | 7 +-
components/camel-aws/camel-aws2-eks/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/aws2/eks/aws2-eks.json | 2 +-
.../client/impl/EKS2ClientIAMOptimizedImpl.java | 7 +-
.../eks/client/impl/EKS2ClientStandardImpl.java | 7 +-
.../camel-aws/camel-aws2-eventbridge/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../aws2/eventbridge/aws2-eventbridge.json | 2 +-
.../impl/EventbridgeClientIAMOptimizedImpl.java | 7 +-
.../client/impl/EventbridgeClientStandardImpl.java | 7 +-
components/camel-aws/camel-aws2-iam/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/aws2/iam/aws2-iam.json | 2 +-
.../iam/client/impl/IAM2ClientOptimizedImpl.java | 7 +-
.../iam/client/impl/IAM2ClientStandardImpl.java | 7 +-
components/camel-aws/camel-aws2-kinesis/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../aws2/firehose/aws2-kinesis-firehose.json | 2 +-
.../camel/component/aws2/kinesis/aws2-kinesis.json | 2 +-
.../KinesisFirehoseClientIAMOptimizedImpl.java | 7 +-
.../impl/KinesisFirehoseClientStandardImpl.java | 7 +-
.../component/aws2/kinesis/Kinesis2Consumer.java | 15 -
.../aws2/kinesis/Kinesis2ConsumerHealthCheck.java | 73 -
.../client/impl/KinesisClientIAMOptimizedImpl.java | 7 +-
.../client/impl/KinesisClientStandardImpl.java | 7 +-
...inesis2ConsumerHealthCheckProfileCredsTest.java | 5 +-
...Kinesis2ConsumerHealthCheckStaticCredsTest.java | 9 +-
.../Kinesis2ConsumerHealthCustomClientTest.java | 3 +-
components/camel-aws/camel-aws2-kms/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/aws2/kms/aws2-kms.json | 2 +-
.../kms/client/impl/KMS2ClientOptimizedImpl.java | 7 +-
.../kms/client/impl/KMS2ClientStandardImpl.java | 7 +-
components/camel-aws/camel-aws2-lambda/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/aws2/lambda/aws2-lambda.json | 2 +-
.../client/impl/Lambda2ClientOptimizedImpl.java | 7 +-
.../client/impl/Lambda2ClientStandardImpl.java | 7 +-
components/camel-aws/camel-aws2-mq/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/aws2/mq/aws2-mq.json | 2 +-
.../mq/client/impl/MQ2ClientOptimizedImpl.java | 7 +-
.../aws2/mq/client/impl/MQ2ClientStandardImpl.java | 7 +-
components/camel-aws/camel-aws2-msk/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/aws2/msk/aws2-msk.json | 2 +-
.../msk/client/impl/MSK2ClientOptimizedImpl.java | 7 +-
.../msk/client/impl/MSK2ClientStandardImpl.java | 7 +-
components/camel-aws/camel-aws2-s3/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/aws2/s3/aws2-s3.json | 2 +-
.../camel/component/aws2/s3/AWS2S3Consumer.java | 18 -
.../aws2/s3/AWS2S3ConsumerHealthCheck.java | 75 -
.../client/impl/AWS2S3ClientIAMOptimizedImpl.java | 7 +-
.../s3/client/impl/AWS2S3ClientStandardImpl.java | 7 +-
.../AWS2S3ConsumerHealthCheckProfileCredsTest.java | 6 +-
.../AWS2S3ConsumerHealthCheckStaticCredsTest.java | 6 +-
components/camel-aws/camel-aws2-ses/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/aws2/ses/aws2-ses.json | 2 +-
.../ses/client/impl/Ses2ClientOptimizedImpl.java | 7 +-
.../ses/client/impl/Ses2ClientStandardImpl.java | 7 +-
components/camel-aws/camel-aws2-sns/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/aws2/sns/aws2-sns.json | 2 +-
.../sns/client/impl/Sns2ClientIAMOptimized.java | 7 +-
.../sns/client/impl/Sns2ClientStandardImpl.java | 7 +-
components/camel-aws/camel-aws2-sqs/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/aws2/sqs/aws2-sqs.json | 2 +-
.../camel/component/aws2/sqs/Sqs2Consumer.java | 66 +-
.../aws2/sqs/Sqs2ConsumerHealthCheck.java | 74 -
.../sqs/client/impl/Sqs2ClientIAMOptimized.java | 7 +-
.../sqs/client/impl/Sqs2ClientStandardImpl.java | 7 +-
.../Sqs2ConsumerHealthCheckProfileCredsTest.java | 6 +-
.../Sqs2ConsumerHealthCheckStaticCredsTest.java | 6 +-
components/camel-aws/camel-aws2-sts/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/aws2/sts/aws2-sts.json | 2 +-
.../sts/client/impl/STS2ClientIAMOptimized.java | 7 +-
.../sts/client/impl/STS2ClientStandardImpl.java | 7 +-
components/camel-aws/camel-aws2-translate/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/aws2/translate/aws2-translate.json | 2 +-
.../client/impl/Translate2ClientIAMOptimized.java | 7 +-
.../client/impl/Translate2ClientStandardImpl.java | 7 +-
components/camel-aws/pom.xml | 2 +-
.../camel-azure/camel-azure-cosmosdb/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/azure/cosmosdb/azure-cosmosdb.json | 2 +-
.../camel-azure/camel-azure-eventhubs/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/azure/eventhubs/azure-eventhubs.json | 2 +-
components/camel-azure/camel-azure-files/pom.xml | 73 +
components/camel-azure/camel-azure-files/readme.md | 143 +
.../file/azure/FilesComponentConfigurer.java | 61 +
.../file/azure/FilesEndpointConfigurer.java | 553 +++
.../file/azure/FilesEndpointUriFactory.java | 187 +
.../services/org/apache/camel/component.properties | 7 +
.../org/apache/camel/component/azure-files | 2 +
.../apache/camel/configurer/azure-files-component | 2 +
.../apache/camel/configurer/azure-files-endpoint | 2 +
.../apache/camel/urifactory/azure-files-endpoint | 2 +
.../camel/component/file/azure/azure-files.json | 143 +
.../src/main/docs/azure-files-component.adoc | 310 ++
.../camel/component/file/azure/FilesComponent.java | 62 +
.../component/file/azure/FilesConfiguration.java | 112 +
.../camel/component/file/azure/FilesConsumer.java | 254 ++
.../camel/component/file/azure/FilesEndpoint.java | 180 +
.../camel/component/file/azure/FilesHeaders.java | 53 +
.../component/file/azure/FilesOperations.java | 741 ++++
.../camel/component/file/azure/FilesPath.java | 152 +
.../camel/component/file/azure/FilesProducer.java | 39 +
.../camel/component/file/azure/FilesToken.java | 218 +
.../component/file/azure/FilesURIStrings.java | 67 +
.../component/file/azure/NormalizedOperations.java | 59 +
.../FilesChangedExclusiveReadLockStrategy.java | 156 +
.../strategy/FilesExclusiveReadLockCheck.java | 140 +
.../strategy/FilesProcessStrategyFactory.java | 125 +
.../file/azure/strategy/StrategyUtil.java | 57 +
.../file/azure/FilesConfigurationTests.java | 141 +
.../component/file/azure/FilesEndpointTests.java | 43 +
.../camel/component/file/azure/FilesPathTests.java | 52 +
.../component/file/azure/FilesURIStringsTests.java | 38 +
.../camel-azure/camel-azure-key-vault/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/azure/key/vault/azure-key-vault.json | 2 +-
.../camel-azure/camel-azure-servicebus/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../azure/servicebus/azure-servicebus.json | 2 +-
.../camel-azure/camel-azure-storage-blob/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../azure/storage/blob/azure-storage-blob.json | 2 +-
.../camel-azure-storage-datalake/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../storage/datalake/azure-storage-datalake.json | 126 +-
.../azure/storage/datalake/DataLakeConstants.java | 124 +-
.../camel-azure/camel-azure-storage-queue/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../azure/storage/queue/azure-storage-queue.json | 2 +-
components/camel-azure/pom.xml | 5 +-
components/camel-barcode/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../apache/camel/dataformat/barcode/barcode.json | 2 +-
components/camel-base64/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../org/apache/camel/dataformat/base64/base64.json | 2 +-
components/camel-bean-validator/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/bean/validator/bean-validator.json | 2 +-
components/camel-bean/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../services/org/apache/camel/language.properties | 2 +-
.../org/apache/camel/component/bean/bean.json | 2 +-
.../apache/camel/component/beanclass/class.json | 2 +-
.../org/apache/camel/language/bean/bean.json | 2 +-
.../org/apache/camel/component/bean/BeanInfo.java | 11 +-
.../camel/component/bean/BeanInfoCacheKey.java | 15 +-
.../camel/component/bean/ConstantBeanHolder.java | 2 +-
.../bean/DefaultBeanProcessorFactory.java | 3 +-
components/camel-bindy/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../camel/dataformat/bindy/csv/bindyCsv.json | 2 +-
.../camel/dataformat/bindy/fixed/bindyFixed.json | 2 +-
.../camel/dataformat/bindy/kvp/bindyKvp.json | 2 +-
.../src/main/docs/bindy-dataformat.adoc | 2 +
.../camel/dataformat/bindy/BindyCsvFactory.java | 7 +
.../dataformat/bindy/BindyFixedLengthFactory.java | 2 +-
.../dataformat/bindy/annotation/CsvRecord.java | 5 +
.../dataformat/bindy/csv/BindyCsvDataFormat.java | 17 +-
.../csv/BindySimpleCsvUnmarshallTrimLineTest.java | 100 +
.../apache/camel/dataformat/bindy/csv/Cartoon.java | 46 +
...indySimpleCsvUnmarshallTrimLineTest-context.xml | 34 +
components/camel-bonita/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/bonita/bonita.json | 2 +-
components/camel-box/camel-box-api/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/box-api.json | 2 +-
components/camel-box/camel-box-component/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/box/box.json | 2 +-
components/camel-box/pom.xml | 2 +-
components/camel-braintree/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/braintree/braintree.json | 2 +-
components/camel-browse/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/browse/browse.json | 2 +-
components/camel-caffeine-lrucache/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/caffeine-lrucache.json | 2 +-
components/camel-caffeine/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/caffeine/cache/caffeine-cache.json | 2 +-
.../caffeine/load/caffeine-loadcache.json | 2 +-
components/camel-cassandraql/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/cassandra/cql.json | 2 +-
components/camel-cbor/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../org/apache/camel/component/cbor/cbor.json | 2 +-
components/camel-cdi-jta/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/cdi-jta.json | 2 +-
components/camel-cdi-main/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/cdi-main.json | 2 +-
components/camel-cdi/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../camel-cdi/src/generated/resources/cdi.json | 2 +-
components/camel-chatscript/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/chatscript/chatscript.json | 2 +-
components/camel-chunk/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/chunk/chunk.json | 2 +-
components/camel-cloudevents/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/cloudevents.json | 2 +-
components/camel-cm-sms/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/cm/cm-sms.json | 2 +-
components/camel-coap/pom.xml | 4 +-
.../services/org/apache/camel/component.properties | 2 +-
.../resources/org/apache/camel/coap/coap+tcp.json | 2 +-
.../resources/org/apache/camel/coap/coap.json | 2 +-
.../resources/org/apache/camel/coap/coaps+tcp.json | 2 +-
.../resources/org/apache/camel/coap/coaps.json | 2 +-
components/camel-cometd/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/cometd/cometd.json | 2 +-
.../org/apache/camel/component/cometd/cometds.json | 2 +-
components/camel-consul/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/consul/consul.json | 2 +-
components/camel-controlbus/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/controlbus/controlbus.json | 2 +-
components/camel-corda/pom.xml | 4 +-
.../services/org/apache/camel/component.properties | 4 +-
.../org/apache/camel/component/corda/corda.json | 4 +-
.../camel-corda/src/main/docs/corda-component.adoc | 5 +-
components/camel-couchbase/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/couchbase/couchbase.json | 2 +-
components/camel-couchdb/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/couchdb/couchdb.json | 2 +-
components/camel-cron/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/cron/cron.json | 2 +-
components/camel-crypto/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../org/apache/camel/component/crypto/crypto.json | 2 +-
.../org/apache/camel/converter/crypto/crypto.json | 2 +-
.../org/apache/camel/converter/crypto/pgp.json | 2 +-
components/camel-csimple-joor/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/csimple-joor.json | 2 +-
.../language/csimple/joor/OriginalSimpleTest.java | 7 +
components/camel-csv/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../org/apache/camel/dataformat/csv/csv.json | 2 +-
components/camel-cxf/camel-cxf-common/pom.xml | 2 +-
.../component/cxf/converter/CachedCxfPayload.java | 7 +
components/camel-cxf/camel-cxf-rest/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/cxf/jaxrs/cxfrs.json | 2 +-
components/camel-cxf/camel-cxf-soap/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/cxf/jaxws/cxf.json | 2 +-
.../camel-cxf/camel-cxf-spring-common/pom.xml | 2 +-
components/camel-cxf/camel-cxf-spring-rest/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/cxf-spring-rest.json | 2 +-
components/camel-cxf/camel-cxf-spring-soap/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/cxf-spring-soap.json | 2 +-
.../camel-cxf/camel-cxf-spring-transport/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../generated/resources/cxf-spring-transport.json | 2 +-
components/camel-cxf/camel-cxf-transport/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/cxf-transport.json | 2 +-
components/camel-cxf/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
components/camel-dataformat/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/dataformat/dataformat.json | 2 +-
components/camel-dataset/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/dataset/dataset-test.json | 2 +-
.../apache/camel/component/dataset/dataset.json | 2 +-
components/camel-datasonnet/pom.xml | 2 +-
.../services/org/apache/camel/language.properties | 2 +-
.../camel/language/datasonnet/datasonnet.json | 2 +-
.../camel-debezium-common-component/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/debezium-common.json | 2 +-
.../camel-debezium-maven-plugin/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../generated/resources/debezium-maven-plugin.json | 2 +-
.../camel-debezium/camel-debezium-common/pom.xml | 2 +-
.../camel-debezium/camel-debezium-db2/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/debezium/debezium-db2.json | 2 +-
.../camel-debezium/camel-debezium-mongodb/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/debezium/debezium-mongodb.json | 2 +-
.../camel-debezium/camel-debezium-mysql/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/debezium/debezium-mysql.json | 2 +-
.../camel-debezium/camel-debezium-oracle/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/debezium/debezium-oracle.json | 2 +-
.../camel-debezium/camel-debezium-postgres/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/debezium/debezium-postgres.json | 2 +-
.../camel-debezium-sqlserver/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/debezium/debezium-sqlserver.json | 2 +-
components/camel-debezium/pom.xml | 2 +-
components/camel-debug/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../camel-debug/src/generated/resources/debug.json | 2 +-
components/camel-dhis2/camel-dhis2-api/pom.xml | 25 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/dhis2-api.json | 2 +-
.../apache/camel/component/dhis2/api/Dhis2Get.java | 22 +-
.../camel/component/dhis2/api/Dhis2Resource.java | 22 +
.../component/dhis2/api/Dhis2GetTestCase.java | 66 +-
.../camel-dhis2/camel-dhis2-component/pom.xml | 7 +-
.../component/dhis2/Dhis2ConvertersLoader.java | 51 +
.../component/dhis2/Dhis2EndpointUriFactory.java | 2 +-
.../dhis2/Dhis2GetEndpointConfiguration.java | 24 +-
.../Dhis2GetEndpointConfigurationConfigurer.java | 14 +-
.../dhis2/internal/Dhis2ApiCollection.java | 2 +-
.../dhis2/internal/Dhis2GetApiMethod.java | 2 +-
.../services/org/apache/camel/TypeConverterLoader | 2 +
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/dhis2/dhis2.json | 6 +-
.../src/main/docs/dhis2-component.adoc | 192 +-
.../camel/component/dhis2/Dhis2Converters.java | 41 +
.../camel/component/dhis2/Dhis2DeleteIT.java | 2 +-
.../apache/camel/component/dhis2/Dhis2GetIT.java | 39 +-
.../apache/camel/component/dhis2/Dhis2PostIT.java | 2 +-
.../apache/camel/component/dhis2/Dhis2PutIT.java | 9 +-
.../component/dhis2/Dhis2ResourceTablesIT.java | 5 +-
.../apache/camel/component/dhis2/Environment.java | 11 +-
components/camel-dhis2/pom.xml | 4 +-
components/camel-digitalocean/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/digitalocean/digitalocean.json | 2 +-
components/camel-direct/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/direct/direct.json | 2 +-
components/camel-directvm/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/directvm/direct-vm.json | 2 +-
components/camel-disruptor/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/disruptor/disruptor-vm.json | 2 +-
.../camel/component/disruptor/disruptor.json | 2 +-
components/camel-djl/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/djl/djl.json | 2 +-
components/camel-dns/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/dns/dns.json | 2 +-
components/camel-docker/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/docker/docker.json | 2 +-
components/camel-drill/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/drill/drill.json | 2 +-
components/camel-dropbox/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/dropbox/dropbox.json | 2 +-
components/camel-dynamic-router/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/dynamicrouter/dynamic-router.json | 2 +-
components/camel-ehcache/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/ehcache/ehcache.json | 2 +-
components/camel-elasticsearch-rest/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../elasticsearch/elasticsearch-rest.json | 2 +-
components/camel-elasticsearch/pom.xml | 2 +-
.../es/ElasticsearchComponentConfigurer.java | 6 +
.../es/ElasticsearchEndpointConfigurer.java | 6 +
.../es/ElasticsearchEndpointUriFactory.java | 3 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/es/elasticsearch.json | 7 +-
.../src/main/docs/elasticsearch-component.adoc | 12 +-
.../camel/component/es/ElasticsearchComponent.java | 18 +
.../component/es/ElasticsearchConfiguration.java | 17 +
.../camel/component/es/ElasticsearchConstants.java | 3 +
.../camel/component/es/ElasticsearchProducer.java | 5 +
.../ElasticsearchActionRequestConverter.java | 43 +-
.../es/integration/ElasticsearchBulkIT.java | 7 +-
...ElasticsearchGetSearchDeleteExistsUpdateIT.java | 161 +-
components/camel-elytron/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/elytron.json | 2 +-
components/camel-etcd3/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/etcd3/etcd3.json | 2 +-
components/camel-exec/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/exec/exec.json | 2 +-
components/camel-facebook/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/facebook/facebook.json | 2 +-
components/camel-fastjson/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../apache/camel/component/fastjson/fastjson.json | 2 +-
components/camel-fhir/camel-fhir-api/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/fhir-api.json | 2 +-
components/camel-fhir/camel-fhir-component/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../org/apache/camel/component/fhir/fhir.json | 2 +-
.../org/apache/camel/component/fhir/fhirJson.json | 2 +-
.../org/apache/camel/component/fhir/fhirXml.json | 2 +-
components/camel-fhir/pom.xml | 2 +-
components/camel-file-watch/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/file/watch/file-watch.json | 2 +-
components/camel-file/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/file/file.json | 2 +-
components/camel-flatpack/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../apache/camel/component/flatpack/flatpack.json | 2 +-
.../apache/camel/dataformat/flatpack/flatpack.json | 2 +-
.../camel/component/flatpack/DataSetList.java | 12 +-
components/camel-flink/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/flink/flink.json | 2 +-
components/camel-fop/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/fop/fop.json | 2 +-
components/camel-freemarker/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/freemarker/freemarker.json | 2 +-
components/camel-ftp/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/file/remote/ftp.json | 2 +-
.../apache/camel/component/file/remote/ftps.json | 2 +-
.../apache/camel/component/file/remote/sftp.json | 2 +-
.../component/file/remote/SftpOperations.java | 12 +-
components/camel-geocoder/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/geocoder/geocoder.json | 2 +-
components/camel-git/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/git/git.json | 2 +-
components/camel-github/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/github/github.json | 2 +-
.../camel-google/camel-google-bigquery/pom.xml | 10 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/google/bigquery/google-bigquery.json | 2 +-
.../google/bigquery/sql/google-bigquery-sql.json | 2 +-
.../camel-google/camel-google-calendar/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/google/calendar/google-calendar.json | 2 +-
.../calendar/stream/google-calendar-stream.json | 2 +-
components/camel-google/camel-google-drive/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/google/drive/google-drive.json | 2 +-
.../camel-google/camel-google-functions/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../google/functions/google-functions.json | 2 +-
components/camel-google/camel-google-mail/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/google/mail/google-mail.json | 2 +-
.../google/mail/stream/google-mail-stream.json | 2 +-
.../camel-google/camel-google-pubsub/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/google/pubsub/google-pubsub.json | 2 +-
.../camel-google-secret-manager/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../secret/manager/google-secret-manager.json | 2 +-
.../camel-google/camel-google-sheets/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/google/sheets/google-sheets.json | 2 +-
.../google/sheets/stream/google-sheets-stream.json | 2 +-
.../camel-google/camel-google-storage/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/google/storage/google-storage.json | 2 +-
.../google/storage/GoogleCloudStorageConsumer.java | 16 -
.../GoogleCloudStorageConsumerHealthCheck.java | 67 -
components/camel-google/pom.xml | 2 +-
components/camel-gora/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/gora/gora.json | 2 +-
components/camel-grape/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/grape/grape.json | 2 +-
components/camel-graphql/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/graphql/graphql.json | 2 +-
components/camel-grok/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../org/apache/camel/component/grok/grok.json | 2 +-
components/camel-groovy/pom.xml | 2 +-
.../services/org/apache/camel/language.properties | 2 +-
.../org/apache/camel/language/groovy/groovy.json | 2 +-
components/camel-grpc/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/grpc/grpc.json | 2 +-
components/camel-gson/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../org/apache/camel/component/gson/gson.json | 2 +-
components/camel-guava-eventbus/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/guava/eventbus/guava-eventbus.json | 2 +-
components/camel-hashicorp-vault/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/hashicorp/vault/hashicorp-vault.json | 2 +-
components/camel-hazelcast/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../atomicnumber/hazelcast-atomicvalue.json | 2 +-
.../hazelcast/instance/hazelcast-instance.json | 2 +-
.../component/hazelcast/list/hazelcast-list.json | 2 +-
.../component/hazelcast/map/hazelcast-map.json | 2 +-
.../hazelcast/multimap/hazelcast-multimap.json | 2 +-
.../component/hazelcast/queue/hazelcast-queue.json | 2 +-
.../replicatedmap/hazelcast-replicatedmap.json | 2 +-
.../hazelcast/ringbuffer/hazelcast-ringbuffer.json | 2 +-
.../component/hazelcast/seda/hazelcast-seda.json | 2 +-
.../component/hazelcast/set/hazelcast-set.json | 2 +-
.../component/hazelcast/topic/hazelcast-topic.json | 2 +-
components/camel-hbase/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/hbase/hbase.json | 2 +-
components/camel-hdfs/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/hdfs/hdfs.json | 2 +-
components/camel-headersmap/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/headersmap.json | 2 +-
components/camel-hl7/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../services/org/apache/camel/language.properties | 2 +-
.../org/apache/camel/component/hl7/hl7.json | 2 +-
.../org/apache/camel/component/hl7/hl7terser.json | 2 +-
components/camel-http-base/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/http-base.json | 2 +-
components/camel-http-common/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/http-common.json | 2 +-
components/camel-http/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/http/http.json | 2 +-
.../org/apache/camel/component/http/https.json | 2 +-
.../camel-huawei/camel-huaweicloud-common/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../generated/resources/huaweicloud-common.json | 2 +-
.../camel-huawei/camel-huaweicloud-dms/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/huaweicloud/dms/hwcloud-dms.json | 2 +-
.../camel-huawei/camel-huaweicloud-frs/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/huaweicloud/frs/hwcloud-frs.json | 2 +-
.../camel-huaweicloud-functiongraph/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/hwcloud-functiongraph.json | 2 +-
.../camel-huawei/camel-huaweicloud-iam/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/huaweicloud/iam/hwcloud-iam.json | 2 +-
.../camel-huaweicloud-imagerecognition/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../image/hwcloud-imagerecognition.json | 2 +-
.../camel-huawei/camel-huaweicloud-obs/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/huaweicloud/obs/hwcloud-obs.json | 2 +-
.../camel-huawei/camel-huaweicloud-smn/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/huaweicloud/smn/hwcloud-smn.json | 2 +-
components/camel-huawei/pom.xml | 2 +-
components/camel-hyperledger-aries/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/aries/hyperledger-aries.json | 2 +-
components/camel-ical/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../org/apache/camel/component/ical/ical.json | 2 +-
components/camel-iec60870/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/iec60870/client/iec60870-client.json | 2 +-
.../component/iec60870/server/iec60870-server.json | 2 +-
components/camel-ignite/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/ignite/cache/ignite-cache.json | 2 +-
.../component/ignite/compute/ignite-compute.json | 2 +-
.../component/ignite/events/ignite-events.json | 2 +-
.../camel/component/ignite/idgen/ignite-idgen.json | 2 +-
.../ignite/messaging/ignite-messaging.json | 2 +-
.../camel/component/ignite/queue/ignite-queue.json | 2 +-
.../camel/component/ignite/set/ignite-set.json | 2 +-
.../camel-infinispan-common/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/infinispan-common.json | 2 +-
.../camel-infinispan-embedded/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../infinispan/embedded/infinispan-embedded.json | 2 +-
.../camel-infinispan/camel-infinispan/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/infinispan/remote/infinispan.json | 2 +-
components/camel-infinispan/pom.xml | 2 +-
components/camel-influxdb/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/influxdb/influxdb.json | 2 +-
components/camel-influxdb2/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/influxdb2/influxdb2.json | 4 +-
.../src/main/docs/influxdb2-component.adoc | 2 +-
components/camel-iota/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/iota/iota.json | 2 +-
components/camel-ipfs/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/ipfs/ipfs.json | 2 +-
components/camel-irc/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/irc/irc.json | 2 +-
components/camel-ironmq/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/ironmq/ironmq.json | 2 +-
components/camel-jackson-avro/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../camel/component/jackson/avro/avroJackson.json | 2 +-
components/camel-jackson-protobuf/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../jackson/protobuf/protobufJackson.json | 2 +-
components/camel-jackson/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../apache/camel/component/jackson/jackson.json | 2 +-
components/camel-jacksonxml/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../camel/component/jacksonxml/jacksonXml.json | 2 +-
components/camel-jasypt/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/jasypt.json | 2 +-
components/camel-javascript/pom.xml | 2 +-
.../services/org/apache/camel/language.properties | 2 +-
.../resources/org/apache/camel/language/js/js.json | 4 +-
.../src/main/docs/js-language.adoc | 2 +-
components/camel-jaxb/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../org/apache/camel/converter/jaxb/jaxb.json | 2 +-
components/camel-jbpm/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/jbpm/jbpm.json | 2 +-
components/camel-jcache/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/jcache/jcache.json | 2 +-
components/camel-jclouds/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/jclouds/jclouds.json | 2 +-
components/camel-jcr/pom.xml | 4 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/jcr/jcr.json | 2 +-
.../camel/component/jcr/JcrAuthTestBase.java | 4 +-
.../camel/component/jcr/JcrRouteTestSupport.java | 7 +-
components/camel-jdbc/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/jdbc/jdbc.json | 2 +-
components/camel-jetty-common/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/jetty-common.json | 2 +-
components/camel-jetty/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/jetty10/jetty.json | 2 +-
components/camel-jfr/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../camel-jfr/src/generated/resources/jfr.json | 2 +-
components/camel-jgroups-raft/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/jgroups/raft/jgroups-raft.json | 2 +-
components/camel-jgroups/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/jgroups/jgroups.json | 2 +-
components/camel-jira/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/jira/jira.json | 3 +-
.../camel-jira/src/main/docs/jira-component.adoc | 21 +-
.../apache/camel/component/jira/JiraConstants.java | 2 +
.../component/jira/producer/AddIssueProducer.java | 7 +
.../jira/producer/UpdateIssueProducer.java | 8 +
components/camel-jms/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/jms/jms.json | 2 +-
.../camel/component/jms/JmsSendDynamicAware.java | 9 +-
.../jms/JmsToFullyQualifiedQueueNameTest.java | 77 +
components/camel-jmx/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/jmx/jmx.json | 2 +-
components/camel-johnzon/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../apache/camel/component/johnzon/johnzon.json | 2 +-
components/camel-jolt/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/jolt/jolt.json | 2 +-
components/camel-jooq/pom.xml | 13 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/jooq/jooq.json | 2 +-
components/camel-joor/pom.xml | 2 +-
.../services/org/apache/camel/language.properties | 2 +-
.../org/apache/camel/language/joor/joor.json | 2 +-
components/camel-jpa/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/jpa/jpa.json | 2 +-
components/camel-jq/pom.xml | 2 +-
.../services/org/apache/camel/language.properties | 2 +-
.../resources/org/apache/camel/language/jq/jq.json | 2 +-
components/camel-jsch/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/scp/scp.json | 2 +-
components/camel-jslt/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/jslt/jslt.json | 2 +-
components/camel-json-patch/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/jsonpatch/json-patch.json | 2 +-
components/camel-json-validator/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/jsonvalidator/json-validator.json | 2 +-
components/camel-jsonapi/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../apache/camel/component/jsonapi/jsonApi.json | 2 +-
components/camel-jsonata/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/jsonata/jsonata.json | 2 +-
components/camel-jsonb/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../org/apache/camel/component/jsonb/jsonb.json | 2 +-
components/camel-jsonpath/pom.xml | 2 +-
.../services/org/apache/camel/language.properties | 2 +-
.../org/apache/camel/jsonpath/jsonpath.json | 2 +-
components/camel-jt400/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/jt400/jt400.json | 2 +-
components/camel-jta/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../camel-jta/src/generated/resources/jta.json | 2 +-
components/camel-kafka/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/kafka/kafka.json | 14 +-
.../camel/component/kafka/KafkaConfiguration.java | 14 +-
.../camel/component/kafka/KafkaFetchRecords.java | 7 +-
.../camel/component/kafka/KafkaProducer.java | 12 +-
.../errorhandler/ReconnectErrorStrategy.java | 18 +-
components/camel-kamelet/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/kamelet/kamelet.json | 2 +-
components/camel-knative/camel-knative-api/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/knative-api.json | 2 +-
.../camel-knative/camel-knative-component/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/knative/knative.json | 2 +-
.../camel-knative/camel-knative-http/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/knative-http.json | 2 +-
components/camel-knative/pom.xml | 2 +-
components/camel-kubernetes/pom.xml | 2 +-
...ernetesPersistentVolumesEndpointConfigurer.java | 3 +
...ernetesPersistentVolumesEndpointUriFactory.java | 3 +-
...sPersistentVolumesClaimsEndpointConfigurer.java | 3 +
...sPersistentVolumesClaimsEndpointUriFactory.java | 3 +-
...KubernetesResourcesQuotaEndpointConfigurer.java | 3 +
...KubernetesResourcesQuotaEndpointUriFactory.java | 3 +-
.../KubernetesSecretsEndpointConfigurer.java | 3 +
.../KubernetesSecretsEndpointUriFactory.java | 3 +-
...ubernetesServiceAccountsEndpointConfigurer.java | 3 +
...ubernetesServiceAccountsEndpointUriFactory.java | 3 +-
.../OpenshiftBuildConfigsEndpointConfigurer.java | 3 +
.../OpenshiftBuildConfigsEndpointUriFactory.java | 3 +-
.../builds/OpenshiftBuildsEndpointConfigurer.java | 3 +
.../builds/OpenshiftBuildsEndpointUriFactory.java | 3 +-
.../services/org/apache/camel/component.properties | 2 +-
.../config_maps/kubernetes-config-maps.json | 4 +-
.../kubernetes-custom-resources.json | 4 +-
.../deployments/kubernetes-deployments.json | 4 +-
.../kubernetes/events/kubernetes-events.json | 6 +-
.../component/kubernetes/hpa/kubernetes-hpa.json | 4 +-
.../component/kubernetes/job/kubernetes-job.json | 4 +-
.../namespaces/kubernetes-namespaces.json | 4 +-
.../kubernetes/nodes/kubernetes-nodes.json | 4 +-
.../kubernetes-persistent-volumes.json | 3 +-
.../kubernetes-persistent-volumes-claims.json | 3 +-
.../component/kubernetes/pods/kubernetes-pods.json | 4 +-
.../kubernetes-replication-controllers.json | 4 +-
.../kubernetes-resources-quota.json | 3 +-
.../kubernetes/secrets/kubernetes-secrets.json | 3 +-
.../kubernetes-service-accounts.json | 3 +-
.../kubernetes/services/kubernetes-services.json | 4 +-
.../build_configs/openshift-build-configs.json | 3 +-
.../openshift/builds/openshift-builds.json | 3 +-
.../openshift-deploymentconfigs.json | 4 +-
.../src/main/docs/kubernetes-events-component.adoc | 2 +-
.../kubernetes/KubernetesConfiguration.java | 2 +-
components/camel-kudu/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/kudu/kudu.json | 2 +-
components/camel-language/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/language/language.json | 2 +-
components/camel-ldap/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/ldap/ldap.json | 2 +-
components/camel-ldif/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/ldif/ldif.json | 2 +-
components/camel-leveldb/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/leveldb.json | 2 +-
components/camel-log/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/log/log.json | 2 +-
components/camel-lra/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../camel-lra/src/generated/resources/lra.json | 2 +-
.../org/apache/camel/service/lra/LRAClient.java | 37 +-
.../apache/camel/service/lra/LRASagaService.java | 12 +-
.../apache/camel/service/lra/LRAClientTest.java | 66 +
.../camel/service/lra/LRASagaServiceTest.java | 75 +
components/camel-lucene/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/lucene/lucene.json | 2 +-
components/camel-lumberjack/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/lumberjack/lumberjack.json | 2 +-
components/camel-lzf/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../org/apache/camel/dataformat/lzf/lzf.json | 2 +-
components/camel-mail-microsoft-oauth/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../generated/resources/mail-microsoft-oauth.json | 2 +-
components/camel-mail/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../org/apache/camel/component/mail/imap.json | 2 +-
.../org/apache/camel/component/mail/imaps.json | 2 +-
.../org/apache/camel/component/mail/pop3.json | 2 +-
.../org/apache/camel/component/mail/pop3s.json | 2 +-
.../org/apache/camel/component/mail/smtp.json | 2 +-
.../org/apache/camel/component/mail/smtps.json | 2 +-
.../dataformat/mime/multipart/mimeMultipart.json | 2 +-
components/camel-mapstruct/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/mapstruct/mapstruct.json | 2 +-
.../src/main/docs/mapstruct-component.adoc | 4 +
.../mapstruct/DefaultMapStructFinder.java | 11 +-
.../component/mapstruct/CarToVehicleTest.java | 81 +
.../component/mapstruct/mapper/VehicleMapper.java | 31 +
components/camel-master/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/master/master.json | 2 +-
components/camel-metrics/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/metrics/metrics.json | 2 +-
components/camel-micrometer/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/micrometer/micrometer.json | 2 +-
.../camel-microprofile-config/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../generated/resources/microprofile-config.json | 2 +-
.../camel-microprofile-fault-tolerance/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../resources/microprofile-fault-tolerance.json | 2 +-
.../camel-microprofile-health/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../generated/resources/microprofile-health.json | 2 +-
.../camel-microprofile-metrics/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../microprofile/metrics/microprofile-metrics.json | 2 +-
components/camel-microprofile/pom.xml | 2 +-
components/camel-milo/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/milo/browse/milo-browse.json | 2 +-
.../camel/component/milo/client/milo-client.json | 2 +-
.../camel/component/milo/server/milo-server.json | 2 +-
components/camel-mina/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/mina/mina.json | 2 +-
components/camel-minio/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/minio/minio.json | 2 +-
.../camel-minio/src/main/docs/minio-component.adoc | 4 +-
components/camel-mllp/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/mllp/mllp.json | 2 +-
.../component/mllp/MllpProtocolConstants.java | 25 +-
components/camel-mock/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/mock/mock.json | 2 +-
.../apache/camel/component/mock/MockEndpoint.java | 25 +
components/camel-mongodb-gridfs/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/mongodb/gridfs/mongodb-gridfs.json | 2 +-
components/camel-mongodb/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/mongodb/mongodb.json | 2 +-
components/camel-mustache/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/mustache/mustache.json | 2 +-
components/camel-mvel/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../services/org/apache/camel/language.properties | 2 +-
.../org/apache/camel/component/mvel/mvel.json | 2 +-
.../org/apache/camel/language/mvel/mvel.json | 2 +-
components/camel-mybatis/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/mybatis/mybatis-bean.json | 2 +-
.../apache/camel/component/mybatis/mybatis.json | 2 +-
components/camel-nats/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/nats/nats.json | 2 +-
components/camel-netty-http/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/netty/http/netty-http.json | 2 +-
.../netty/http/DefaultNettyHttpBinding.java | 5 +-
.../netty/http/HttpClientInitializerFactory.java | 9 +-
.../netty/http/NettyChannelBufferStreamCache.java | 4 +
.../component/netty/http/NettyHttpEndpoint.java | 11 +
.../netty/http/NettyHttpProducerProxyModeTest.java | 58 +
.../component/netty/http/NettyHttpSSLSNITest.java | 135 +
components/camel-netty/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/netty/netty.json | 2 +-
.../camel-netty/src/main/docs/netty-component.adoc | 2 +-
components/camel-nitrite/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/nitrite/nitrite.json | 2 +-
components/camel-oaipmh/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/oaipmh/component/oaipmh.json | 2 +-
components/camel-observation/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/observation.json | 2 +-
components/camel-ognl/pom.xml | 2 +-
.../services/org/apache/camel/language.properties | 2 +-
.../org/apache/camel/language/ognl/ognl.json | 2 +-
components/camel-olingo2/camel-olingo2-api/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/olingo2-api.json | 2 +-
.../camel-olingo2/camel-olingo2-component/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/olingo2/olingo2.json | 2 +-
components/camel-olingo2/pom.xml | 2 +-
components/camel-olingo4/camel-olingo4-api/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/olingo4-api.json | 2 +-
.../camel-olingo4/camel-olingo4-component/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/olingo4/olingo4.json | 2 +-
components/camel-olingo4/pom.xml | 2 +-
components/camel-openapi-java/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/openapi-java.json | 2 +-
components/camel-openstack/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../openstack/cinder/openstack-cinder.json | 2 +-
.../openstack/glance/openstack-glance.json | 2 +-
.../openstack/keystone/openstack-keystone.json | 2 +-
.../openstack/neutron/openstack-neutron.json | 2 +-
.../component/openstack/nova/openstack-nova.json | 2 +-
.../component/openstack/swift/openstack-swift.json | 2 +-
components/camel-opentelemetry/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/opentelemetry.json | 2 +-
.../camel/opentelemetry/NoopTracingStrategy.java | 34 +
.../OpenTelemetryTracingStrategy.java | 111 +
.../CamelOpenTelemetryTestSupport.java | 7 +
.../OpenTelemetryTracingStrategyTest.java | 95 +
components/camel-opentracing/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/opentracing.json | 2 +-
components/camel-optaplanner/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/optaplanner/optaplanner.json | 2 +-
components/camel-paho-mqtt5/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/paho/mqtt5/paho-mqtt5.json | 2 +-
.../component/paho/mqtt5/PahoMqtt5Endpoint.java | 6 +-
.../paho/mqtt5/PahoMqtt5ComponentMqtt5Test.java | 20 +
components/camel-paho/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/paho/paho.json | 2 +-
components/camel-pdf/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/pdf/pdf.json | 2 +-
components/camel-pg-replication-slot/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../pg/replication/slot/pg-replication-slot.json | 2 +-
components/camel-pgevent/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/pgevent/pgevent.json | 2 +-
components/camel-platform-http-vertx/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../generated/resources/platform-http-vertx.json | 2 +-
.../http/vertx/VertxPlatformHttpSupport.java | 2 +-
components/camel-platform-http/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/platform/http/platform-http.json | 2 +-
components/camel-plc4x/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/plc4x/plc4x.json | 4 +-
.../camel-plc4x/src/main/docs/plc4x-component.adoc | 2 +-
components/camel-printer/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/printer/lpr.json | 2 +-
components/camel-protobuf/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../apache/camel/dataformat/protobuf/protobuf.json | 2 +-
components/camel-pubnub/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/pubnub/pubnub.json | 2 +-
components/camel-pulsar/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/pulsar/pulsar.json | 2 +-
components/camel-python/pom.xml | 2 +-
.../services/org/apache/camel/language.properties | 2 +-
.../org/apache/camel/language/python/python.json | 2 +-
components/camel-quartz/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/quartz/quartz.json | 2 +-
components/camel-quickfix/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/quickfixj/quickfix.json | 2 +-
components/camel-rabbitmq/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/rabbitmq/rabbitmq.json | 2 +-
.../camel/component/rabbitmq/RabbitConsumer.java | 13 +-
.../camel/component/rabbitmq/RabbitMQConsumer.java | 7 +
components/camel-reactive-executor-tomcat/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../resources/reactive-executor-tomcat.json | 2 +-
components/camel-reactive-executor-vertx/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../resources/reactive-executor-vertx.json | 2 +-
components/camel-reactive-streams/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../reactive/streams/reactive-streams.json | 2 +-
components/camel-reactor/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/reactor.json | 2 +-
components/camel-redis/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../camel-redis/src/generated/resources/redis.json | 2 +-
components/camel-ref/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/ref/ref.json | 2 +-
components/camel-resilience4j/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/resilience4j.json | 2 +-
components/camel-resourceresolver-github/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../resources/resourceresolver-github.json | 2 +-
components/camel-rest-openapi/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/rest/openapi/rest-openapi.json | 2 +-
components/camel-rest-swagger/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/rest/swagger/rest-swagger.json | 2 +-
components/camel-rest/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/rest/rest-api.json | 2 +-
.../org/apache/camel/component/rest/rest.json | 2 +-
.../apache/camel/component/rest/RestComponent.java | 30 +-
components/camel-resteasy/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/resteasy/resteasy.json | 2 +-
components/camel-robotframework/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/robotframework/robotframework.json | 2 +-
components/camel-rocketmq/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/rocketmq/rocketmq.json | 4 +-
.../src/main/docs/rocketmq-component.adoc | 2 +-
components/camel-rss/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../org/apache/camel/component/rss/rss.json | 2 +-
.../org/apache/camel/dataformat/rss/rss.json | 2 +-
components/camel-rxjava/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/rxjava.json | 2 +-
components/camel-saga/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/saga/saga.json | 2 +-
.../camel-salesforce-codegen/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../generated/resources/salesforce-codegen.json | 2 +-
.../camel-salesforce-component/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/salesforce/salesforce.json | 2 +-
.../camel-salesforce-maven-plugin/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../resources/salesforce-maven-plugin.json | 2 +-
components/camel-salesforce/pom.xml | 2 +-
components/camel-sap-netweaver/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/sap/netweaver/sap-netweaver.json | 2 +-
components/camel-saxon/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../services/org/apache/camel/language.properties | 2 +-
.../org/apache/camel/component/xquery/xquery.json | 2 +-
.../org/apache/camel/language/xquery/xquery.json | 2 +-
components/camel-scheduler/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/scheduler/scheduler.json | 2 +-
components/camel-schematron/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/schematron/schematron.json | 2 +-
components/camel-seda/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/seda/seda.json | 2 +-
components/camel-service/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/service/service.json | 2 +-
.../camel-servicenow-component/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/servicenow/servicenow.json | 2 +-
.../camel-servicenow-maven-plugin/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../resources/servicenow-maven-plugin.json | 2 +-
components/camel-servicenow/pom.xml | 2 +-
components/camel-servlet/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/servlet/servlet.json | 2 +-
components/camel-shiro/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../camel-shiro/src/generated/resources/shiro.json | 2 +-
components/camel-sjms/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/sjms/sjms.json | 2 +-
components/camel-sjms2/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/sjms2/sjms2.json | 2 +-
components/camel-slack/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/slack/slack.json | 2 +-
components/camel-smpp/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/smpp/smpp.json | 2 +-
.../org/apache/camel/component/smpp/smpps.json | 2 +-
components/camel-snakeyaml/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../camel/component/snakeyaml/snakeYaml.json | 2 +-
.../component/snakeyaml/SnakeYAMLDataFormat.java | 11 +-
.../custom/CustomClassLoaderConstructor.java | 9 +-
.../component/snakeyaml/SnakeYAMLDoSTest.java | 33 +-
components/camel-snmp/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/snmp/snmp.json | 2 +-
components/camel-soap/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../org/apache/camel/dataformat/soap/soap.json | 2 +-
components/camel-solr/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/solr/solr.json | 2 +-
.../org/apache/camel/component/solr/solrCloud.json | 2 +-
.../org/apache/camel/component/solr/solrs.json | 2 +-
components/camel-spark/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/spark/spark.json | 2 +-
components/camel-splunk-hec/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/splunkhec/splunk-hec.json | 2 +-
components/camel-splunk/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/splunk/splunk.json | 2 +-
components/camel-spring-batch/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/spring/batch/spring-batch.json | 2 +-
components/camel-spring-integration/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../spring/integration/spring-integration.json | 2 +-
components/camel-spring-jdbc/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/spring/jdbc/spring-jdbc.json | 2 +-
components/camel-spring-ldap/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/springldap/spring-ldap.json | 2 +-
components/camel-spring-main/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/spring-main.json | 2 +-
components/camel-spring-rabbitmq/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/springrabbit/spring-rabbitmq.json | 2 +-
components/camel-spring-redis/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/redis/spring-redis.json | 2 +-
components/camel-spring-security/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/spring-security.json | 2 +-
components/camel-spring-ws/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/spring/ws/spring-ws.json | 2 +-
components/camel-spring-xml/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/spring-xml.json | 2 +-
...SpringDefaultErrorHandlerRedeliveryRefTest.java | 30 +
.../processor/SpringStreamCachingStrategyTest.java | 5 +
.../DefaultErrorHandlerRedeliveryRefTest.xml | 44 +
.../processor/SpringStreamCachingStrategyTest.xml | 3 +-
components/camel-spring/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../services/org/apache/camel/language.properties | 2 +-
.../apache/camel/component/event/spring-event.json | 2 +-
.../org/apache/camel/language/spel/spel.json | 2 +-
components/camel-sql/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/sql/sql.json | 2 +-
.../camel/component/sql/stored/sql-stored.json | 2 +-
.../apache/camel/component/sql/SqlProducer.java | 4 +-
.../idempotent/jdbc/JdbcMessageIdRepository.java | 36 +-
components/camel-ssh/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/ssh/ssh.json | 2 +-
components/camel-stax/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../services/org/apache/camel/language.properties | 2 +-
.../org/apache/camel/component/stax/stax.json | 2 +-
.../camel/language/xtokenizer/xtokenize.json | 2 +-
components/camel-stitch/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/stitch/stitch.json | 2 +-
components/camel-stomp/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/stomp/stomp.json | 2 +-
components/camel-stream/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/stream/stream.json | 2 +-
components/camel-stringtemplate/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/stringtemplate/string-template.json | 2 +-
components/camel-stub/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/stub/stub.json | 2 +-
components/camel-swagger-java/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/swagger-java.json | 2 +-
components/camel-swift/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../apache/camel/dataformat/swift/mt/swiftMt.json | 4 +-
.../apache/camel/dataformat/swift/mx/swiftMx.json | 4 +-
.../src/main/docs/swiftMt-dataformat.adoc | 2 +-
.../src/main/docs/swiftMx-dataformat.adoc | 2 +-
components/camel-syslog/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../org/apache/camel/component/syslog/syslog.json | 2 +-
components/camel-tarfile/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../apache/camel/dataformat/tarfile/tarFile.json | 2 +-
components/camel-telegram/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/telegram/telegram.json | 2 +-
.../camel-test/camel-test-cdi-junit5/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/test-cdi-junit5.json | 2 +-
components/camel-test/camel-test-cdi/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/test-cdi.json | 2 +-
components/camel-test/camel-test-junit5/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/test-junit5.json | 2 +-
.../camel-test/camel-test-main-junit5/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/test-main-junit5.json | 2 +-
.../camel-test/camel-test-spring-junit5/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../generated/resources/test-spring-junit5.json | 2 +-
components/camel-test/camel-test-spring/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/test-spring.json | 2 +-
components/camel-test/camel-test/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../camel-test/src/generated/resources/test.json | 2 +-
components/camel-test/pom.xml | 2 +-
components/camel-threadpoolfactory-vertx/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../resources/threadpoolfactory-vertx.json | 2 +-
components/camel-thrift/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../org/apache/camel/component/thrift/thrift.json | 2 +-
.../org/apache/camel/dataformat/thrift/thrift.json | 2 +-
components/camel-tika/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/tika/tika.json | 2 +-
components/camel-timer/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/timer/timer.json | 2 +-
components/camel-tracing/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/tracing.json | 2 +-
components/camel-twilio/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/twilio/twilio.json | 2 +-
components/camel-twitter/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../directmessage/twitter-directmessage.json | 2 +-
.../component/twitter/search/twitter-search.json | 2 +-
.../twitter/timeline/twitter-timeline.json | 2 +-
components/camel-undertow-spring-security/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../resources/undertow-spring-security.json | 2 +-
components/camel-undertow/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/undertow/undertow.json | 2 +-
components/camel-univocity-parsers/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../camel/dataformat/univocity/univocityCsv.json | 2 +-
.../camel/dataformat/univocity/univocityFixed.json | 2 +-
.../camel/dataformat/univocity/univocityTsv.json | 2 +-
components/camel-validator/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/validator/validator.json | 2 +-
components/camel-velocity/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/velocity/velocity.json | 2 +-
components/camel-vertx/camel-vertx-common/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/vertx-common.json | 2 +-
components/camel-vertx/camel-vertx-http/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/vertx/http/vertx-http.json | 2 +-
.../vertx/http/DefaultVertxHttpBinding.java | 49 +-
.../http/VertxHttpMaximumRedeliveriesTest.java | 60 +
.../http/VertxHttpThrowExceptionOnFailureTest.java | 2 +-
.../camel-vertx/camel-vertx-websocket/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../component/vertx/websocket/vertx-websocket.json | 2 +-
components/camel-vertx/camel-vertx/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/vertx/vertx.json | 2 +-
components/camel-vertx/pom.xml | 2 +-
components/camel-vm/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/vm/vm.json | 2 +-
components/camel-wal/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../camel-wal/src/generated/resources/wal.json | 4 +-
components/camel-wal/src/main/docs/wal.adoc | 2 +-
components/camel-weather/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/weather/weather.json | 2 +-
components/camel-web3j/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/web3j/web3j.json | 2 +-
components/camel-webhook/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/webhook/webhook.json | 2 +-
components/camel-websocket-jsr356/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/websocket/jsr356/websocket-jsr356.json | 2 +-
components/camel-websocket/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/websocket/websocket.json | 2 +-
components/camel-weka/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/weka/weka.json | 2 +-
components/camel-whatsapp/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/whatsapp/whatsapp.json | 2 +-
components/camel-wordpress/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/wordpress/wordpress.json | 2 +-
components/camel-workday/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/workday/workday.json | 2 +-
components/camel-xchange/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/xchange/xchange.json | 2 +-
.../xchange/account/AccountProducerTest.java | 2 +
.../xchange/market/MarketDataProducerTest.java | 2 +
.../xchange/metadata/MetaDataProducerTest.java | 2 +
components/camel-xj/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/xj/xj.json | 2 +-
components/camel-xmlsecurity/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../component/xmlsecurity/xmlsecurity-sign.json | 2 +-
.../component/xmlsecurity/xmlsecurity-verify.json | 2 +-
.../camel/dataformat/xmlsecurity/xmlSecurity.json | 2 +-
components/camel-xmpp/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/xmpp/xmpp.json | 2 +-
components/camel-xpath/pom.xml | 2 +-
.../services/org/apache/camel/language.properties | 2 +-
.../org/apache/camel/language/xpath/xpath.json | 2 +-
components/camel-xslt-saxon/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/xslt/saxon/xslt-saxon.json | 2 +-
components/camel-xslt/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/xslt/xslt.json | 2 +-
components/camel-xstream/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../apache/camel/dataformat/xstream/xstream.json | 2 +-
.../camel/dataformat/xstream/xstreamJson.json | 2 +-
components/camel-zeebe/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../org/apache/camel/component/zeebe/zeebe.json | 2 +-
.../camel-zeebe/src/main/docs/zeebe-component.adoc | 2 +
.../camel/component/zeebe/ZeebeProducer.java | 1 +
.../camel/component/zeebe/model/JobRequest.java | 2 +-
.../component/zeebe/model/MessageRequest.java | 2 +-
.../component/zeebe/model/ProcessRequest.java | 2 +-
.../apache/camel/component/zeebe/ThrowErrorIT.java | 106 +
components/camel-zendesk/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../apache/camel/component/zendesk/zendesk.json | 2 +-
components/camel-zip-deflater/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../camel/dataformat/deflater/gzipDeflater.json | 2 +-
.../camel/dataformat/deflater/zipDeflater.json | 2 +-
components/camel-zipfile/pom.xml | 2 +-
.../org/apache/camel/dataformat.properties | 2 +-
.../apache/camel/dataformat/zipfile/zipFile.json | 2 +-
.../zipfile/ZipSplitterUseOriginalMessageTest.java | 92 +
components/camel-zipkin/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/zipkin.json | 2 +-
components/camel-zookeeper-master/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../zookeepermaster/zookeeper-master.json | 2 +-
components/camel-zookeeper/pom.xml | 2 +-
.../services/org/apache/camel/component.properties | 2 +-
.../camel/component/zookeeper/zookeeper.json | 2 +-
components/pom.xml | 2 +-
core/camel-api/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
core/camel-api/src/generated/resources/api.json | 2 +-
.../java/org/apache/camel/ExtendedExchange.java | 6 +
.../src/main/java/org/apache/camel/Route.java | 1 +
.../main/java/org/apache/camel/StreamCache.java | 4 +
.../apache/camel/spi/StreamCachingStrategy.java | 37 +
.../camel/support/jsse/KeyStoreParameters.java | 8 +-
core/camel-base-engine/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/base-engine.json | 2 +-
.../camel/impl/engine/CamelInternalProcessor.java | 57 +-
.../impl/engine/DefaultStreamCachingStrategy.java | 87 +-
.../engine/DefaultSupervisingRouteController.java | 1 +
.../camel/impl/engine/DefaultUnitOfWork.java | 31 +-
.../org/apache/camel/impl/engine/RouteService.java | 4 +-
.../camel/impl/engine/StreamCachingHelper.java | 91 +
core/camel-base/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
core/camel-base/src/generated/resources/base.json | 2 +-
core/camel-cloud/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../camel-cloud/src/generated/resources/cloud.json | 2 +-
core/camel-cluster/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/cluster.json | 2 +-
core/camel-console/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/console.json | 2 +-
core/camel-core-all/pom.xml | 2 +-
core/camel-core-catalog/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/core-catalog.json | 2 +-
core/camel-core-engine/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/core-engine.json | 2 +-
core/camel-core-languages/pom.xml | 2 +-
.../services/org/apache/camel/language.properties | 2 +-
.../apache/camel/language/constant/constant.json | 2 +-
.../org/apache/camel/language/csimple/csimple.json | 2 +-
.../org/apache/camel/language/header/header.json | 2 +-
.../camel/language/property/exchangeProperty.json | 2 +-
.../org/apache/camel/language/ref/ref.json | 2 +-
.../org/apache/camel/language/simple/file.json | 2 +-
.../org/apache/camel/language/simple/simple.json | 2 +-
.../apache/camel/language/tokenizer/tokenize.json | 2 +-
.../modules/languages/pages/simple-language.adoc | 3 +
.../camel/language/csimple/CSimpleHelper.java | 4 +
.../simple/ast/SimpleFunctionExpression.java | 4 +
core/camel-core-model/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/core-model.json | 2 +-
.../model/errorhandler/deadLetterChannel.json | 4 +-
.../model/errorhandler/defaultErrorHandler.json | 4 +-
.../errorhandler/jtaTransactionErrorHandler.json | 4 +-
.../springTransactionErrorHandler.json | 4 +-
.../org/apache/camel/model/onCompletion.json | 2 +-
.../org/apache/camel/model/onException.json | 4 +-
.../org/apache/camel/builder/RouteBuilder.java | 20 +-
.../camel/builder/RouteConfigurationBuilder.java | 6 +
.../apache/camel/model/OnCompletionDefinition.java | 61 +-
.../apache/camel/model/OnExceptionDefinition.java | 18 +-
.../org/apache/camel/model/SendDefinition.java | 18 +-
.../DefaultErrorHandlerDefinition.java | 44 +-
core/camel-core-processor/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/core-processor.json | 2 +-
.../org/apache/camel/processor/LoopProcessor.java | 14 +
.../camel/processor/OnCompletionProcessor.java | 4 +
.../apache/camel/processor/saga/SagaProcessor.java | 11 +-
core/camel-core-reifier/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/core-reifier.json | 2 +-
.../errorhandler/DeadLetterChannelReifier.java | 7 +-
.../errorhandler/DefaultErrorHandlerReifier.java | 7 +-
core/camel-core-xml/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/core-xml.json | 2 +-
.../org/apache/camel/core/xml/streamCaching.json | 2 +
.../core/xml/AbstractCamelContextFactoryBean.java | 8 +
.../xml/CamelStreamCachingStrategyDefinition.java | 28 +
core/camel-core/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
core/camel-core/src/generated/resources/core.json | 2 +-
.../apache/camel/language/simple/SimpleTest.java | 9 +-
.../DefaultErrorHandlerRedeliveryRefTest.java | 74 +
.../apache/camel/processor/LoopExceptionTest.java | 1 +
...nModeBeforeConsumerExceptionSuppressedTest.java | 62 +
.../processor/StreamCachingAllowDenyTest.java | 161 +
.../DynamicRouterConcurrentEIPManualTest.java | 128 +
.../DynamicRouterConcurrentPOJOManualTest.java | 127 +
.../DynamicRouterConcurrentPOJOTest.java | 82 -
...OnExceptionUseOriginalMessageStreamTwoTest.java | 102 +
.../org/apache/camel/util/MessageHelperTest.java | 4 +-
core/camel-health/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/health.json | 2 +-
.../apache/camel/impl/health/RouteHealthCheck.java | 14 +-
core/camel-main/pom.xml | 2 +-
.../MainConfigurationPropertiesConfigurer.java | 12 +
.../camel-main-configuration-metadata.json | 2 +
.../services/org/apache/camel/other.properties | 2 +-
core/camel-main/src/generated/resources/main.json | 2 +-
.../org/apache/camel/main/components.properties | 1 +
core/camel-main/src/main/docs/main.adoc | 4 +-
.../org/apache/camel/main/BaseMainSupport.java | 75 +-
.../camel/main/DefaultConfigurationConfigurer.java | 79 +-
.../camel/main/DefaultConfigurationProperties.java | 44 +
.../java/org/apache/camel/main/MainHelper.java | 14 +-
core/camel-management-api/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/management-api.json | 2 +-
.../mbean/ManagedStreamCachingStrategyMBean.java | 6 +
core/camel-management/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/management.json | 2 +-
.../mbean/ManagedStreamCachingStrategy.java | 22 +
core/camel-support/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/support.json | 2 +-
.../stream/ByteArrayInputStreamCache.java | 6 +-
.../converter/stream/FileInputStreamCache.java | 6 +-
.../camel/converter/stream/InputStreamCache.java | 2 +
.../apache/camel/converter/stream/ReaderCache.java | 6 +-
.../org/apache/camel/support/AbstractExchange.java | 8 +
.../org/apache/camel/support/ExchangeHelper.java | 1 +
.../org/apache/camel/support/MessageHelper.java | 2 +-
.../camel/support/builder/ExpressionBuilder.java | 18 +
.../apache/camel/support/cache/ServicePool.java | 15 +-
.../support/component/SendDynamicAwareSupport.java | 8 +-
core/camel-util/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
core/camel-util/src/generated/resources/util.json | 2 +-
.../java/org/apache/camel/util/SensitiveUtils.java | 2 +
.../org/apache/camel/util/SensitiveUtilsTest.java | 1 +
core/camel-xml-io-util/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/xml-io-util.json | 2 +-
core/camel-xml-io/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/xml-io.json | 2 +-
.../org/apache/camel/xml/in/ModelParserTest.java | 48 +
.../test/resources/errorHandlerConfiguration.xml | 29 +
...rrorHandlerConfigurationRedeliveryPolicyRef.xml | 26 +
core/camel-xml-jaxb/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/xml-jaxb.json | 2 +-
core/camel-xml-jaxp/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/xml-jaxp.json | 2 +-
.../org/apache/camel/util/xml/SourceCache.java | 6 +-
.../apache/camel/util/xml/StreamSourceCache.java | 6 +-
core/pom.xml | 2 +-
.../modules/ROOT/examples/json/azure-files.json | 1 +
docs/components/modules/ROOT/nav.adoc | 1 +
.../modules/ROOT/pages/azure-files-component.adoc | 1 +
docs/pom.xml | 2 +-
.../modules/ROOT/pages/camel-jbang.adoc | 2 +-
.../modules/ROOT/pages/camel-maven-archetypes.adoc | 4 +-
.../modules/ROOT/pages/stream-caching.adoc | 4 +
dsl/camel-cli-connector/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/cli-connector.json | 2 +-
dsl/camel-componentdsl/pom.xml | 2 +-
.../component/ComponentsBuilderFactory.java | 15 +
.../dsl/AtlasmapComponentBuilderFactory.java | 1 +
.../dsl/AzureFilesComponentBuilderFactory.java | 144 +
.../dsl/CordaComponentBuilderFactory.java | 1 +
.../dsl/ElasticsearchComponentBuilderFactory.java | 20 +
.../dsl/KafkaComponentBuilderFactory.java | 6 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/componentdsl.json | 2 +-
.../src/generated/resources/metadata.json | 735 ++--
dsl/camel-dsl-modeline/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/dsl-modeline.json | 2 +-
dsl/camel-dsl-support/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/dsl-support.json | 2 +-
dsl/camel-endpointdsl-support/pom.xml | 2 +-
dsl/camel-endpointdsl/pom.xml | 2 +-
.../builder/endpoint/EndpointBuilderFactory.java | 1 +
.../camel/builder/endpoint/EndpointBuilders.java | 1 +
.../builder/endpoint/StaticEndpointBuilders.java | 65 +
.../dsl/AtlasMapEndpointBuilderFactory.java | 3 +
.../endpoint/dsl/CordaEndpointBuilderFactory.java | 3 +
.../dsl/DataLakeEndpointBuilderFactory.java | 124 +-
.../dsl/ElasticsearchEndpointBuilderFactory.java | 53 +
.../endpoint/dsl/FilesEndpointBuilderFactory.java | 4341 ++++++++++++++++++++
.../endpoint/dsl/JiraEndpointBuilderFactory.java | 13 +
.../endpoint/dsl/KafkaEndpointBuilderFactory.java | 12 +-
...KubernetesConfigMapsEndpointBuilderFactory.java | 59 +-
...netesCustomResourcesEndpointBuilderFactory.java | 60 +-
...ubernetesDeploymentsEndpointBuilderFactory.java | 59 +-
.../KubernetesEventsEndpointBuilderFactory.java | 59 +-
.../dsl/KubernetesHPAEndpointBuilderFactory.java | 56 +-
.../dsl/KubernetesJobEndpointBuilderFactory.java | 56 +-
...KubernetesNamespacesEndpointBuilderFactory.java | 59 +-
.../dsl/KubernetesNodesEndpointBuilderFactory.java | 59 +-
...sistentVolumesClaimsEndpointBuilderFactory.java | 15 +
...tesPersistentVolumesEndpointBuilderFactory.java | 15 +
.../dsl/KubernetesPodsEndpointBuilderFactory.java | 56 +-
...plicationControllersEndpointBuilderFactory.java | 60 +-
...rnetesResourcesQuotaEndpointBuilderFactory.java | 15 +
.../KubernetesSecretsEndpointBuilderFactory.java | 14 +
...netesServiceAccountsEndpointBuilderFactory.java | 15 +
.../KubernetesServicesEndpointBuilderFactory.java | 59 +-
...penshiftBuildConfigsEndpointBuilderFactory.java | 14 +
.../dsl/OpenshiftBuildsEndpointBuilderFactory.java | 14 +
...iftDeploymentConfigsEndpointBuilderFactory.java | 60 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/endpointdsl.json | 2 +-
.../camel-groovy-dsl-common/pom.xml | 2 +-
dsl/camel-groovy-dsl/camel-groovy-dsl-test/pom.xml | 2 +-
dsl/camel-groovy-dsl/camel-groovy-dsl/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/groovy-dsl.json | 2 +-
dsl/camel-groovy-dsl/pom.xml | 2 +-
dsl/camel-java-joor-dsl/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/java-joor-dsl.json | 2 +-
dsl/camel-jbang/camel-jbang-console/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/jbang-console.json | 2 +-
dsl/camel-jbang/camel-jbang-core/pom.xml | 2 +-
.../dsl/jbang/core/commands/CamelCommand.java | 9 +-
.../dsl/jbang/core/commands/CodeRestGenerator.java | 3 +-
.../dsl/jbang/core/commands/DependencyCopy.java | 11 +-
.../dsl/jbang/core/commands/ExportBaseCommand.java | 2 +-
.../apache/camel/dsl/jbang/core/commands/Init.java | 2 +-
.../apache/camel/dsl/jbang/core/commands/Run.java | 19 +-
.../jbang/core/commands/catalog/CatalogDoc.java | 2 +-
.../core/commands/catalog/CatalogKamelet.java | 2 +-
.../dsl/jbang/core/commands/process/Hawtio.java | 4 +-
.../camel/dsl/jbang/core/common/CatalogLoader.java | 5 +
.../templates/run-custom-camel-version.tmpl | 4 +-
.../camel-jbang-main/dist/CamelJBang.java | 8 +-
dsl/camel-jbang/camel-jbang-main/pom.xml | 2 +-
.../src/main/jbang/main/CamelJBang.java | 8 +-
dsl/camel-jbang/pom.xml | 2 +-
dsl/camel-js-dsl/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/js-dsl.json | 2 +-
dsl/camel-jsh-dsl/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/jsh-dsl.json | 2 +-
dsl/camel-kamelet-main/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../camel-component-known-dependencies.properties | 1 +
.../src/generated/resources/kamelet-main.json | 2 +-
.../apache/camel/main/http/VertxHttpServer.java | 5 +-
dsl/camel-kotlin-dsl/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/kotlin-dsl.json | 2 +-
dsl/camel-xml-io-dsl/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/xml-io-dsl.json | 2 +-
.../camel/dsl/xml/io/XmlRoutesBuilderLoader.java | 2 +-
.../org/apache/camel/dsl/xml/io/XmlLoadTest.java | 30 +
.../org/apache/camel/dsl/xml/io/routeConfig.xml | 27 +
.../camel/dsl/xml/io/routeWithRouteConfig.xml | 25 +
dsl/camel-xml-jaxb-dsl-test/cdi/pom.xml | 2 +-
dsl/camel-xml-jaxb-dsl-test/definition/pom.xml | 2 +-
dsl/camel-xml-jaxb-dsl-test/jbpm/pom.xml | 2 +-
dsl/camel-xml-jaxb-dsl-test/pom.xml | 2 +-
dsl/camel-xml-jaxb-dsl-test/spring/pom.xml | 2 +-
dsl/camel-xml-jaxb-dsl-test/swagger/pom.xml | 2 +-
dsl/camel-xml-jaxb-dsl/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/xml-jaxb-dsl.json | 2 +-
dsl/camel-yaml-dsl/camel-yaml-dsl-common/pom.xml | 2 +-
.../camel-yaml-dsl-deserializers/pom.xml | 2 +-
.../dsl/yaml/deserializers/ModelDeserializers.java | 1 +
.../camel-yaml-dsl-maven-plugin/pom.xml | 2 +-
.../dsl/yaml/GenerateYamlDeserializersMojo.java | 3 +
dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../generated/resources/schema/camel-yaml-dsl.json | 6 +
.../generated/resources/schema/camelYamlDsl.json | 3 +
.../src/generated/resources/yaml-dsl.json | 2 +-
.../camel/dsl/yaml/YamlRoutesBuilderLoader.java | 31 +-
.../apache/camel/dsl/yaml/ErrorHandlerTest.groovy | 33 +
.../camel/dsl/yaml/KameletBindingLoaderTest.groovy | 36 +
.../resources/kamelets/log-action.kamelet.yaml | 149 +
dsl/camel-yaml-dsl/pom.xml | 2 +-
dsl/pom.xml | 2 +-
etc/pom.xml | 2 +-
init/camel-bundle-plugin/pom.xml | 2 +-
.../apache/felix/bundleplugin/ManifestPlugin.java | 4 +
init/pom.xml | 2 +-
parent/pom.xml | 91 +-
pom.xml | 21 +-
test-infra/camel-test-infra-activemq/pom.xml | 2 +-
test-infra/camel-test-infra-arangodb/pom.xml | 2 +-
test-infra/camel-test-infra-artemis/pom.xml | 2 +-
.../services/AbstractArtemisEmbeddedService.java | 39 +-
.../infra/artemis/services/ArtemisAMQPService.java | 2 +-
.../infra/artemis/services/ArtemisMQTTService.java | 2 +-
.../services/ArtemisPersistentVMService.java | 3 +-
.../services/ArtemisTCPAllProtocolsService.java | 5 +-
.../infra/artemis/services/ArtemisVMService.java | 10 +-
test-infra/camel-test-infra-aws-common/pom.xml | 2 +-
test-infra/camel-test-infra-aws-v2/pom.xml | 2 +-
test-infra/camel-test-infra-azure-common/pom.xml | 2 +-
.../camel-test-infra-azure-storage-blob/pom.xml | 2 +-
.../pom.xml | 2 +-
.../camel-test-infra-azure-storage-queue/pom.xml | 2 +-
test-infra/camel-test-infra-cassandra/pom.xml | 2 +-
test-infra/camel-test-infra-chatscript/pom.xml | 2 +-
test-infra/camel-test-infra-common/pom.xml | 2 +-
test-infra/camel-test-infra-consul/pom.xml | 2 +-
test-infra/camel-test-infra-couchbase/pom.xml | 2 +-
test-infra/camel-test-infra-couchdb/pom.xml | 2 +-
.../camel-test-infra-dispatch-router/pom.xml | 2 +-
test-infra/camel-test-infra-elasticsearch/pom.xml | 2 +-
test-infra/camel-test-infra-etcd3/pom.xml | 2 +-
test-infra/camel-test-infra-fhir/pom.xml | 2 +-
test-infra/camel-test-infra-ftp/pom.xml | 2 +-
test-infra/camel-test-infra-google-pubsub/pom.xml | 2 +-
.../camel-test-infra-hashicorp-vault/pom.xml | 2 +-
test-infra/camel-test-infra-hbase/pom.xml | 2 +-
test-infra/camel-test-infra-hdfs/pom.xml | 2 +-
test-infra/camel-test-infra-ignite/pom.xml | 2 +-
test-infra/camel-test-infra-infinispan/pom.xml | 2 +-
test-infra/camel-test-infra-jdbc/pom.xml | 2 +-
test-infra/camel-test-infra-jetty/pom.xml | 2 +-
test-infra/camel-test-infra-kafka/pom.xml | 2 +-
.../camel-test-infra-messaging-common/pom.xml | 2 +-
.../camel-test-infra-microprofile-lra/pom.xml | 2 +-
test-infra/camel-test-infra-minio/pom.xml | 2 +-
test-infra/camel-test-infra-mongodb/pom.xml | 2 +-
test-infra/camel-test-infra-mosquitto/pom.xml | 2 +-
test-infra/camel-test-infra-nats/pom.xml | 2 +-
test-infra/camel-test-infra-openldap/pom.xml | 2 +-
test-infra/camel-test-infra-parent/pom.xml | 2 +-
test-infra/camel-test-infra-postgres/pom.xml | 2 +-
test-infra/camel-test-infra-pulsar/pom.xml | 2 +-
test-infra/camel-test-infra-rabbitmq/pom.xml | 2 +-
test-infra/camel-test-infra-redis/pom.xml | 2 +-
test-infra/camel-test-infra-solr/pom.xml | 2 +-
test-infra/camel-test-infra-xmpp/pom.xml | 2 +-
test-infra/camel-test-infra-zookeeper/pom.xml | 2 +-
test-infra/pom.xml | 2 +-
tests/camel-itest-cdi/pom.xml | 2 +-
tests/camel-itest-jms2/pom.xml | 2 +-
tests/camel-itest-standalone/pom.xml | 2 +-
tests/camel-itest/pom.xml | 2 +-
tests/camel-partial-classpath-test/pom.xml | 2 +-
tests/camel-typeconverterscan-test/pom.xml | 2 +-
tests/pom.xml | 2 +-
.../camel-validator-test-resources/pom.xml | 2 +-
tests/test-bundles/mock-javamail_1.7/pom.xml | 2 +-
tests/test-bundles/pom.xml | 2 +-
tooling/camel-tooling-maven/pom.xml | 2 +-
tooling/camel-tooling-model/pom.xml | 2 +-
tooling/camel-tooling-util/pom.xml | 2 +-
tooling/camel-util-json/pom.xml | 2 +-
tooling/maven/bom-generator-maven-plugin/pom.xml | 2 +-
.../maven/camel-api-component-maven-plugin/pom.xml | 2 +-
tooling/maven/camel-component-maven-plugin/pom.xml | 2 +-
.../pom.xml | 2 +-
tooling/maven/camel-javadoc-plugin/pom.xml | 2 +-
tooling/maven/camel-maven-plugin/pom.xml | 2 +-
tooling/maven/camel-package-maven-plugin/pom.xml | 4 +-
.../apache/camel/maven/packaging/MojoHelper.java | 2 +-
.../maven/packaging/UpdateSensitizeHelper.java | 2 +-
tooling/maven/camel-resources-plugin/pom.xml | 2 +-
tooling/maven/camel-restdsl-openapi-plugin/pom.xml | 2 +-
.../generator/openapi/AbstractGenerateMojo.java | 15 +-
tooling/maven/camel-restdsl-swagger-plugin/pom.xml | 2 +-
tooling/maven/pom.xml | 2 +-
tooling/maven/sync-properties-maven-plugin/pom.xml | 2 +-
.../main/resources/camel-dependencies-template.xml | 2 +-
tooling/openapi-rest-dsl-generator/pom.xml | 2 +-
tooling/parent/pom.xml | 2 +-
tooling/pom.xml | 2 +-
tooling/spi-annotations/pom.xml | 2 +-
tooling/swagger-rest-dsl-generator/pom.xml | 2 +-
2460 files changed, 17528 insertions(+), 5037 deletions(-)
create mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-files.json
create mode 100644 components/camel-attachments/src/test/java/org/apache/camel/attachment/MulticastAggregationStrategyTest.java
delete mode 100644 components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumerHealthCheck.java
delete mode 100644 components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheck.java
delete mode 100644 components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheck.java
create mode 100644 components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckIT.java
delete mode 100644 components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckProfileCredsTest.java
delete mode 100644 components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckStaticCredsTest.java
delete mode 100644 components/camel-aws/camel-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCustomClientTest.java
delete mode 100644 components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheck.java
delete mode 100644 components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheck.java
delete mode 100644 components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheck.java
create mode 100644 components/camel-azure/camel-azure-files/pom.xml
create mode 100644 components/camel-azure/camel-azure-files/readme.md
create mode 100644 components/camel-azure/camel-azure-files/src/generated/java/org/apache/camel/component/file/azure/FilesComponentConfigurer.java
create mode 100644 components/camel-azure/camel-azure-files/src/generated/java/org/apache/camel/component/file/azure/FilesEndpointConfigurer.java
create mode 100644 components/camel-azure/camel-azure-files/src/generated/java/org/apache/camel/component/file/azure/FilesEndpointUriFactory.java
create mode 100644 components/camel-azure/camel-azure-files/src/generated/resources/META-INF/services/org/apache/camel/component.properties
create mode 100644 components/camel-azure/camel-azure-files/src/generated/resources/META-INF/services/org/apache/camel/component/azure-files
create mode 100644 components/camel-azure/camel-azure-files/src/generated/resources/META-INF/services/org/apache/camel/configurer/azure-files-component
create mode 100644 components/camel-azure/camel-azure-files/src/generated/resources/META-INF/services/org/apache/camel/configurer/azure-files-endpoint
create mode 100644 components/camel-azure/camel-azure-files/src/generated/resources/META-INF/services/org/apache/camel/urifactory/azure-files-endpoint
create mode 100644 components/camel-azure/camel-azure-files/src/generated/resources/org/apache/camel/component/file/azure/azure-files.json
create mode 100644 components/camel-azure/camel-azure-files/src/main/docs/azure-files-component.adoc
create mode 100644 components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesComponent.java
create mode 100644 components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesConfiguration.java
create mode 100644 components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesConsumer.java
create mode 100644 components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesEndpoint.java
create mode 100644 components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesHeaders.java
create mode 100644 components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesOperations.java
create mode 100644 components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesPath.java
create mode 100644 components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesProducer.java
create mode 100644 components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesToken.java
create mode 100644 components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesURIStrings.java
create mode 100644 components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/NormalizedOperations.java
create mode 100644 components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/strategy/FilesChangedExclusiveReadLockStrategy.java
create mode 100644 components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/strategy/FilesExclusiveReadLockCheck.java
create mode 100644 components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/strategy/FilesProcessStrategyFactory.java
create mode 100644 components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/strategy/StrategyUtil.java
create mode 100644 components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesConfigurationTests.java
create mode 100644 components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesEndpointTests.java
create mode 100644 components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesPathTests.java
create mode 100644 components/camel-azure/camel-azure-files/src/test/java/org/apache/camel/component/file/azure/FilesURIStringsTests.java
create mode 100644 components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTrimLineTest.java
create mode 100644 components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/Cartoon.java
create mode 100644 components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTrimLineTest-context.xml
create mode 100644 components/camel-dhis2/camel-dhis2-api/src/main/java/org/apache/camel/component/dhis2/api/Dhis2Resource.java
create mode 100644 components/camel-dhis2/camel-dhis2-component/src/generated/java/org/apache/camel/component/dhis2/Dhis2ConvertersLoader.java
create mode 100644 components/camel-dhis2/camel-dhis2-component/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
create mode 100644 components/camel-dhis2/camel-dhis2-component/src/main/java/org/apache/camel/component/dhis2/Dhis2Converters.java
delete mode 100644 components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageConsumerHealthCheck.java
create mode 100644 components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsToFullyQualifiedQueueNameTest.java
create mode 100644 components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAClientTest.java
create mode 100644 components/camel-lra/src/test/java/org/apache/camel/service/lra/LRASagaServiceTest.java
create mode 100644 components/camel-mapstruct/src/test/java/org/apache/camel/component/mapstruct/CarToVehicleTest.java
create mode 100644 components/camel-mapstruct/src/test/java/org/apache/camel/component/mapstruct/mapper/VehicleMapper.java
create mode 100644 components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpProducerProxyModeTest.java
create mode 100644 components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLSNITest.java
create mode 100644 components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/NoopTracingStrategy.java
create mode 100644 components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java
create mode 100644 components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategyTest.java
create mode 100644 components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/SpringDefaultErrorHandlerRedeliveryRefTest.java
create mode 100644 components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/DefaultErrorHandlerRedeliveryRefTest.xml
create mode 100644 components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpMaximumRedeliveriesTest.java
create mode 100644 components/camel-zeebe/src/test/java/org/apache/camel/component/zeebe/ThrowErrorIT.java
create mode 100644 components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipSplitterUseOriginalMessageTest.java
create mode 100644 core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/StreamCachingHelper.java
create mode 100644 core/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerRedeliveryRefTest.java
create mode 100644 core/camel-core/src/test/java/org/apache/camel/processor/OnCompletionModeBeforeConsumerExceptionSuppressedTest.java
create mode 100644 core/camel-core/src/test/java/org/apache/camel/processor/StreamCachingAllowDenyTest.java
create mode 100644 core/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentEIPManualTest.java
create mode 100644 core/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOManualTest.java
delete mode 100644 core/camel-core/src/test/java/org/apache/camel/processor/dynamicrouter/DynamicRouterConcurrentPOJOTest.java
create mode 100644 core/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalMessageStreamTwoTest.java
create mode 100644 core/camel-xml-io/src/test/resources/errorHandlerConfiguration.xml
create mode 100644 core/camel-xml-io/src/test/resources/errorHandlerConfigurationRedeliveryPolicyRef.xml
create mode 120000 docs/components/modules/ROOT/examples/json/azure-files.json
create mode 120000 docs/components/modules/ROOT/pages/azure-files-component.adoc
create mode 100644 dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureFilesComponentBuilderFactory.java
create mode 100644 dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FilesEndpointBuilderFactory.java
create mode 100644 dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/dsl/xml/io/routeConfig.xml
create mode 100644 dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/dsl/xml/io/routeWithRouteConfig.xml
create mode 100644 dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-action.kamelet.yaml
[camel] 01/01: CAMEL-19481: Upgrade to Jetty 10
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch CAMEL-19481/upgrade-jetty-10
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 92071be3480dd1f1741208fc690ee9b70fda4530
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Wed Jun 21 11:56:18 2023 +0200
CAMEL-19481: Upgrade to Jetty 10
---
camel-dependencies/pom.xml | 4 +-
.../org/apache/camel/catalog/components/jetty.json | 4 +-
.../apache/camel/catalog/components/websocket.json | 2 +-
components/camel-atmosphere-websocket/pom.xml | 29 ++++++--
components/camel-cometd/pom.xml | 2 +-
.../camel/component/cometd/CometdComponent.java | 2 +-
components/camel-jetty-common/pom.xml | 4 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/jetty-common.json | 2 +-
.../component/jetty/CamelContinuationServlet.java | 65 ++++++++++++------
.../camel/component/jetty/JettyHttpComponent.java | 16 +++--
.../camel/component/jetty/MultiPartFilter.java | 2 +-
components/camel-jetty/pom.xml | 16 ++---
.../JettyHttp10EndpointUriFactory.java} | 4 +-
.../JettyHttpComponent10Configurer.java} | 8 +--
.../JettyHttpEndpoint10Configurer.java} | 8 +--
.../services/org/apache/camel/component/jetty | 2 +-
.../org/apache/camel/configurer/jetty-component | 2 +-
.../org/apache/camel/configurer/jetty-endpoint | 2 +-
.../services/org/apache/camel/send-dynamic/jetty | 2 +-
.../org/apache/camel/urifactory/jetty-endpoint | 2 +-
.../camel/component/{jetty9 => jetty10}/jetty.json | 4 +-
.../camel-jetty/src/main/docs/jetty-component.adoc | 4 +-
.../{jetty9 => jetty10}/AttachmentHttpBinding.java | 11 +--
.../CamelInputStreamContentProvider.java | 2 +-
.../{jetty9 => jetty10}/HttpSendDynamicAware.java | 2 +-
.../JettyContentExchange10.java} | 6 +-
.../JettyHttpComponent10.java} | 10 +--
.../JettyHttpEndpoint10.java} | 12 ++--
.../jetty/JettyComponentMuteExceptionTest.java | 4 +-
.../jetty/JettyHttpEndpointDisconnectTest.java | 5 +-
.../JettyAsyncDefaultContinuationTimeoutTest.java | 76 --------------------
.../jetty/JettyComponentSpringConfiguredTest.xml | 2 +-
.../apache/camel/component/jetty/jetty-https.xml | 2 +-
components/camel-resteasy/pom.xml | 4 +-
.../camel/component/resteasy/test/WebTest.java | 4 +-
.../codegen/AbstractSalesforceExecution.java | 2 +-
.../camel-salesforce-component/pom.xml | 16 ++---
.../component/salesforce/SalesforceComponent.java | 6 +-
.../component/salesforce/SalesforceHttpClient.java | 13 +++-
.../internal/client/AbstractClientBase.java | 9 +--
.../internal/client/DefaultAnalyticsApiClient.java | 2 +-
.../internal/client/DefaultBulkApiClient.java | 3 +-
.../internal/client/DefaultBulkApiV2Client.java | 3 +-
.../internal/client/DefaultCompositeApiClient.java | 3 +-
...efaultCompositeSObjectCollectionsApiClient.java | 3 +-
.../internal/client/DefaultRawClient.java | 6 +-
.../internal/client/DefaultRestClient.java | 3 +-
.../internal/client/SalesforceSecurityHandler.java | 18 ++---
.../internal/streaming/SubscriptionHelper.java | 2 +-
.../salesforce/BulkApiIntegrationTest.java | 10 ++-
.../salesforce/HttpProxyIntegrationTest.java | 7 +-
.../salesforce/RestApiIntegrationTest.java | 17 +++--
.../internal/SessionIntegrationTest.java | 2 +-
.../internal/client/AbstractClientBaseTest.java | 4 +-
.../camel-salesforce-maven-plugin/pom.xml | 6 +-
.../tracing/decorators/JettySpanDecorator.java | 2 +-
components/camel-undertow/pom.xml | 8 +--
components/camel-websocket/pom.xml | 10 +--
.../camel/component/websocket/websocket.json | 2 +-
.../component/websocket/DefaultWebsocket.java | 4 +-
.../websocket/DefaultWebsocketFactory.java | 4 +-
.../websocket/JettyClassPathResource.java | 14 ++++
.../component/websocket/WebSocketFactory.java | 4 +-
.../component/websocket/WebsocketComponent.java | 9 ++-
.../websocket/WebsocketComponentServlet.java | 20 +++---
.../component/websocket/WebsocketConstants.java | 2 +-
.../component/websocket/WebsocketConsumer.java | 6 +-
.../component/websocket/WebsocketProducer.java | 29 +++++++-
.../websocket/WebsocketComponentServletTest.java | 10 +--
.../WebsocketEndpointConfigurationTest.java | 42 ++++++------
.../component/websocket/WebsocketProducerTest.java | 46 +++++++++----
.../WebsocketSubprotocolNegotiationTest.java | 10 +--
.../modules/ROOT/examples/json/jetty.json | 2 +-
.../component/ComponentsBuilderFactory.java | 2 +-
.../dsl/JettyComponentBuilderFactory.java | 80 +++++++++++-----------
.../src/generated/resources/metadata.json | 4 +-
dsl/camel-endpointdsl/pom.xml | 10 +++
.../builder/endpoint/StaticEndpointBuilders.java | 4 +-
.../dsl/JettyHttpEndpointBuilderFactory.java | 8 +--
.../dsl/WebsocketEndpointBuilderFactory.java | 2 +-
.../camel-component-known-dependencies.properties | 2 +-
parent/pom.xml | 4 +-
.../infra/jetty/services/JettyEmbeddedService.java | 30 ++++++--
.../camel/maven/packaging/EndpointDslMojo.java | 2 +-
85 files changed, 464 insertions(+), 371 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 3c7bb34c566..2a2529c1563 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -48,7 +48,7 @@
<aries-blueprint-proxy-version>1.1.12</aries-blueprint-proxy-version>
<aries-spifly-version>1.3.5</aries-spifly-version>
<aries-util-version>1.1.3</aries-util-version>
- <arquillian-jetty-embedded-9-version>1.0.0.CR3</arquillian-jetty-embedded-9-version>
+ <arquillian-jetty-embedded-10-version>1.0.0.Final</arquillian-jetty-embedded-10-version>
<arquillian-version>1.6.0.Final</arquillian-version>
<arquillian-weld-embedded-version>2.0.0.Final</arquillian-weld-embedded-version>
<as2-lib-version>4.11.0</as2-lib-version>
@@ -324,7 +324,7 @@
<jettison-version>1.5.3</jettison-version>
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
<jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
- <jetty-version>${jetty9-version}</jetty-version>
+ <jetty-version>10.0.17</jetty-version>
<jetty9-version>9.4.53.v20231009</jetty9-version>
<jgit-version>6.3.0.202209071007-r</jgit-version>
<jgroups-raft-leveldbjni-version>1.8</jgroups-raft-leveldbjni-version>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
index 66bf53a6e98..8fb8570f4de 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
@@ -3,12 +3,12 @@
"kind": "component",
"name": "jetty",
"title": "Jetty",
- "description": "Expose HTTP endpoints using Jetty 9.",
+ "description": "Expose HTTP endpoints using Jetty 10.",
"deprecated": false,
"deprecationNote": "",
"firstVersion": "1.2.0",
"label": "http",
- "javaType": "org.apache.camel.component.jetty9.JettyHttpComponent9",
+ "javaType": "org.apache.camel.component.jetty10.JettyHttpComponent10",
"supportLevel": "Stable",
"groupId": "org.apache.camel",
"artifactId": "camel-jetty",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/websocket.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/websocket.json
index 9dd168f41c6..37e050a068b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/websocket.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/websocket.json
@@ -42,7 +42,7 @@
"headers": {
"websocket.connectionKey": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Producer: Sends the message to all clients which are currently connected. You can use the sendToAll option on the endpoint instead of using this header. Consumer: Connection key identifying an individual client connection. You can save this and specify [...]
"websocket.sendToAll": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Sends the message to all clients which are currently connected. You can use the sendToAll option on the endpoint instead of using this header.", "constantName": "org.apache.camel.component.websocket.WebsocketConstants#SEND_TO_ALL" },
- "websocket.remoteAddress": { "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "java.net.InetSocketAddress", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Remote address of the websocket session.", "constantName": "org.apache.camel.component.websocket.WebsocketConstants#REMOTE_ADDRESS" },
+ "websocket.remoteAddress": { "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "java.net.SocketAddress", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Remote address of the websocket session.", "constantName": "org.apache.camel.component.websocket.WebsocketConstants#REMOTE_ADDRESS" },
"websocket.subprotocol": { "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "If a specific subprotocol was negotiated, it will be specfied in this header. Note that if you specify the any subprotocol to be supported, and a client requests a specific subprotocol, the connection will be accepted without a specific subprot [...]
"websocket.relativePath": { "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "If you specify a wildcard URI path for an endpoint, and a websocket client connects to that websocket endpoing, the relative path that the client specified will be provided in this header. For example, if you specified websocket:\/\/0.0.0.0:80 [...]
},
diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml
index e80e10affbf..8fd02432dbe 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -64,6 +64,18 @@
<version>${javax-servlet-api-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>websocket-server</artifactId>
+ <version>${jetty9-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty9-version}</version>
+ </dependency>
+
<!-- atmosphere -->
<dependency>
<groupId>org.atmosphere</groupId>
@@ -99,13 +111,16 @@
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
- <version>${jetty-version}</version>
- <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml
index 051f690d3da..118b995ead1 100644
--- a/components/camel-cometd/pom.xml
+++ b/components/camel-cometd/pom.xml
@@ -33,7 +33,7 @@
<properties>
<camel.osgi.import.pkg>
- org.eclipse.jetty.*;version="[9.4,10)",
+ org.eclipse.jetty.*;version="[10,11)",
${camel.osgi.import.defaults},
*
</camel.osgi.import.pkg>
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
index e256d623515..f8fabc70207 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
@@ -233,7 +233,7 @@ public class CometdComponent extends DefaultComponent implements SSLContextParam
sslParams = retrieveGlobalSslContextParameters();
}
- SslContextFactory sslContextFactory = new SslContextFactory();
+ SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
sslContextFactory.setEndpointIdentificationAlgorithm(null);
if (sslParams != null) {
sslContextFactory.setSslContext(sslParams.createSSLContext(getCamelContext()));
diff --git a/components/camel-jetty-common/pom.xml b/components/camel-jetty-common/pom.xml
index 37862126220..9d661c91925 100644
--- a/components/camel-jetty-common/pom.xml
+++ b/components/camel-jetty-common/pom.xml
@@ -30,11 +30,11 @@
<packaging>jar</packaging>
<name>Camel :: Jetty :: Common</name>
- <description>Camel Jetty 9.x support</description>
+ <description>Camel Jetty 10.x support</description>
<properties>
<camel.osgi.import.before.defaults>
- org.eclipse.jetty.*;version="[9.4,10)",
+ org.eclipse.jetty.*;version="[10,11)",
javax.servlet.*;version="${servlet-version-range}"
</camel.osgi.import.before.defaults>
<firstVersion>2.15.0</firstVersion>
diff --git a/components/camel-jetty-common/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-jetty-common/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index 32948116910..ab29fb71f8c 100644
--- a/components/camel-jetty-common/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++ b/components/camel-jetty-common/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -4,4 +4,4 @@ groupId=org.apache.camel
artifactId=camel-jetty-common
version=3.22.0-SNAPSHOT
projectName=Camel :: Jetty :: Common
-projectDescription=Camel Jetty 9.x support
+projectDescription=Camel Jetty 10.x support
diff --git a/components/camel-jetty-common/src/generated/resources/jetty-common.json b/components/camel-jetty-common/src/generated/resources/jetty-common.json
index e15adc68c28..7bbbb38fc76 100644
--- a/components/camel-jetty-common/src/generated/resources/jetty-common.json
+++ b/components/camel-jetty-common/src/generated/resources/jetty-common.json
@@ -3,7 +3,7 @@
"kind": "other",
"name": "jetty-common",
"title": "Jetty Common",
- "description": "Camel Jetty 9.x support",
+ "description": "Camel Jetty 10.x support",
"deprecated": false,
"firstVersion": "2.15.0",
"supportLevel": "Stable",
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
index 0f3d51ea68e..02d4fcc30dc 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
@@ -20,9 +20,12 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
+import javax.servlet.AsyncContext;
+import javax.servlet.AsyncEvent;
+import javax.servlet.AsyncListener;
+import javax.servlet.DispatcherType;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -41,14 +44,14 @@ import org.apache.camel.http.common.HttpMessage;
import org.apache.camel.spi.UnitOfWork;
import org.apache.camel.support.ObjectHelper;
import org.apache.camel.util.UnsafeUriCharactersEncoder;
-import org.eclipse.jetty.continuation.Continuation;
-import org.eclipse.jetty.continuation.ContinuationSupport;
/**
* Servlet which leverage <a href="http://wiki.eclipse.org/Jetty/Feature/Continuations">Jetty Continuations</a>.
*/
public class CamelContinuationServlet extends CamelServlet {
+ static final String TIMEOUT_ERROR = "CamelTimeoutException";
+
static final String EXCHANGE_ATTRIBUTE_NAME = "CamelExchange";
static final String EXCHANGE_ATTRIBUTE_ID = "CamelExchangeId";
@@ -178,27 +181,20 @@ public class CamelContinuationServlet extends CamelServlet {
final Exchange result = (Exchange) request.getAttribute(EXCHANGE_ATTRIBUTE_NAME);
if (result == null) {
// no asynchronous result so leverage continuation
- final Continuation continuation = ContinuationSupport.getContinuation(request);
- if (continuation.isInitial() && continuationTimeout != null) {
+ AsyncContext asyncContext = request.startAsync();
+ if (isInitial(request) && continuationTimeout != null) {
// set timeout on initial
- continuation.setTimeout(continuationTimeout);
+ asyncContext.setTimeout(continuationTimeout.longValue());
}
+ asyncContext.addListener(new ExpiredListener(), request, response);
+
// are we suspended and a request is dispatched initially?
- if (consumer.isSuspended() && continuation.isInitial()) {
+ if (consumer.isSuspended() && isInitial(request)) {
response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
return;
}
- if (continuation.isExpired()) {
- String id = (String) continuation.getAttribute(EXCHANGE_ATTRIBUTE_ID);
- // remember this id as expired
- expiredExchanges.put(id, id);
- log.warn("Continuation expired of exchangeId: {}", id);
- consumer.getBinding().doWriteExceptionResponse(new TimeoutException(), response);
- return;
- }
-
// a new request so create an exchange
// must be prototype scoped (not pooled) so we create the exchange via endpoint
final Exchange exchange = consumer.createExchange(false);
@@ -231,7 +227,7 @@ public class CamelContinuationServlet extends CamelServlet {
if (log.isTraceEnabled()) {
log.trace("Suspending continuation of exchangeId: {}", exchange.getExchangeId());
}
- continuation.setAttribute(EXCHANGE_ATTRIBUTE_ID, exchange.getExchangeId());
+ request.setAttribute(EXCHANGE_ATTRIBUTE_ID, exchange.getExchangeId());
// we want to handle the UoW
UnitOfWork uow = exchange.getUnitOfWork();
@@ -248,9 +244,6 @@ public class CamelContinuationServlet extends CamelServlet {
ee.setUnitOfWork(uow);
}
- // must suspend before we process the exchange
- continuation.suspend();
-
ClassLoader oldTccl = overrideTccl(exchange);
if (log.isTraceEnabled()) {
@@ -267,8 +260,8 @@ public class CamelContinuationServlet extends CamelServlet {
log.trace("Resuming continuation of exchangeId: {}", exchange.getExchangeId());
}
// resume processing after both, sync and async callbacks
- continuation.setAttribute(EXCHANGE_ATTRIBUTE_NAME, exchange);
- continuation.resume();
+ request.setAttribute(EXCHANGE_ATTRIBUTE_NAME, exchange);
+ asyncContext.dispatch();
} else {
log.warn("Cannot resume expired continuation of exchangeId: {}", exchange.getExchangeId());
consumer.releaseExchange(exchange, false);
@@ -308,6 +301,34 @@ public class CamelContinuationServlet extends CamelServlet {
}
}
+ private boolean isInitial(HttpServletRequest request) {
+ return request.getDispatcherType() != DispatcherType.ASYNC;
+ }
+
+ private class ExpiredListener implements AsyncListener {
+ @Override
+ public void onComplete(AsyncEvent event) throws IOException {
+ }
+
+ @Override
+ public void onTimeout(AsyncEvent event) throws IOException {
+ HttpServletRequest request = (HttpServletRequest) event.getSuppliedRequest();
+ String id = (String) request.getAttribute(EXCHANGE_ATTRIBUTE_ID);
+ // remember this id as expired
+ expiredExchanges.put(id, id);
+ log.warn("Continuation expired of exchangeId: {}", id);
+ request.setAttribute(TIMEOUT_ERROR, Boolean.TRUE);
+ }
+
+ @Override
+ public void onError(AsyncEvent event) throws IOException {
+ }
+
+ @Override
+ public void onStartAsync(AsyncEvent event) throws IOException {
+ }
+ }
+
private void updateHttpPath(Exchange exchange, String contextPath) {
String httpPath = (String) exchange.getIn().getHeader(JettyHttpConstants.HTTP_PATH);
// encode context path in case it contains unsafe chars, because HTTP_PATH isn't decoded at this moment
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index c69a50c96ae..2738813f438 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -26,6 +26,7 @@ import java.net.URISyntaxException;
import java.security.GeneralSecurityException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.EventListener;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -591,7 +592,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
protected Connector createConnector(Server server, JettyHttpEndpoint endpoint) {
// now we just use the SelectChannelConnector as the default connector
- SslContextFactory sslcf = null;
+ SslContextFactory.Server sslcf = null;
// Note that this was set on the endpoint when it was constructed. It was
// either explicitly set at the component or on the endpoint, but either way,
@@ -601,12 +602,12 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
if (endpointSslContextParameters != null) {
try {
- sslcf = createSslContextFactory(endpointSslContextParameters, false);
+ sslcf = (SslContextFactory.Server) createSslContextFactory(endpointSslContextParameters, false);
} catch (Exception e) {
throw new RuntimeCamelException(e);
}
} else if ("https".equals(endpoint.getProtocol())) {
- sslcf = new SslContextFactory();
+ sslcf = new SslContextFactory.Server();
sslcf.setEndpointIdentificationAlgorithm(null);
String keystoreProperty = System.getProperty(JETTY_SSL_KEYSTORE);
if (keystoreProperty != null) {
@@ -634,7 +635,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
}
protected abstract AbstractConnector createConnectorJettyInternal(
- Server server, JettyHttpEndpoint endpoint, SslContextFactory sslcf);
+ Server server, JettyHttpEndpoint endpoint, SslContextFactory.Server sslcf);
private SslContextFactory createSslContextFactory(SSLContextParameters ssl, boolean client)
throws GeneralSecurityException, IOException {
@@ -1278,6 +1279,11 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException {
String msg = HttpStatus.getMessage(response.getStatus());
+ Object timeout = request.getAttribute(CamelContinuationServlet.TIMEOUT_ERROR);
+ if (Boolean.TRUE.equals(timeout)) {
+ request.setAttribute(RequestDispatcher.ERROR_STATUS_CODE, 504);
+ response.setStatus(504);
+ }
request.setAttribute(RequestDispatcher.ERROR_MESSAGE, msg);
super.handle(target, baseRequest, request, response);
}
@@ -1344,7 +1350,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
try {
Object o = getContainer(server);
- o.getClass().getMethod("addEventListener", Container.Listener.class).invoke(o, mbContainer);
+ o.getClass().getMethod("addEventListener", EventListener.class).invoke(o, mbContainer);
mbContainer.getClass().getMethod("beanAdded", Container.class, Object.class)
.invoke(mbContainer, null, server);
} catch (RuntimeException rex) {
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/MultiPartFilter.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/MultiPartFilter.java
index 0a3392def04..ede3700dbd3 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/MultiPartFilter.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/MultiPartFilter.java
@@ -28,7 +28,7 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
/**
- * To enable handle attachments with Jetty 9 when this filter is set.
+ * To enable handle attachments with Jetty 10 when this filter is set.
* <p/>
* To replace the deprecated org.eclipse.jetty.servlets.MultiPartFilter Tell AttachmentHttpBinding to use Servlet 3
* HttpServletRequest.getParts API
diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml
index 977c288e8ce..ba937a6cdcd 100644
--- a/components/camel-jetty/pom.xml
+++ b/components/camel-jetty/pom.xml
@@ -34,7 +34,7 @@
<properties>
<camel.osgi.import.before.defaults>
- org.eclipse.jetty.*;version="[9.4,10)",
+ org.eclipse.jetty.*;version="[10,11)",
javax.activation.*;version="${javax-activation-version-range}",
javax.servlet.*;version="${servlet-version-range}"
</camel.osgi.import.before.defaults>
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
@@ -69,32 +69,32 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jmx</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
</dependency>
<!-- test dependencies -->
diff --git a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriFactory.java b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty10/JettyHttp10EndpointUriFactory.java
similarity index 94%
rename from components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriFactory.java
rename to components/camel-jetty/src/generated/java/org/apache/camel/component/jetty10/JettyHttp10EndpointUriFactory.java
index f5efcfcb92b..2bf9d830e23 100644
--- a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriFactory.java
+++ b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty10/JettyHttp10EndpointUriFactory.java
@@ -1,5 +1,5 @@
/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.jetty9;
+package org.apache.camel.component.jetty10;
import java.net.URISyntaxException;
import java.util.Collections;
@@ -13,7 +13,7 @@ import org.apache.camel.spi.EndpointUriFactory;
/**
* Generated by camel build tools - do NOT edit this file!
*/
-public class JettyHttp9EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+public class JettyHttp10EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
private static final String BASE = ":httpUri";
diff --git a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttpComponent9Configurer.java b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty10/JettyHttpComponent10Configurer.java
similarity index 97%
rename from components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttpComponent9Configurer.java
rename to components/camel-jetty/src/generated/java/org/apache/camel/component/jetty10/JettyHttpComponent10Configurer.java
index 8211d97dbd2..4c4bf25743d 100644
--- a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttpComponent9Configurer.java
+++ b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty10/JettyHttpComponent10Configurer.java
@@ -1,5 +1,5 @@
/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.jetty9;
+package org.apache.camel.component.jetty10;
import java.util.Map;
@@ -15,11 +15,11 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
* Generated by camel build tools - do NOT edit this file!
*/
@SuppressWarnings("unchecked")
-public class JettyHttpComponent9Configurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
+public class JettyHttpComponent10Configurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
@Override
public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
- JettyHttpComponent9 target = (JettyHttpComponent9) obj;
+ JettyHttpComponent10 target = (JettyHttpComponent10) obj;
switch (ignoreCase ? name.toLowerCase() : name) {
case "allowjavaserializedobject":
case "allowJavaSerializedObject": target.setAllowJavaSerializedObject(property(camelContext, boolean.class, value)); return true;
@@ -164,7 +164,7 @@ public class JettyHttpComponent9Configurer extends PropertyConfigurerSupport imp
@Override
public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
- JettyHttpComponent9 target = (JettyHttpComponent9) obj;
+ JettyHttpComponent10 target = (JettyHttpComponent10) obj;
switch (ignoreCase ? name.toLowerCase() : name) {
case "allowjavaserializedobject":
case "allowJavaSerializedObject": return target.isAllowJavaSerializedObject();
diff --git a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9Configurer.java b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty10/JettyHttpEndpoint10Configurer.java
similarity index 97%
rename from components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9Configurer.java
rename to components/camel-jetty/src/generated/java/org/apache/camel/component/jetty10/JettyHttpEndpoint10Configurer.java
index 5e258336b5f..b21452fe12b 100644
--- a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9Configurer.java
+++ b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty10/JettyHttpEndpoint10Configurer.java
@@ -1,5 +1,5 @@
/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.jetty9;
+package org.apache.camel.component.jetty10;
import java.util.Map;
@@ -15,11 +15,11 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
* Generated by camel build tools - do NOT edit this file!
*/
@SuppressWarnings("unchecked")
-public class JettyHttpEndpoint9Configurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
+public class JettyHttpEndpoint10Configurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
@Override
public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
- JettyHttpEndpoint9 target = (JettyHttpEndpoint9) obj;
+ JettyHttpEndpoint10 target = (JettyHttpEndpoint10) obj;
switch (ignoreCase ? name.toLowerCase() : name) {
case "async": target.setAsync(property(camelContext, boolean.class, value)); return true;
case "bridgeerrorhandler":
@@ -154,7 +154,7 @@ public class JettyHttpEndpoint9Configurer extends PropertyConfigurerSupport impl
@Override
public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
- JettyHttpEndpoint9 target = (JettyHttpEndpoint9) obj;
+ JettyHttpEndpoint10 target = (JettyHttpEndpoint10) obj;
switch (ignoreCase ? name.toLowerCase() : name) {
case "async": return target.isAsync();
case "bridgeerrorhandler":
diff --git a/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/component/jetty b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/component/jetty
index 18fd1ba8f0f..7419241bf20 100644
--- a/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/component/jetty
+++ b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/component/jetty
@@ -1,2 +1,2 @@
# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.jetty9.JettyHttpComponent9
+class=org.apache.camel.component.jetty10.JettyHttpComponent10
diff --git a/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/configurer/jetty-component b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/configurer/jetty-component
index 1f0792cf87c..5611033b879 100644
--- a/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/configurer/jetty-component
+++ b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/configurer/jetty-component
@@ -1,2 +1,2 @@
# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.jetty9.JettyHttpComponent9Configurer
+class=org.apache.camel.component.jetty10.JettyHttpComponent10Configurer
diff --git a/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/configurer/jetty-endpoint b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/configurer/jetty-endpoint
index d8a0689b558..baee67ccacc 100644
--- a/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/configurer/jetty-endpoint
+++ b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/configurer/jetty-endpoint
@@ -1,2 +1,2 @@
# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.jetty9.JettyHttpEndpoint9Configurer
+class=org.apache.camel.component.jetty10.JettyHttpEndpoint10Configurer
diff --git a/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/send-dynamic/jetty b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/send-dynamic/jetty
index ca555990bee..e1889e2e5b7 100644
--- a/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/send-dynamic/jetty
+++ b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/send-dynamic/jetty
@@ -1,2 +1,2 @@
# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.jetty9.HttpSendDynamicAware
+class=org.apache.camel.component.jetty10.HttpSendDynamicAware
diff --git a/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/urifactory/jetty-endpoint b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/urifactory/jetty-endpoint
index c66b1220ece..b1334160fe8 100644
--- a/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/urifactory/jetty-endpoint
+++ b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/urifactory/jetty-endpoint
@@ -1,2 +1,2 @@
# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.jetty9.JettyHttp9EndpointUriFactory
+class=org.apache.camel.component.jetty10.JettyHttp10EndpointUriFactory
diff --git a/components/camel-jetty/src/generated/resources/org/apache/camel/component/jetty9/jetty.json b/components/camel-jetty/src/generated/resources/org/apache/camel/component/jetty10/jetty.json
similarity index 99%
rename from components/camel-jetty/src/generated/resources/org/apache/camel/component/jetty9/jetty.json
rename to components/camel-jetty/src/generated/resources/org/apache/camel/component/jetty10/jetty.json
index 66bf53a6e98..8fb8570f4de 100644
--- a/components/camel-jetty/src/generated/resources/org/apache/camel/component/jetty9/jetty.json
+++ b/components/camel-jetty/src/generated/resources/org/apache/camel/component/jetty10/jetty.json
@@ -3,12 +3,12 @@
"kind": "component",
"name": "jetty",
"title": "Jetty",
- "description": "Expose HTTP endpoints using Jetty 9.",
+ "description": "Expose HTTP endpoints using Jetty 10.",
"deprecated": false,
"deprecationNote": "",
"firstVersion": "1.2.0",
"label": "http",
- "javaType": "org.apache.camel.component.jetty9.JettyHttpComponent9",
+ "javaType": "org.apache.camel.component.jetty10.JettyHttpComponent10",
"supportLevel": "Stable",
"groupId": "org.apache.camel",
"artifactId": "camel-jetty",
diff --git a/components/camel-jetty/src/main/docs/jetty-component.adoc b/components/camel-jetty/src/main/docs/jetty-component.adoc
index 90ae00c0dae..9018ee68d1c 100644
--- a/components/camel-jetty/src/main/docs/jetty-component.adoc
+++ b/components/camel-jetty/src/main/docs/jetty-component.adoc
@@ -2,7 +2,7 @@
:doctitle: Jetty
:shortname: jetty
:artifactid: camel-jetty
-:description: Expose HTTP endpoints using Jetty 9.
+:description: Expose HTTP endpoints using Jetty 10.
:since: 1.2
:supportlevel: Stable
:component-header: Only consumer is supported
@@ -496,7 +496,7 @@ from("jetty:http://0.0.0.0:9080/myservice?handlers=securityHandler")
If you need more handlers, set the `handlers` option equal to a
comma-separated list of bean IDs.
-Blueprint based definition of basic authentication (based on Jetty 9):
+Blueprint based definition of basic authentication (based on Jetty 10):
[source,xml]
----
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty10/AttachmentHttpBinding.java
similarity index 94%
rename from components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java
rename to components/camel-jetty/src/main/java/org/apache/camel/component/jetty10/AttachmentHttpBinding.java
index 2446167ec23..786fac778d2 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty10/AttachmentHttpBinding.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jetty9;
+package org.apache.camel.component.jetty10;
import java.io.IOException;
import java.io.InputStream;
@@ -37,13 +37,14 @@ import org.apache.camel.attachment.DefaultAttachment;
import org.apache.camel.component.jetty.MultiPartFilter;
import org.apache.camel.http.common.DefaultHttpBinding;
import org.apache.camel.http.common.HttpHelper;
+import org.eclipse.jetty.http.HttpFields;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * To handle attachments with Jetty 9.
+ * To handle attachments with Jetty 10.
* <p/>
- * This implementation is needed to deal with attachments when using Jetty 9.
+ * This implementation is needed to deal with attachments when using Jetty 10.
*/
final class AttachmentHttpBinding extends DefaultHttpBinding {
private static final Logger LOG = LoggerFactory.getLogger(AttachmentHttpBinding.class);
@@ -92,7 +93,9 @@ final class AttachmentHttpBinding extends DefaultHttpBinding {
// remove Content-Encoding from request
if (request instanceof org.eclipse.jetty.server.Request) {
org.eclipse.jetty.server.Request jettyRequest = (org.eclipse.jetty.server.Request) request;
- jettyRequest.getHttpFields().remove(Exchange.CONTENT_ENCODING);
+ HttpFields originalFields = jettyRequest.getHttpFields();
+ HttpFields newFields = HttpFields.build(originalFields).remove(Exchange.CONTENT_ENCODING);
+ jettyRequest.setHttpFields(newFields);
}
// attachment is optional
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty10/CamelInputStreamContentProvider.java
similarity index 96%
rename from components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
rename to components/camel-jetty/src/main/java/org/apache/camel/component/jetty10/CamelInputStreamContentProvider.java
index 1b1cf7ea4a9..17e49b316c4 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty10/CamelInputStreamContentProvider.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jetty9;
+package org.apache.camel.component.jetty10;
import java.io.InputStream;
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/HttpSendDynamicAware.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty10/HttpSendDynamicAware.java
similarity index 95%
rename from components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/HttpSendDynamicAware.java
rename to components/camel-jetty/src/main/java/org/apache/camel/component/jetty10/HttpSendDynamicAware.java
index eee06bc1e06..c7c506bcb19 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/HttpSendDynamicAware.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty10/HttpSendDynamicAware.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jetty9;
+package org.apache.camel.component.jetty10;
import org.apache.camel.spi.annotations.SendDynamic;
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty10/JettyContentExchange10.java
similarity index 98%
rename from components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java
rename to components/camel-jetty/src/main/java/org/apache/camel/component/jetty10/JettyContentExchange10.java
index 2ca5924fc18..3ab4dd7e903 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty10/JettyContentExchange10.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jetty9;
+package org.apache.camel.component.jetty10;
import java.io.ByteArrayOutputStream;
import java.io.Closeable;
@@ -55,9 +55,9 @@ import org.slf4j.LoggerFactory;
/**
* Jetty specific exchange which keeps track of the request and response.
*/
-public class JettyContentExchange9 implements JettyContentExchange {
+public class JettyContentExchange10 implements JettyContentExchange {
- private static final Logger LOG = LoggerFactory.getLogger(JettyContentExchange9.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JettyContentExchange10.class);
private volatile Exchange exchange;
private volatile AsyncCallback callback;
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty10/JettyHttpComponent10.java
similarity index 96%
rename from components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
rename to components/camel-jetty/src/main/java/org/apache/camel/component/jetty10/JettyHttpComponent10.java
index d7ef71f8962..15fe4c4fe85 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty10/JettyHttpComponent10.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jetty9;
+package org.apache.camel.component.jetty10;
import java.net.URI;
import java.net.URISyntaxException;
@@ -40,20 +40,20 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Component("jetty")
-public class JettyHttpComponent9 extends JettyHttpComponent {
+public class JettyHttpComponent10 extends JettyHttpComponent {
public static Map<String, Throwable> connectorCreation = new ConcurrentHashMap<>();
- private static final Logger LOG = LoggerFactory.getLogger(JettyHttpComponent9.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JettyHttpComponent10.class);
@Override
protected JettyHttpEndpoint createEndpoint(URI endpointUri, URI httpUri) throws URISyntaxException {
- return new JettyHttpEndpoint9(this, endpointUri.toString(), httpUri);
+ return new JettyHttpEndpoint10(this, endpointUri.toString(), httpUri);
}
@Override
protected AbstractConnector createConnectorJettyInternal(
- Server server, JettyHttpEndpoint endpoint, SslContextFactory sslcf) {
+ Server server, JettyHttpEndpoint endpoint, SslContextFactory.Server sslcf) {
try {
String host = endpoint.getHttpUri().getHost();
int port = endpoint.getPort();
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty10/JettyHttpEndpoint10.java
similarity index 88%
rename from components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java
rename to components/camel-jetty/src/main/java/org/apache/camel/component/jetty10/JettyHttpEndpoint10.java
index 52157b962bc..0875b0cf56e 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty10/JettyHttpEndpoint10.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.jetty9;
+package org.apache.camel.component.jetty10;
import java.net.URI;
import java.net.URISyntaxException;
@@ -30,24 +30,24 @@ import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
/**
- * Expose HTTP endpoints using Jetty 9.
+ * Expose HTTP endpoints using Jetty 10.
*/
@UriEndpoint(firstVersion = "1.2.0", scheme = "jetty", extendsScheme = "http", title = "Jetty", syntax = "jetty:httpUri",
category = { Category.HTTP }, consumerOnly = true, lenientProperties = true,
headersClass = JettyHttpConstants.class)
@Metadata(excludeProperties = "authMethod,authMethodPriority,authUsername,authPassword,authDomain,authHost"
+ "proxyAuthScheme,proxyAuthMethod,proxyAuthUsername,proxyAuthPassword,proxyAuthHost,proxyAuthPort,proxyAuthDomain")
-public class JettyHttpEndpoint9 extends JettyHttpEndpoint implements AsyncEndpoint {
+public class JettyHttpEndpoint10 extends JettyHttpEndpoint implements AsyncEndpoint {
private HttpBinding binding;
- public JettyHttpEndpoint9(JettyHttpComponent component, String uri, URI httpURL) throws URISyntaxException {
+ public JettyHttpEndpoint10(JettyHttpComponent component, String uri, URI httpURL) throws URISyntaxException {
super(component, uri, httpURL);
}
@Override
public HttpBinding getHttpBinding() {
- // make sure we include jetty9 variant of the http binding
+ // make sure we include jetty10 variant of the http binding
if (this.binding == null) {
this.binding = new AttachmentHttpBinding();
this.binding.setTransferException(isTransferException());
@@ -72,6 +72,6 @@ public class JettyHttpEndpoint9 extends JettyHttpEndpoint implements AsyncEndpoi
@Override
public JettyContentExchange createContentExchange() {
- return new JettyContentExchange9();
+ return new JettyContentExchange10();
}
}
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyComponentMuteExceptionTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyComponentMuteExceptionTest.java
index 509587b1e13..e4c1378376e 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyComponentMuteExceptionTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyComponentMuteExceptionTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.jetty;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.jetty9.JettyHttpComponent9;
+import org.apache.camel.component.jetty10.JettyHttpComponent10;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
@@ -49,7 +49,7 @@ public class JettyComponentMuteExceptionTest extends BaseJettyTest {
return new RouteBuilder() {
@Override
public void configure() {
- JettyHttpComponent9 jc = context.getComponent("jetty", JettyHttpComponent9.class);
+ JettyHttpComponent10 jc = context.getComponent("jetty", JettyHttpComponent10.class);
jc.setMuteException(true);
from("jetty:http://localhost:{{port}}/foo").to("mock:destination")
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java
index 258f2a329e1..5060921cbc9 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java
@@ -20,8 +20,7 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.jetty9.JettyHttpComponent9;
-import org.eclipse.jetty.util.Jetty;
+import org.apache.camel.component.jetty10.JettyHttpComponent10;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.parallel.Isolated;
@@ -42,7 +41,7 @@ public class JettyHttpEndpointDisconnectTest extends BaseJettyTest {
() -> {
StringBuilder sb = new StringBuilder("Connector should have been removed\n");
for (String key : JettyHttpComponent.CONNECTORS.keySet()) {
- Throwable t = JettyHttpComponent9.connectorCreation.get(key);
+ Throwable t = JettyHttpComponent10.connectorCreation.get(key);
if (t == null) {
t = new Throwable("Unable to find connector creation");
}
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncDefaultContinuationTimeoutTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncDefaultContinuationTimeoutTest.java
deleted file mode 100644
index 98ceee96be6..00000000000
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncDefaultContinuationTimeoutTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.camel.component.jetty.async;
-
-import java.util.concurrent.TimeUnit;
-
-import org.apache.camel.CamelExecutionException;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.jetty.BaseJettyTest;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.http.base.HttpOperationFailedException;
-import org.apache.camel.util.StopWatch;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
-@Disabled("This test takes a long time to run, so run it manually")
-public class JettyAsyncDefaultContinuationTimeoutTest extends BaseJettyTest {
-
- private static final Logger LOG = LoggerFactory.getLogger(JettyAsyncDefaultContinuationTimeoutTest.class);
-
- @Test
- public void testJettyAsyncTimeout() throws Exception {
- getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
-
- StopWatch watch = new StopWatch();
- try {
- template.requestBody("http://localhost:{{port}}/myservice", null, String.class);
- fail("Should have thrown an exception");
- } catch (CamelExecutionException e) {
- LOG.info("Timeout hit and client got reply with failure status code");
-
- long taken = watch.taken();
-
- HttpOperationFailedException cause = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause());
- assertEquals(504, cause.getStatusCode());
-
- // should be approx 30-34 sec.
- assertTrue(taken < 34000, "Timeout should occur faster than " + taken);
- }
-
- MockEndpoint.assertIsSatisfied(context, 2, TimeUnit.MINUTES);
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() {
- return new RouteBuilder() {
- @Override
- public void configure() {
- context.addComponent("async", new MyAsyncComponent());
-
- from("jetty:http://localhost:{{port}}/myservice").to("async:bye:world?delay=45s").to("mock:result");
- }
- };
- }
-}
diff --git a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/JettyComponentSpringConfiguredTest.xml b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/JettyComponentSpringConfiguredTest.xml
index a67186f1068..9fb941673c2 100644
--- a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/JettyComponentSpringConfiguredTest.xml
+++ b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/JettyComponentSpringConfiguredTest.xml
@@ -24,7 +24,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="jetty2" class="org.apache.camel.component.jetty9.JettyHttpComponent9">
+ <bean id="jetty2" class="org.apache.camel.component.jetty10.JettyHttpComponent10">
<property name="enableJmx" value="true"/>
<property name="minThreads" value="10"/>
<property name="maxThreads" value="50"/>
diff --git a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-https.xml b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-https.xml
index 1228a21ae06..ff454360a3d 100644
--- a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-https.xml
+++ b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-https.xml
@@ -23,7 +23,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="jetty" class="org.apache.camel.component.jetty9.JettyHttpComponent9">
+ <bean id="jetty" class="org.apache.camel.component.jetty10.JettyHttpComponent10">
<property name="sslPassword" value="changeit"/>
<property name="sslKeyPassword" value="changeit"/>
<property name="keystore" value="src/test/resources/jsse/localhost.p12"/>
diff --git a/components/camel-resteasy/pom.xml b/components/camel-resteasy/pom.xml
index ff58c9b6fda..542eeed1bcc 100644
--- a/components/camel-resteasy/pom.xml
+++ b/components/camel-resteasy/pom.xml
@@ -236,8 +236,8 @@
<!-- jetty test dependencies -->
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-jetty-embedded-9</artifactId>
- <version>${arquillian-jetty-embedded-9-version}</version>
+ <artifactId>arquillian-jetty-embedded-10</artifactId>
+ <version>${arquillian-jetty-embedded-10-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-resteasy/src/test/java/org/apache/camel/component/resteasy/test/WebTest.java b/components/camel-resteasy/src/test/java/org/apache/camel/component/resteasy/test/WebTest.java
index 8b87d37d51f..0732649c206 100644
--- a/components/camel-resteasy/src/test/java/org/apache/camel/component/resteasy/test/WebTest.java
+++ b/components/camel-resteasy/src/test/java/org/apache/camel/component/resteasy/test/WebTest.java
@@ -29,8 +29,8 @@ import java.util.stream.Stream;
import javax.servlet.ServletContext;
import org.eclipse.jetty.deploy.App;
-import org.jboss.arquillian.container.jetty.embedded_9.JettyEmbeddedConfiguration;
-import org.jboss.arquillian.container.jetty.embedded_9.JettyEmbeddedContainer;
+import org.jboss.arquillian.container.jetty.embedded_10.JettyEmbeddedConfiguration;
+import org.jboss.arquillian.container.jetty.embedded_10.JettyEmbeddedContainer;
import org.jboss.arquillian.container.spi.client.protocol.metadata.ProtocolMetaData;
import org.jboss.arquillian.container.test.impl.enricher.resource.URIResourceProvider;
import org.jboss.arquillian.container.test.impl.enricher.resource.URLResourceProvider;
diff --git a/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/AbstractSalesforceExecution.java b/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/AbstractSalesforceExecution.java
index db6eeb356a3..a7cf151ebb3 100644
--- a/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/AbstractSalesforceExecution.java
+++ b/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/AbstractSalesforceExecution.java
@@ -203,7 +203,7 @@ public abstract class AbstractSalesforceExecution {
// set ssl context parameters
try {
- final SslContextFactory sslContextFactory = new SslContextFactory();
+ final SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
sslContextFactory.setSslContext(sslContextParameters.createSSLContext(camelContext));
SecurityUtils.adaptToIBMCipherNames(sslContextFactory);
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml
index f795a56ef72..ea96aeb927a 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -35,7 +35,7 @@
<properties>
<camel.osgi.import.additional>
javax.xml.bind*;version="[2.2,3.0)",
- org.eclipse.jetty.*;version="[9.4,10)",
+ org.eclipse.jetty.*;version="[10,11)",
org.mortbay.cometd.*;version="[6.1,7)"
</camel.osgi.import.additional>
<camel.osgi.private.pkg>org.apache.camel.component.salesforce.internal.*</camel.osgi.private.pkg>
@@ -53,22 +53,22 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -178,19 +178,19 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-proxy</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
index 6fac729d865..8659ba42e1a 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
@@ -391,7 +391,7 @@ public class SalesforceComponent extends DefaultComponent implements SSLContextP
.orElseGet(() -> Optional.ofNullable(retrieveGlobalSslContextParameters())
.orElseGet(() -> new SSLContextParameters()));
- final SslContextFactory sslContextFactory = new SslContextFactory();
+ final SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
sslContextFactory.setSslContext(contextParameters.createSSLContext(getCamelContext()));
httpClient = createHttpClient(this, sslContextFactory, getCamelContext(), workerPoolSize, workerPoolMaxSize);
@@ -820,7 +820,7 @@ public class SalesforceComponent extends DefaultComponent implements SSLContextP
// let's work with a copy so original properties are intact
PropertyBindingSupport.bindProperties(camelContext, sslContextParameters, new HashMap<>(properties));
- final SslContextFactory sslContextFactory = new SslContextFactory();
+ final SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
sslContextFactory.setSslContext(sslContextParameters.createSSLContext(camelContext));
final SalesforceHttpClient httpClient
@@ -838,7 +838,7 @@ public class SalesforceComponent extends DefaultComponent implements SSLContextP
}
static SalesforceHttpClient createHttpClient(
- Object source, final SslContextFactory sslContextFactory, final CamelContext context, int workerPoolSize,
+ Object source, final SslContextFactory.Client sslContextFactory, final CamelContext context, int workerPoolSize,
int workerPoolMaxSize) {
SecurityUtils.adaptToIBMCipherNames(sslContextFactory);
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java
index e12403c498a..67aceb4c9a6 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java
@@ -33,6 +33,7 @@ import org.eclipse.jetty.client.HttpRequest;
import org.eclipse.jetty.client.ProtocolHandler;
import org.eclipse.jetty.client.api.Request;
import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
+import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.util.ssl.SslContextFactory;
/**
@@ -61,12 +62,12 @@ public class SalesforceHttpClient extends HttpClient {
this(null);
}
- public SalesforceHttpClient(SslContextFactory sslContextFactory) {
+ public SalesforceHttpClient(SslContextFactory.Client sslContextFactory) {
this(null, Executors.newCachedThreadPool(), sslContextFactory);
}
- public SalesforceHttpClient(CamelContext context, ExecutorService workerPool, SslContextFactory sslContextFactory) {
- super(new HttpClientTransportOverHTTP(), sslContextFactory);
+ public SalesforceHttpClient(CamelContext context, ExecutorService workerPool, SslContextFactory.Client sslContextFactory) {
+ super(new HttpClientTransportOverHTTP(newConnector(sslContextFactory)));
this.workerPool = workerPool;
this.camelContext = context;
@@ -90,6 +91,12 @@ public class SalesforceHttpClient extends HttpClient {
}
}
+ private static ClientConnector newConnector(SslContextFactory.Client sslContextFactory) {
+ ClientConnector connector = new ClientConnector();
+ connector.setSslContextFactory(sslContextFactory);
+ return connector;
+ }
+
@Override
public HttpRequest newHttpRequest(HttpConversation conversation, URI uri) {
final SalesforceHttpRequest request = new SalesforceHttpRequest(this, conversation, uri);
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBase.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBase.java
index cdbc0462509..984cb05a001 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBase.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBase.java
@@ -368,10 +368,11 @@ public abstract class AbstractClientBase extends ServiceSupport
return;
}
- final HttpFields requestHeaders = request.getHeaders();
- for (Entry<String, List<String>> header : headers.entrySet()) {
- requestHeaders.put(header.getKey(), header.getValue());
- }
+ request.headers(requestHeaders -> {
+ for (Entry<String, List<String>> header : headers.entrySet()) {
+ requestHeaders.put(header.getKey(), header.getValue());
+ }
+ });
}
static Map<String, List<String>> determineHeaders(final Exchange exchange) {
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
index fa9725fddf4..eee09ac6fdd 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
@@ -250,7 +250,7 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
@Override
protected void setAccessToken(Request request) {
// replace old token
- request.getHeaders().put(HttpHeader.AUTHORIZATION, TOKEN_PREFIX + accessToken);
+ request.header(HttpHeader.AUTHORIZATION, TOKEN_PREFIX + accessToken);
}
@Override
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiClient.java
index 09fa12c6d76..78bf19afdb1 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiClient.java
@@ -366,7 +366,8 @@ public class DefaultBulkApiClient extends AbstractClientBase implements BulkApiC
@Override
protected void setAccessToken(Request request) {
// replace old token
- request.getHeaders().put(TOKEN_HEADER, accessToken);
+ request.header(TOKEN_HEADER, null);
+ request.header(TOKEN_HEADER, accessToken);
}
@Override
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiV2Client.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiV2Client.java
index 38f11b3274d..7cfd3bf23d5 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiV2Client.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiV2Client.java
@@ -312,7 +312,8 @@ public class DefaultBulkApiV2Client extends AbstractClientBase implements BulkAp
@Override
protected void setAccessToken(Request request) {
- request.getHeaders().put(AUTHORIZATION_HEADER, BEARER_PREFIX + accessToken);
+ request.header(AUTHORIZATION_HEADER, null);
+ request.header(AUTHORIZATION_HEADER, BEARER_PREFIX + accessToken);
}
private String jobUrl(String jobId) {
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java
index 9b05fa62240..596ebc795dc 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java
@@ -228,7 +228,8 @@ public class DefaultCompositeApiClient extends AbstractClientBase implements Com
@Override
protected void setAccessToken(final Request request) {
- request.getHeaders().put("Authorization", "Bearer " + accessToken);
+ request.header("Authorization", null);
+ request.header("Authorization", "Bearer " + accessToken);
}
static void checkCompositeBatchVersion(final String configuredVersion, final Version batchVersion)
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeSObjectCollectionsApiClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeSObjectCollectionsApiClient.java
index 734ae54b4de..f3b72a4c3a4 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeSObjectCollectionsApiClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeSObjectCollectionsApiClient.java
@@ -182,7 +182,8 @@ public class DefaultCompositeSObjectCollectionsApiClient extends AbstractClientB
@Override
protected void setAccessToken(final Request request) {
- request.getHeaders().put("Authorization", "Bearer " + accessToken);
+ request.header("Authorization", null);
+ request.header("Authorization", "Bearer " + accessToken);
}
private Request createRequest(final String method, final String url, final Map<String, List<String>> headers) {
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRawClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRawClient.java
index c4483d4e0af..d4d2689471f 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRawClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRawClient.java
@@ -49,8 +49,10 @@ public class DefaultRawClient extends AbstractClientBase implements RawClient {
@Override
protected void setAccessToken(Request request) {
// replace old token
- request.getHeaders().put(BULK_TOKEN_HEADER, accessToken);
- request.getHeaders().put(REST_TOKEN_HEADER, TOKEN_PREFIX + accessToken);
+ request.header(BULK_TOKEN_HEADER, null);
+ request.header(REST_TOKEN_HEADER, null);
+ request.header(BULK_TOKEN_HEADER, accessToken);
+ request.header(REST_TOKEN_HEADER, TOKEN_PREFIX + accessToken);
}
@Override
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
index fc1329186bf..221b753a884 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
@@ -406,7 +406,8 @@ public class DefaultRestClient extends AbstractClientBase implements RestClient
@Override
protected void setAccessToken(Request request) {
// replace old token
- request.getHeaders().put(TOKEN_HEADER, TOKEN_PREFIX + accessToken);
+ request.header(TOKEN_HEADER, null);
+ request.header(TOKEN_HEADER, TOKEN_PREFIX + accessToken);
}
private String urlEncode(String query) throws UnsupportedEncodingException {
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityHandler.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityHandler.java
index b672f5c101f..a16d69bf08a 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityHandler.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityHandler.java
@@ -36,7 +36,6 @@ import org.eclipse.jetty.client.api.Response;
import org.eclipse.jetty.client.api.Result;
import org.eclipse.jetty.client.util.BufferingResponseListener;
import org.eclipse.jetty.http.HttpField;
-import org.eclipse.jetty.http.HttpFields;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpStatus;
import org.slf4j.Logger;
@@ -253,15 +252,16 @@ public class SalesforceSecurityHandler implements ProtocolHandler {
if (copy) {
newRequest = httpClient.copyRequest(request, request.getURI());
newRequest.method(request.getMethod());
- HttpFields headers = newRequest.getHeaders();
- // copy cookies and host for subscriptions to avoid
- // '403::Unknown Client' errors
- for (HttpField field : request.getHeaders()) {
- HttpHeader header = field.getHeader();
- if (HttpHeader.COOKIE.equals(header) || HttpHeader.HOST.equals(header)) {
- headers.add(header, field.getValue());
+ newRequest.headers(headers -> {
+ // copy cookies and host for subscriptions to avoid
+ // '403::Unknown Client' errors
+ for (HttpField field : request.getHeaders()) {
+ HttpHeader header = field.getHeader();
+ if (HttpHeader.COOKIE.equals(header) || HttpHeader.HOST.equals(header)) {
+ headers.add(header, field.getValue());
+ }
}
- }
+ });
} else {
newRequest = request;
}
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
index 51441670ef5..169ab68ab46 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
@@ -401,7 +401,7 @@ public class SubscriptionHelper extends ServiceSupport {
throw new RuntimeException(e);
}
}
- request.getHeaders().put(HttpHeader.AUTHORIZATION, "OAuth " + accessToken);
+ request.header(HttpHeader.AUTHORIZATION, "OAuth " + accessToken);
}
};
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiIntegrationTest.java
index 3e4fb04a798..fc9b405cab8 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiIntegrationTest.java
@@ -24,10 +24,13 @@ import org.apache.camel.component.salesforce.api.dto.bulk.OperationEnum;
import org.apache.camel.component.salesforce.dto.generated.Merchandise__c;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.client.HttpClientTransport;
import org.eclipse.jetty.client.api.ContentResponse;
import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
import org.eclipse.jetty.http.HttpMethod;
import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -42,9 +45,12 @@ public class BulkApiIntegrationTest extends AbstractBulkApiTestBase {
final SalesforceComponent sf = context().getComponent("salesforce", SalesforceComponent.class);
final String accessToken = sf.getSession().getAccessToken();
- final SslContextFactory sslContextFactory = new SslContextFactory.Client();
+ final SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
sslContextFactory.setSslContext(new SSLContextParameters().createSSLContext(context));
- final HttpClient httpClient = new HttpClient(sslContextFactory);
+ final ClientConnector connector = new ClientConnector();
+ connector.setSslContextFactory(sslContextFactory);
+ final HttpClientTransport transport = new HttpClientTransportOverHTTP(connector);
+ final HttpClient httpClient = new HttpClient(transport);
httpClient.setConnectTimeout(60000);
httpClient.start();
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java
index 555379373bf..d7cc5238e21 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java
@@ -16,7 +16,9 @@
*/
package org.apache.camel.component.salesforce;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
+import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -36,8 +38,6 @@ import org.apache.camel.test.junit5.params.Test;
import org.eclipse.jetty.proxy.ConnectHandler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.util.B64Code;
-import org.eclipse.jetty.util.StringUtil;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.slf4j.Logger;
@@ -108,7 +108,8 @@ public class HttpProxyIntegrationTest extends AbstractSalesforceTestBase {
server.addConnector(connector);
final String authenticationString
- = "Basic " + B64Code.encode(HTTP_PROXY_USER_NAME + ":" + HTTP_PROXY_PASSWORD, StringUtil.__ISO_8859_1);
+ = "Basic " + Base64.getEncoder().encodeToString(
+ (HTTP_PROXY_USER_NAME + ":" + HTTP_PROXY_PASSWORD).getBytes(StandardCharsets.ISO_8859_1));
ConnectHandler connectHandler = new ConnectHandler() {
@Override
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
index 0966e5ee092..cc5ec0f4bf4 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
@@ -59,10 +59,13 @@ import org.apache.camel.support.DefaultExchange;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.commons.io.IOUtils;
import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.client.HttpClientTransport;
import org.eclipse.jetty.client.api.ContentResponse;
import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
import org.eclipse.jetty.http.HttpMethod;
import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -619,9 +622,12 @@ public class RestApiIntegrationTest extends AbstractSalesforceTestBase {
final SalesforceComponent sf = context().getComponent("salesforce", SalesforceComponent.class);
final String accessToken = sf.getSession().getAccessToken();
- final SslContextFactory sslContextFactory = new SslContextFactory.Client();
+ final SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
sslContextFactory.setSslContext(new SSLContextParameters().createSSLContext(context));
- final HttpClient httpClient = new HttpClient(sslContextFactory);
+ final ClientConnector connector = new ClientConnector();
+ connector.setSslContextFactory(sslContextFactory);
+ final HttpClientTransport transport = new HttpClientTransportOverHTTP(connector);
+ final HttpClient httpClient = new HttpClient(transport);
httpClient.setConnectTimeout(60000);
httpClient.start();
@@ -639,9 +645,12 @@ public class RestApiIntegrationTest extends AbstractSalesforceTestBase {
final SalesforceComponent sf = context().getComponent("salesforce", SalesforceComponent.class);
final String accessToken = sf.getSession().getAccessToken();
- final SslContextFactory sslContextFactory = new SslContextFactory.Client();
+ final SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
sslContextFactory.setSslContext(new SSLContextParameters().createSSLContext(context));
- final HttpClient httpClient = new HttpClient(sslContextFactory);
+ final ClientConnector connector = new ClientConnector();
+ connector.setSslContextFactory(sslContextFactory);
+ final HttpClientTransport transport = new HttpClientTransportOverHTTP(connector);
+ final HttpClient httpClient = new HttpClient(transport);
httpClient.setConnectTimeout(60000);
httpClient.start();
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionIntegrationTest.java
index 3566d639a77..900f2a8cf37 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionIntegrationTest.java
@@ -40,7 +40,7 @@ public class SessionIntegrationTest implements SalesforceSession.SalesforceSessi
@Test
public void testLogin() throws Exception {
- final SslContextFactory sslContextFactory = new SslContextFactory.Client();
+ final SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
sslContextFactory.setSslContext(new SSLContextParameters().createSSLContext(new DefaultCamelContext()));
final SalesforceHttpClient httpClient = new SalesforceHttpClient(sslContextFactory);
httpClient.setConnectTimeout(TIMEOUT);
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBaseTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBaseTest.java
index af35dfe3ff7..9b430ed7c45 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBaseTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBaseTest.java
@@ -113,7 +113,7 @@ public class AbstractClientBaseTest {
@Test
public void shouldDetermineHeadersFromResponse() {
final Response response = mock(Response.class);
- final HttpFields httpHeaders = new HttpFields();
+ final HttpFields.Mutable httpHeaders = HttpFields.build();
httpHeaders.add("Date", "Mon, 20 May 2013 22:21:46 GMT");
httpHeaders.add("Sforce-Limit-Info", "api-usage=18/5000");
httpHeaders.add("Last-Modified", "Mon, 20 May 2013 20:49:32 GMT");
@@ -139,7 +139,7 @@ public class AbstractClientBaseTest {
final Result result = mock(Result.class);
final Response response = mock(Response.class);
when(result.getResponse()).thenReturn(response);
- when(response.getHeaders()).thenReturn(new HttpFields());
+ when(response.getHeaders()).thenReturn(HttpFields.build());
final SalesforceHttpRequest salesforceRequest = mock(SalesforceHttpRequest.class);
when(result.getRequest()).thenReturn(salesforceRequest);
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
index 46df4942a74..14eac46551d 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
@@ -140,19 +140,19 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-proxy</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
index 94a418a60a3..92b4837412f 100644
--- a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
+++ b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
@@ -25,7 +25,7 @@ public class JettySpanDecorator extends AbstractHttpSpanDecorator {
@Override
public String getComponentClassName() {
- return "org.apache.camel.component.jetty9.JettyHttpComponent9";
+ return "org.apache.camel.component.jetty10.JettyHttpComponent10";
}
}
diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml
index 22d03eb2c07..78b2be849da 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -153,25 +153,25 @@
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-client</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-http-client-transport</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>${jetty9-version}</version>
+ <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml
index cce4526e820..181575ad30c 100644
--- a/components/camel-websocket/pom.xml
+++ b/components/camel-websocket/pom.xml
@@ -35,8 +35,8 @@
<properties>
<camel.osgi.import.pkg>
!org.apache.camel.component.websocket.*,
- org.eclipse.jetty.util.ssl;version="[9.3,10)";resolution:=optional,
- org.eclipse.jetty.*;version="[9.3,10)",
+ org.eclipse.jetty.util.ssl;version="[10,11)";resolution:=optional,
+ org.eclipse.jetty.*;version="[10,11)",
${camel.osgi.import.defaults},
*
</camel.osgi.import.pkg>
@@ -51,17 +51,17 @@
<!-- Jetty -->
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
+ <artifactId>websocket-jetty-client</artifactId>
<version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-client</artifactId>
+ <artifactId>websocket-servlet</artifactId>
<version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-api</artifactId>
+ <artifactId>websocket-jetty-server</artifactId>
<version>${jetty-version}</version>
</dependency>
<dependency>
diff --git a/components/camel-websocket/src/generated/resources/org/apache/camel/component/websocket/websocket.json b/components/camel-websocket/src/generated/resources/org/apache/camel/component/websocket/websocket.json
index 9dd168f41c6..37e050a068b 100644
--- a/components/camel-websocket/src/generated/resources/org/apache/camel/component/websocket/websocket.json
+++ b/components/camel-websocket/src/generated/resources/org/apache/camel/component/websocket/websocket.json
@@ -42,7 +42,7 @@
"headers": {
"websocket.connectionKey": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Producer: Sends the message to all clients which are currently connected. You can use the sendToAll option on the endpoint instead of using this header. Consumer: Connection key identifying an individual client connection. You can save this and specify [...]
"websocket.sendToAll": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Sends the message to all clients which are currently connected. You can use the sendToAll option on the endpoint instead of using this header.", "constantName": "org.apache.camel.component.websocket.WebsocketConstants#SEND_TO_ALL" },
- "websocket.remoteAddress": { "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "java.net.InetSocketAddress", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Remote address of the websocket session.", "constantName": "org.apache.camel.component.websocket.WebsocketConstants#REMOTE_ADDRESS" },
+ "websocket.remoteAddress": { "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "java.net.SocketAddress", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Remote address of the websocket session.", "constantName": "org.apache.camel.component.websocket.WebsocketConstants#REMOTE_ADDRESS" },
"websocket.subprotocol": { "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "If a specific subprotocol was negotiated, it will be specfied in this header. Note that if you specify the any subprotocol to be supported, and a client requests a specific subprotocol, the connection will be accepted without a specific subprot [...]
"websocket.relativePath": { "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "If you specify a wildcard URI path for an endpoint, and a websocket client connects to that websocket endpoing, the relative path that the client specified will be provided in this header. For example, if you specified websocket:\/\/0.0.0.0:80 [...]
},
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocket.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocket.java
index 246fd3ba215..f280a4c5369 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocket.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocket.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.websocket;
import java.io.Serializable;
-import java.net.InetSocketAddress;
+import java.net.SocketAddress;
import java.util.UUID;
import org.eclipse.jetty.websocket.api.Session;
@@ -93,7 +93,7 @@ public class DefaultWebsocket implements Serializable {
}
}
- private InetSocketAddress getRemoteAddress() {
+ private SocketAddress getRemoteAddress() {
Session current = session;
return current != null ? current.getRemoteAddress() : null;
}
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocketFactory.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocketFactory.java
index aa8cb1bad40..8234e1b36af 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocketFactory.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocketFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.websocket;
-import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
+import org.eclipse.jetty.websocket.server.JettyServerUpgradeRequest;
/**
* Default websocket factory. Used when no custom websocket is needed.
@@ -25,7 +25,7 @@ public class DefaultWebsocketFactory implements WebSocketFactory {
@Override
public DefaultWebsocket newInstance(
- ServletUpgradeRequest request,
+ JettyServerUpgradeRequest request,
String pathSpec,
NodeSynchronization sync,
WebsocketConsumer consumer,
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/JettyClassPathResource.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/JettyClassPathResource.java
index 96198928b48..484408664f4 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/JettyClassPathResource.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/JettyClassPathResource.java
@@ -20,6 +20,8 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import java.nio.channels.ReadableByteChannel;
@@ -74,6 +76,18 @@ public class JettyClassPathResource extends Resource {
}
@Override
+ public URI getURI() {
+ URL url = getURL();
+ if (url == null) {
+ return null;
+ }
+ try {
+ return url.toURI();
+ } catch (URISyntaxException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
public URL getURL() {
return resolver.loadResourceAsURL(path);
}
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebSocketFactory.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebSocketFactory.java
index e377bf8cab8..ce0fa9b1817 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebSocketFactory.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebSocketFactory.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.websocket;
-import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
+import org.eclipse.jetty.websocket.server.JettyServerUpgradeRequest;
/**
* Web socket factory interface.
@@ -24,7 +24,7 @@ import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
public interface WebSocketFactory {
DefaultWebsocket newInstance(
- ServletUpgradeRequest request,
+ JettyServerUpgradeRequest request,
String pathSpec,
NodeSynchronization sync,
WebsocketConsumer consumer,
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
index 98fc9f9052f..6d756f485d9 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
@@ -55,6 +55,7 @@ import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.ThreadPool;
+import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -200,6 +201,7 @@ public class WebsocketComponent extends DefaultComponent implements SSLContextPa
if (endpoint.isSessionSupport()) {
enableSessionSupport(connectorRef.server, connectorKey);
}
+ JettyWebSocketServletContainerInitializer.configure(context, null);
LOG.info("Jetty Server starting on host: {}:{}", connector.getHost(), connector.getPort());
connectorRef.memoryStore.start();
connectorRef.server.start();
@@ -514,12 +516,12 @@ public class WebsocketComponent extends DefaultComponent implements SSLContextPa
private ServerConnector getSslSocketConnector(Server server, SSLContextParameters sslContextParameters) throws Exception {
ServerConnector sslSocketConnector = null;
if (sslContextParameters != null) {
- SslContextFactory sslContextFactory = new WebSocketComponentSslContextFactory();
+ SslContextFactory.Server sslContextFactory = new WebSocketComponentSslContextFactory();
sslContextFactory.setEndpointIdentificationAlgorithm(null);
sslContextFactory.setSslContext(sslContextParameters.createSSLContext(getCamelContext()));
sslSocketConnector = new ServerConnector(server, sslContextFactory);
} else {
- SslContextFactory sslContextFactory = new SslContextFactory();
+ SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
sslContextFactory.setEndpointIdentificationAlgorithm(null);
sslContextFactory.setKeyStorePassword(sslKeyPassword);
sslContextFactory.setKeyManagerPassword(sslPassword);
@@ -536,7 +538,7 @@ public class WebsocketComponent extends DefaultComponent implements SSLContextPa
* Override the key/trust store check method as it does not account for a factory that has a pre-configured
* {@link javax.net.ssl.SSLContext}.
*/
- private static final class WebSocketComponentSslContextFactory extends SslContextFactory {
+ private static final class WebSocketComponentSslContextFactory extends SslContextFactory.Server {
// This method is for Jetty 7.0.x ~ 7.4.x
@SuppressWarnings("unused")
public boolean checkConfig() {
@@ -827,6 +829,7 @@ public class WebsocketComponent extends DefaultComponent implements SSLContextPa
LOG.info("Starting static resources server {}:{} with static resource: {}", host, port, staticResources);
ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
staticResourcesServer = createStaticResourcesServer(context, host, port, staticResources);
+ JettyWebSocketServletContainerInitializer.configure(context, null);
staticResourcesServer.start();
ServerConnector connector = (ServerConnector) staticResourcesServer.getConnectors()[0];
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponentServlet.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponentServlet.java
index 042c827e8ed..e100d0e57e0 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponentServlet.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponentServlet.java
@@ -21,16 +21,17 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.stream.Collectors;
-import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
-import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
-import org.eclipse.jetty.websocket.servlet.WebSocketServlet;
-import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
+import org.eclipse.jetty.websocket.api.WebSocketPolicy;
+import org.eclipse.jetty.websocket.server.JettyServerUpgradeRequest;
+import org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse;
+import org.eclipse.jetty.websocket.server.JettyWebSocketServlet;
+import org.eclipse.jetty.websocket.server.JettyWebSocketServletFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.eclipse.jetty.websocket.api.WebSocketConstants.SEC_WEBSOCKET_PROTOCOL;
+import static org.eclipse.jetty.websocket.api.util.WebSocketConstants.SEC_WEBSOCKET_PROTOCOL;
-public class WebsocketComponentServlet extends WebSocketServlet {
+public class WebsocketComponentServlet extends JettyWebSocketServlet {
public static final String UNSPECIFIED_SUBPROTOCOL = "default";
public static final String ANY_SUBPROTOCOL = "any";
@@ -68,7 +69,7 @@ public class WebsocketComponentServlet extends WebSocketServlet {
consumers.remove(consumer.getPath());
}
- public DefaultWebsocket doWebSocketConnect(ServletUpgradeRequest request, ServletUpgradeResponse resp) {
+ public DefaultWebsocket doWebSocketConnect(JettyServerUpgradeRequest request, JettyServerUpgradeResponse resp) {
String subprotocol = negotiateSubprotocol(request, consumer);
if (subprotocol == null) {
return null; // no agreeable subprotocol was found, reject the connection
@@ -106,7 +107,7 @@ public class WebsocketComponentServlet extends WebSocketServlet {
return factory.newInstance(request, pathSpec, sync, consumer, subprotocol, relativePath);
}
- private String negotiateSubprotocol(ServletUpgradeRequest request, WebsocketConsumer consumer) {
+ private String negotiateSubprotocol(JettyServerUpgradeRequest request, WebsocketConsumer consumer) {
final String[] supportedSubprotocols = Optional.ofNullable(consumer)
.map(WebsocketConsumer::getEndpoint)
.map(WebsocketEndpoint::getSubprotocol)
@@ -154,7 +155,8 @@ public class WebsocketComponentServlet extends WebSocketServlet {
}
@Override
- public void configure(WebSocketServletFactory factory) {
+ protected void configure(JettyWebSocketServletFactory factory) {
+ getServletContext().setAttribute(WebSocketPolicy.class.getName(), factory);
factory.setCreator(this::doWebSocketConnect);
}
}
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketConstants.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketConstants.java
index 3036b0b4725..bd62f993158 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketConstants.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketConstants.java
@@ -34,7 +34,7 @@ public final class WebsocketConstants {
javaType = "Boolean")
public static final String SEND_TO_ALL = "websocket.sendToAll";
@Metadata(label = "consumer", description = "Remote address of the websocket session.",
- javaType = "java.net.InetSocketAddress")
+ javaType = "java.net.SocketAddress")
public static final String REMOTE_ADDRESS = "websocket.remoteAddress";
@Metadata(label = "consumer",
description = "If a specific subprotocol was negotiated, it will be specfied in this header. " +
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketConsumer.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketConsumer.java
index 2c431a328c0..96d92b1c7ce 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketConsumer.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketConsumer.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.websocket;
-import java.net.InetSocketAddress;
+import java.net.SocketAddress;
import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
@@ -56,7 +56,7 @@ public class WebsocketConsumer extends DefaultConsumer implements WebsocketProdu
public void sendMessage(
final String connectionKey,
final String message,
- final InetSocketAddress remote,
+ final SocketAddress remote,
final String subprotocol,
final String relativePath) {
sendMessage(connectionKey, (Object) message, remote, subprotocol, relativePath);
@@ -65,7 +65,7 @@ public class WebsocketConsumer extends DefaultConsumer implements WebsocketProdu
public void sendMessage(
final String connectionKey,
final Object message,
- final InetSocketAddress remote,
+ final SocketAddress remote,
final String subprotocol,
final String relativePath) {
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java
index 06eb2d297e9..18376049aee 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java
@@ -27,6 +27,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.util.StopWatch;
+import org.eclipse.jetty.util.FutureCallback;
+import org.eclipse.jetty.websocket.api.WriteCallback;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -165,10 +167,14 @@ public class WebsocketProducer extends DefaultProducer implements WebsocketProdu
if (websocket != null && websocket.getSession().isOpen()) {
LOG.trace("Sending to websocket {} -> {}", websocket.getConnectionKey(), message);
if (message instanceof String) {
- future = websocket.getSession().getRemote().sendStringByFuture((String) message);
+ FutureWriteCallback callback = new FutureWriteCallback();
+ websocket.getSession().getRemote().sendString((String) message, callback);
+ future = callback;
} else if (message instanceof byte[]) {
+ FutureWriteCallback callback = new FutureWriteCallback();
ByteBuffer buf = ByteBuffer.wrap((byte[]) message);
- future = websocket.getSession().getRemote().sendBytesByFuture(buf);
+ websocket.getSession().getRemote().sendBytes(buf, callback);
+ future = callback;
}
}
return future;
@@ -194,4 +200,23 @@ public class WebsocketProducer extends DefaultProducer implements WebsocketProdu
throw e;
}
+ private static class FutureWriteCallback extends FutureCallback implements WriteCallback {
+ private static final Logger LOG = LoggerFactory.getLogger(FutureWriteCallback.class);
+
+ @Override
+ public void writeFailed(Throwable cause) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(".writeFailed", cause);
+ }
+ failed(cause);
+ }
+
+ @Override
+ public void writeSuccess() {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(".writeSuccess");
+ }
+ succeeded();
+ }
+ }
}
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java
index 40a4da1e012..6446cee1540 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentServletTest.java
@@ -21,9 +21,9 @@ import java.util.HashMap;
import java.util.Map;
import org.eclipse.jetty.websocket.api.Session;
-import org.eclipse.jetty.websocket.api.WebSocketConstants;
-import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
-import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
+import org.eclipse.jetty.websocket.api.util.WebSocketConstants;
+import org.eclipse.jetty.websocket.server.JettyServerUpgradeRequest;
+import org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.InOrder;
@@ -56,9 +56,9 @@ public class WebsocketComponentServletTest {
@Mock
private NodeSynchronization sync;
@Mock
- private ServletUpgradeRequest request;
+ private JettyServerUpgradeRequest request;
@Mock
- private ServletUpgradeResponse response;
+ private JettyServerUpgradeResponse response;
private WebsocketComponentServlet websocketComponentServlet;
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java
index 1a0180fbc7d..7e99dc23dac 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurationTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.websocket;
+import java.time.Duration;
+
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.component.websocket.WebsocketComponent.ConnectorRef;
@@ -23,7 +25,7 @@ import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
-import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
+import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoSettings;
@@ -68,16 +70,16 @@ public class WebsocketEndpointConfigurationTest extends CamelTestSupport {
String maxBinaryMessageSize = context.getInitParameter("maxBinaryMessageSize");
assertEquals("550", maxBinaryMessageSize, "Got a wrong maxBinaryMessageSize");
- WebSocketServletFactory factory
- = (WebSocketServletFactory) context.getServletContext().getAttribute(WebSocketServletFactory.class.getName());
- int factoryBufferSize = factory.getPolicy().getInputBufferSize();
+ WebSocketPolicy policy
+ = (WebSocketPolicy) context.getServletContext().getAttribute(WebSocketPolicy.class.getName());
+ int factoryBufferSize = policy.getInputBufferSize();
assertEquals(25000, factoryBufferSize, "Got a wrong buffersize");
- long factoryMaxIdleTime = factory.getPolicy().getIdleTimeout();
- assertEquals(3000, factoryMaxIdleTime, "Got a wrong maxIdleTime");
- int factoryMaxTextMessageSize = factory.getPolicy().getMaxTextMessageSize();
- assertEquals(500, factoryMaxTextMessageSize, "Got a wrong maxTextMessageSize");
- int factoryMaxBinaryMessageSize = factory.getPolicy().getMaxBinaryMessageSize();
- assertEquals(550, factoryMaxBinaryMessageSize, "Got a wrong maxBinaryMessageSize");
+ Duration factoryMaxIdleTime = policy.getIdleTimeout();
+ assertEquals(3000, factoryMaxIdleTime.toMillis(), "Got a wrong maxIdleTime");
+ long factoryMaxTextMessageSize = policy.getMaxTextMessageSize();
+ assertEquals(500L, factoryMaxTextMessageSize, "Got a wrong maxTextMessageSize");
+ long factoryMaxBinaryMessageSize = policy.getMaxBinaryMessageSize();
+ assertEquals(550L, factoryMaxBinaryMessageSize, "Got a wrong maxBinaryMessageSize");
}
@Test
@@ -101,12 +103,12 @@ public class WebsocketEndpointConfigurationTest extends CamelTestSupport {
String maxIdleTime = context.getInitParameter("maxIdleTime");
assertEquals("3000", maxIdleTime, "Got a wrong maxIdleTime");
- WebSocketServletFactory factory
- = (WebSocketServletFactory) context.getServletContext().getAttribute(WebSocketServletFactory.class.getName());
- int factoryBufferSize = factory.getPolicy().getInputBufferSize();
+ WebSocketPolicy policy
+ = (WebSocketPolicy) context.getServletContext().getAttribute(WebSocketPolicy.class.getName());
+ int factoryBufferSize = policy.getInputBufferSize();
assertEquals(25000, factoryBufferSize, "Got a wrong buffersize");
- long factoryMaxIdleTime = factory.getPolicy().getIdleTimeout();
- assertEquals(3000, factoryMaxIdleTime, "Got a wrong maxIdleTime");
+ Duration factoryMaxIdleTime = policy.getIdleTimeout();
+ assertEquals(3000, factoryMaxIdleTime.toMillis(), "Got a wrong maxIdleTime");
}
@Test
@@ -131,12 +133,12 @@ public class WebsocketEndpointConfigurationTest extends CamelTestSupport {
String maxIdleTime = context.getInitParameter("maxIdleTime");
assertEquals("3000", maxIdleTime, "Got a wrong maxIdleTime");
- WebSocketServletFactory factory
- = (WebSocketServletFactory) context.getServletContext().getAttribute(WebSocketServletFactory.class.getName());
- int factoryBufferSize = factory.getPolicy().getInputBufferSize();
+ WebSocketPolicy policy
+ = (WebSocketPolicy) context.getServletContext().getAttribute(WebSocketPolicy.class.getName());
+ int factoryBufferSize = policy.getInputBufferSize();
assertEquals(25000, factoryBufferSize, "Got a wrong buffersize");
- long factoryMaxIdleTime = factory.getPolicy().getIdleTimeout();
- assertEquals(3000, factoryMaxIdleTime, "Got a wrong maxIdleTime");
+ Duration factoryMaxIdleTime = policy.getIdleTimeout();
+ assertEquals(3000, factoryMaxIdleTime.toMillis(), "Got a wrong maxIdleTime");
}
}
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerTest.java
index f67393186f7..008643aa81e 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerTest.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.websocket;
import java.util.Arrays;
import java.util.Collection;
-import java.util.concurrent.Future;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.eclipse.jetty.websocket.api.RemoteEndpoint;
import org.eclipse.jetty.websocket.api.Session;
+import org.eclipse.jetty.websocket.api.WriteCallback;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.InOrder;
@@ -36,6 +36,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;
@@ -62,9 +65,6 @@ public class WebsocketProducerTest {
private Message inMessage;
@Mock
private RemoteEndpoint remoteEndpoint;
- @Mock
- private Future<Void> future;
-
private WebsocketProducer websocketProducer;
private Collection<DefaultWebsocket> sockets;
@@ -85,6 +85,11 @@ public class WebsocketProducerTest {
when(defaultWebsocket1.getSession()).thenReturn(session);
when(session.isOpen()).thenReturn(true);
when(session.getRemote()).thenReturn(remoteEndpoint);
+ doAnswer(
+ invocation -> {
+ invocation.getArgument(1, WriteCallback.class).writeSuccess();
+ return null;
+ }).when(remoteEndpoint).sendString(eq(MESSAGE), any());
websocketProducer.process(exchange);
@@ -98,7 +103,8 @@ public class WebsocketProducerTest {
inOrder.verify(defaultWebsocket1, times(1)).getSession();
inOrder.verify(session, times(1)).isOpen();
inOrder.verify(defaultWebsocket1, times(1)).getSession();
- inOrder.verify(remoteEndpoint, times(1)).sendStringByFuture(MESSAGE);
+ inOrder.verify(remoteEndpoint, times(1)).sendString(eq(MESSAGE), any());
+ inOrder.verify(endpoint, times(1)).getSendTimeout();
inOrder.verifyNoMoreInteractions();
}
@@ -112,7 +118,6 @@ public class WebsocketProducerTest {
when(defaultWebsocket1.getSession()).thenReturn(session);
when(session.isOpen()).thenReturn(true);
when(session.getRemote()).thenReturn(remoteEndpoint);
- when(remoteEndpoint.sendStringByFuture(MESSAGE)).thenReturn(future);
try {
websocketProducer.process(exchange);
@@ -131,13 +136,14 @@ public class WebsocketProducerTest {
inOrder.verify(defaultWebsocket1, times(1)).getSession();
inOrder.verify(session, times(1)).isOpen();
inOrder.verify(defaultWebsocket1, times(1)).getSession();
- inOrder.verify(remoteEndpoint, times(1)).sendStringByFuture(MESSAGE);
+ inOrder.verify(remoteEndpoint, times(1)).sendString(eq(MESSAGE), any());
inOrder.verify(endpoint, times(1)).getSendTimeout();
inOrder.verifyNoMoreInteractions();
}
@Test
public void testProcessMultipleMessages() throws Exception {
+ when(endpoint.getSendTimeout()).thenReturn(20);
when(exchange.getIn()).thenReturn(inMessage);
when(inMessage.getMandatoryBody()).thenReturn(MESSAGE);
when(inMessage.getHeader(WebsocketConstants.SEND_TO_ALL, false, Boolean.class)).thenReturn(true);
@@ -146,6 +152,11 @@ public class WebsocketProducerTest {
when(defaultWebsocket2.getSession()).thenReturn(session);
when(session.isOpen()).thenReturn(true);
when(session.getRemote()).thenReturn(remoteEndpoint);
+ doAnswer(
+ invocation -> {
+ invocation.getArgument(1, WriteCallback.class).writeSuccess();
+ return null;
+ }).when(remoteEndpoint).sendString(eq(MESSAGE), any());
websocketProducer.process(exchange);
@@ -158,11 +169,11 @@ public class WebsocketProducerTest {
inOrder.verify(defaultWebsocket1, times(1)).getSession();
inOrder.verify(session, times(1)).isOpen();
inOrder.verify(defaultWebsocket1, times(1)).getSession();
- inOrder.verify(remoteEndpoint, times(1)).sendStringByFuture(MESSAGE);
+ inOrder.verify(remoteEndpoint, times(1)).sendString(eq(MESSAGE), any());
inOrder.verify(defaultWebsocket2, times(1)).getSession();
inOrder.verify(session, times(1)).isOpen();
inOrder.verify(defaultWebsocket2, times(1)).getSession();
- inOrder.verify(remoteEndpoint, times(1)).sendStringByFuture(MESSAGE);
+ inOrder.verify(remoteEndpoint, times(1)).sendString(eq(MESSAGE), any());
inOrder.verify(endpoint, times(1)).getSendTimeout();
inOrder.verifyNoMoreInteractions();
}
@@ -203,7 +214,7 @@ public class WebsocketProducerTest {
inOrder.verify(defaultWebsocket1, times(1)).getSession();
inOrder.verify(session, times(1)).isOpen();
inOrder.verify(defaultWebsocket1, times(1)).getSession();
- inOrder.verify(remoteEndpoint, times(1)).sendStringByFuture(MESSAGE);
+ inOrder.verify(remoteEndpoint, times(1)).sendString(eq(MESSAGE), any());
inOrder.verifyNoMoreInteractions();
}
@@ -242,11 +253,17 @@ public class WebsocketProducerTest {
@Test
public void testSendToAll() throws Exception {
+ when(endpoint.getSendTimeout()).thenReturn(20);
when(store.getAll()).thenReturn(sockets);
when(defaultWebsocket1.getSession()).thenReturn(session);
when(defaultWebsocket2.getSession()).thenReturn(session);
when(session.getRemote()).thenReturn(remoteEndpoint);
when(session.isOpen()).thenReturn(true);
+ doAnswer(
+ invocation -> {
+ invocation.getArgument(1, WriteCallback.class).writeSuccess();
+ return null;
+ }).when(remoteEndpoint).sendString(eq(MESSAGE), any());
websocketProducer.sendToAll(store, MESSAGE, exchange);
@@ -255,11 +272,11 @@ public class WebsocketProducerTest {
inOrder.verify(defaultWebsocket1, times(1)).getSession();
inOrder.verify(session, times(1)).isOpen();
inOrder.verify(defaultWebsocket1, times(1)).getSession();
- inOrder.verify(remoteEndpoint, times(1)).sendStringByFuture(MESSAGE);
+ inOrder.verify(remoteEndpoint, times(1)).sendString(eq(MESSAGE), any());
inOrder.verify(defaultWebsocket2, times(1)).getSession();
inOrder.verify(session, times(1)).isOpen();
inOrder.verify(defaultWebsocket2, times(1)).getSession();
- inOrder.verify(remoteEndpoint, times(1)).sendStringByFuture(MESSAGE);
+ inOrder.verify(remoteEndpoint, times(1)).sendString(eq(MESSAGE), any());
inOrder.verifyNoMoreInteractions();
}
@@ -273,7 +290,6 @@ public class WebsocketProducerTest {
when(defaultWebsocket2.getSession()).thenReturn(session);
when(session.getRemote()).thenReturn(remoteEndpoint);
when(session.isOpen()).thenReturn(true);
- when(remoteEndpoint.sendStringByFuture(MESSAGE)).thenReturn(future);
try {
websocketProducer.process(exchange);
@@ -287,11 +303,11 @@ public class WebsocketProducerTest {
inOrder.verify(defaultWebsocket1, times(1)).getSession();
inOrder.verify(session, times(1)).isOpen();
inOrder.verify(defaultWebsocket1, times(1)).getSession();
- inOrder.verify(remoteEndpoint, times(1)).sendStringByFuture(MESSAGE);
+ inOrder.verify(remoteEndpoint, times(1)).sendString(eq(MESSAGE), any());
inOrder.verify(defaultWebsocket2, times(1)).getSession();
inOrder.verify(session, times(1)).isOpen();
inOrder.verify(defaultWebsocket2, times(1)).getSession();
- inOrder.verify(remoteEndpoint, times(1)).sendStringByFuture(MESSAGE);
+ inOrder.verify(remoteEndpoint, times(1)).sendString(eq(MESSAGE), any());
inOrder.verifyNoMoreInteractions();
}
}
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSubprotocolNegotiationTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSubprotocolNegotiationTest.java
index dbb94523533..01a25d4ae73 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSubprotocolNegotiationTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSubprotocolNegotiationTest.java
@@ -19,13 +19,13 @@ package org.apache.camel.component.websocket;
import java.util.*;
import java.util.stream.Stream;
-import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
-import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
+import org.eclipse.jetty.websocket.server.JettyServerUpgradeRequest;
+import org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
-import static org.eclipse.jetty.websocket.api.WebSocketConstants.SEC_WEBSOCKET_PROTOCOL;
+import static org.eclipse.jetty.websocket.api.util.WebSocketConstants.SEC_WEBSOCKET_PROTOCOL;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.params.provider.Arguments.arguments;
@@ -85,8 +85,8 @@ public class WebsocketSubprotocolNegotiationTest {
// mock the test component inputs
NodeSynchronization sync = mock(NodeSynchronization.class);
Map<String, WebSocketFactory> factoryMap = mock(Map.class);
- ServletUpgradeRequest req = mock(ServletUpgradeRequest.class);
- ServletUpgradeResponse res = mock(ServletUpgradeResponse.class);
+ JettyServerUpgradeRequest req = mock(JettyServerUpgradeRequest.class);
+ JettyServerUpgradeResponse res = mock(JettyServerUpgradeResponse.class);
WebsocketConsumer consumer = mock(WebsocketConsumer.class);
WebsocketEndpoint endpoint = mock(WebsocketEndpoint.class);
DefaultWebsocket implementation = mock(DefaultWebsocket.class);
diff --git a/docs/components/modules/ROOT/examples/json/jetty.json b/docs/components/modules/ROOT/examples/json/jetty.json
index 6ccff7b448c..d75cffe146d 120000
--- a/docs/components/modules/ROOT/examples/json/jetty.json
+++ b/docs/components/modules/ROOT/examples/json/jetty.json
@@ -1 +1 @@
-../../../../../../components/camel-jetty/src/generated/resources/org/apache/camel/component/jetty9/jetty.json
\ No newline at end of file
+../../../../../../components/camel-jetty/src/generated/resources/org/apache/camel/component/jetty10/jetty.json
\ No newline at end of file
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
index 66c54603e16..2e22543ac27 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
@@ -2349,7 +2349,7 @@ public interface ComponentsBuilderFactory {
}
/**
* Jetty (camel-jetty)
- * Expose HTTP endpoints using Jetty 9.
+ * Expose HTTP endpoints using Jetty 10.
*
* Category: http
* Since: 1.2
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JettyComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JettyComponentBuilderFactory.java
index b5b006567cc..5be9fc2d47a 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JettyComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JettyComponentBuilderFactory.java
@@ -20,10 +20,10 @@ import javax.annotation.Generated;
import org.apache.camel.Component;
import org.apache.camel.builder.component.AbstractComponentBuilder;
import org.apache.camel.builder.component.ComponentBuilder;
-import org.apache.camel.component.jetty9.JettyHttpComponent9;
+import org.apache.camel.component.jetty10.JettyHttpComponent10;
/**
- * Expose HTTP endpoints using Jetty 9.
+ * Expose HTTP endpoints using Jetty 10.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@@ -32,7 +32,7 @@ public interface JettyComponentBuilderFactory {
/**
* Jetty (camel-jetty)
- * Expose HTTP endpoints using Jetty 9.
+ * Expose HTTP endpoints using Jetty 10.
*
* Category: http
* Since: 1.2
@@ -49,7 +49,7 @@ public interface JettyComponentBuilderFactory {
*/
interface JettyComponentBuilder
extends
- ComponentBuilder<JettyHttpComponent9> {
+ ComponentBuilder<JettyHttpComponent10> {
/**
* Allows for bridging the consumer to the Camel routing Error Handler,
* which mean any exceptions occurred while the consumer is trying to
@@ -608,12 +608,12 @@ public interface JettyComponentBuilderFactory {
class JettyComponentBuilderImpl
extends
- AbstractComponentBuilder<JettyHttpComponent9>
+ AbstractComponentBuilder<JettyHttpComponent10>
implements
JettyComponentBuilder {
@Override
- protected JettyHttpComponent9 buildConcreteComponent() {
- return new JettyHttpComponent9();
+ protected JettyHttpComponent10 buildConcreteComponent() {
+ return new JettyHttpComponent10();
}
@Override
protected boolean setPropertyOnComponent(
@@ -621,39 +621,39 @@ public interface JettyComponentBuilderFactory {
String name,
Object value) {
switch (name) {
- case "bridgeErrorHandler": ((JettyHttpComponent9) component).setBridgeErrorHandler((boolean) value); return true;
- case "continuationTimeout": ((JettyHttpComponent9) component).setContinuationTimeout((java.lang.Long) value); return true;
- case "enableJmx": ((JettyHttpComponent9) component).setEnableJmx((boolean) value); return true;
- case "maxThreads": ((JettyHttpComponent9) component).setMaxThreads((java.lang.Integer) value); return true;
- case "minThreads": ((JettyHttpComponent9) component).setMinThreads((java.lang.Integer) value); return true;
- case "muteException": ((JettyHttpComponent9) component).setMuteException((boolean) value); return true;
- case "requestBufferSize": ((JettyHttpComponent9) component).setRequestBufferSize((java.lang.Integer) value); return true;
- case "requestHeaderSize": ((JettyHttpComponent9) component).setRequestHeaderSize((java.lang.Integer) value); return true;
- case "responseBufferSize": ((JettyHttpComponent9) component).setResponseBufferSize((java.lang.Integer) value); return true;
- case "responseHeaderSize": ((JettyHttpComponent9) component).setResponseHeaderSize((java.lang.Integer) value); return true;
- case "sendServerVersion": ((JettyHttpComponent9) component).setSendServerVersion((boolean) value); return true;
- case "useContinuation": ((JettyHttpComponent9) component).setUseContinuation((boolean) value); return true;
- case "useXForwardedForHeader": ((JettyHttpComponent9) component).setUseXForwardedForHeader((boolean) value); return true;
- case "threadPool": ((JettyHttpComponent9) component).setThreadPool((org.eclipse.jetty.util.thread.ThreadPool) value); return true;
- case "allowJavaSerializedObject": ((JettyHttpComponent9) component).setAllowJavaSerializedObject((boolean) value); return true;
- case "autowiredEnabled": ((JettyHttpComponent9) component).setAutowiredEnabled((boolean) value); return true;
- case "errorHandler": ((JettyHttpComponent9) component).setErrorHandler((org.eclipse.jetty.server.handler.ErrorHandler) value); return true;
- case "httpBinding": ((JettyHttpComponent9) component).setHttpBinding((org.apache.camel.http.common.HttpBinding) value); return true;
- case "httpConfiguration": ((JettyHttpComponent9) component).setHttpConfiguration((org.apache.camel.http.common.HttpConfiguration) value); return true;
- case "jettyHttpBinding": ((JettyHttpComponent9) component).setJettyHttpBinding((org.apache.camel.component.jetty.JettyHttpBinding) value); return true;
- case "mbContainer": ((JettyHttpComponent9) component).setMbContainer((org.eclipse.jetty.jmx.MBeanContainer) value); return true;
- case "headerFilterStrategy": ((JettyHttpComponent9) component).setHeaderFilterStrategy((org.apache.camel.spi.HeaderFilterStrategy) value); return true;
- case "proxyHost": ((JettyHttpComponent9) component).setProxyHost((java.lang.String) value); return true;
- case "proxyPort": ((JettyHttpComponent9) component).setProxyPort((java.lang.Integer) value); return true;
- case "keystore": ((JettyHttpComponent9) component).setKeystore((java.lang.String) value); return true;
- case "socketConnectorProperties": ((JettyHttpComponent9) component).setSocketConnectorProperties((java.util.Map) value); return true;
- case "socketConnectors": ((JettyHttpComponent9) component).setSocketConnectors((java.util.Map) value); return true;
- case "sslContextParameters": ((JettyHttpComponent9) component).setSslContextParameters((org.apache.camel.support.jsse.SSLContextParameters) value); return true;
- case "sslKeyPassword": ((JettyHttpComponent9) component).setSslKeyPassword((java.lang.String) value); return true;
- case "sslPassword": ((JettyHttpComponent9) component).setSslPassword((java.lang.String) value); return true;
- case "sslSocketConnectorProperties": ((JettyHttpComponent9) component).setSslSocketConnectorProperties((java.util.Map) value); return true;
- case "sslSocketConnectors": ((JettyHttpComponent9) component).setSslSocketConnectors((java.util.Map) value); return true;
- case "useGlobalSslContextParameters": ((JettyHttpComponent9) component).setUseGlobalSslContextParameters((boolean) value); return true;
+ case "bridgeErrorHandler": ((JettyHttpComponent10) component).setBridgeErrorHandler((boolean) value); return true;
+ case "continuationTimeout": ((JettyHttpComponent10) component).setContinuationTimeout((java.lang.Long) value); return true;
+ case "enableJmx": ((JettyHttpComponent10) component).setEnableJmx((boolean) value); return true;
+ case "maxThreads": ((JettyHttpComponent10) component).setMaxThreads((java.lang.Integer) value); return true;
+ case "minThreads": ((JettyHttpComponent10) component).setMinThreads((java.lang.Integer) value); return true;
+ case "muteException": ((JettyHttpComponent10) component).setMuteException((boolean) value); return true;
+ case "requestBufferSize": ((JettyHttpComponent10) component).setRequestBufferSize((java.lang.Integer) value); return true;
+ case "requestHeaderSize": ((JettyHttpComponent10) component).setRequestHeaderSize((java.lang.Integer) value); return true;
+ case "responseBufferSize": ((JettyHttpComponent10) component).setResponseBufferSize((java.lang.Integer) value); return true;
+ case "responseHeaderSize": ((JettyHttpComponent10) component).setResponseHeaderSize((java.lang.Integer) value); return true;
+ case "sendServerVersion": ((JettyHttpComponent10) component).setSendServerVersion((boolean) value); return true;
+ case "useContinuation": ((JettyHttpComponent10) component).setUseContinuation((boolean) value); return true;
+ case "useXForwardedForHeader": ((JettyHttpComponent10) component).setUseXForwardedForHeader((boolean) value); return true;
+ case "threadPool": ((JettyHttpComponent10) component).setThreadPool((org.eclipse.jetty.util.thread.ThreadPool) value); return true;
+ case "allowJavaSerializedObject": ((JettyHttpComponent10) component).setAllowJavaSerializedObject((boolean) value); return true;
+ case "autowiredEnabled": ((JettyHttpComponent10) component).setAutowiredEnabled((boolean) value); return true;
+ case "errorHandler": ((JettyHttpComponent10) component).setErrorHandler((org.eclipse.jetty.server.handler.ErrorHandler) value); return true;
+ case "httpBinding": ((JettyHttpComponent10) component).setHttpBinding((org.apache.camel.http.common.HttpBinding) value); return true;
+ case "httpConfiguration": ((JettyHttpComponent10) component).setHttpConfiguration((org.apache.camel.http.common.HttpConfiguration) value); return true;
+ case "jettyHttpBinding": ((JettyHttpComponent10) component).setJettyHttpBinding((org.apache.camel.component.jetty.JettyHttpBinding) value); return true;
+ case "mbContainer": ((JettyHttpComponent10) component).setMbContainer((org.eclipse.jetty.jmx.MBeanContainer) value); return true;
+ case "headerFilterStrategy": ((JettyHttpComponent10) component).setHeaderFilterStrategy((org.apache.camel.spi.HeaderFilterStrategy) value); return true;
+ case "proxyHost": ((JettyHttpComponent10) component).setProxyHost((java.lang.String) value); return true;
+ case "proxyPort": ((JettyHttpComponent10) component).setProxyPort((java.lang.Integer) value); return true;
+ case "keystore": ((JettyHttpComponent10) component).setKeystore((java.lang.String) value); return true;
+ case "socketConnectorProperties": ((JettyHttpComponent10) component).setSocketConnectorProperties((java.util.Map) value); return true;
+ case "socketConnectors": ((JettyHttpComponent10) component).setSocketConnectors((java.util.Map) value); return true;
+ case "sslContextParameters": ((JettyHttpComponent10) component).setSslContextParameters((org.apache.camel.support.jsse.SSLContextParameters) value); return true;
+ case "sslKeyPassword": ((JettyHttpComponent10) component).setSslKeyPassword((java.lang.String) value); return true;
+ case "sslPassword": ((JettyHttpComponent10) component).setSslPassword((java.lang.String) value); return true;
+ case "sslSocketConnectorProperties": ((JettyHttpComponent10) component).setSslSocketConnectorProperties((java.util.Map) value); return true;
+ case "sslSocketConnectors": ((JettyHttpComponent10) component).setSslSocketConnectors((java.util.Map) value); return true;
+ case "useGlobalSslContextParameters": ((JettyHttpComponent10) component).setUseGlobalSslContextParameters((boolean) value); return true;
default: return false;
}
}
diff --git a/dsl/camel-componentdsl/src/generated/resources/metadata.json b/dsl/camel-componentdsl/src/generated/resources/metadata.json
index 1013120ce38..3c05b9d255f 100644
--- a/dsl/camel-componentdsl/src/generated/resources/metadata.json
+++ b/dsl/camel-componentdsl/src/generated/resources/metadata.json
@@ -3844,12 +3844,12 @@
"kind": "component",
"name": "jetty",
"title": "Jetty",
- "description": "Expose HTTP endpoints using Jetty 9.",
+ "description": "Expose HTTP endpoints using Jetty 10.",
"deprecated": false,
"deprecationNote": "",
"firstVersion": "1.2.0",
"label": "http",
- "javaType": "org.apache.camel.component.jetty9.JettyHttpComponent9",
+ "javaType": "org.apache.camel.component.jetty10.JettyHttpComponent10",
"supportLevel": "Stable",
"groupId": "org.apache.camel",
"artifactId": "camel-jetty",
diff --git a/dsl/camel-endpointdsl/pom.xml b/dsl/camel-endpointdsl/pom.xml
index f69be94b2a6..9bdbce596d8 100644
--- a/dsl/camel-endpointdsl/pom.xml
+++ b/dsl/camel-endpointdsl/pom.xml
@@ -87,8 +87,18 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty.http2</groupId>
+ <artifactId>http2-hpack</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.http2</groupId>
+ <artifactId>http2-hpack</artifactId>
+ <version>${jetty-version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index 9ac6e30b95a..d347165d1b6 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -7968,7 +7968,7 @@ public class StaticEndpointBuilders {
}
/**
* Jetty (camel-jetty)
- * Expose HTTP endpoints using Jetty 9.
+ * Expose HTTP endpoints using Jetty 10.
*
* Category: http
* Since: 1.2
@@ -7988,7 +7988,7 @@ public class StaticEndpointBuilders {
}
/**
* Jetty (camel-jetty)
- * Expose HTTP endpoints using Jetty 9.
+ * Expose HTTP endpoints using Jetty 10.
*
* Category: http
* Since: 1.2
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilderFactory.java
index 49a094187f3..a430765d953 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilderFactory.java
@@ -27,7 +27,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
- * Expose HTTP endpoints using Jetty 9.
+ * Expose HTTP endpoints using Jetty 10.
*
* Generated by camel build tools - do NOT edit this file!
*/
@@ -1218,7 +1218,7 @@ public interface JettyHttpEndpointBuilderFactory {
public interface JettyHttpBuilders {
/**
* Jetty (camel-jetty)
- * Expose HTTP endpoints using Jetty 9.
+ * Expose HTTP endpoints using Jetty 10.
*
* Category: http
* Since: 1.2
@@ -1231,7 +1231,7 @@ public interface JettyHttpEndpointBuilderFactory {
}
/**
* Jetty (camel-jetty)
- * Expose HTTP endpoints using Jetty 9.
+ * Expose HTTP endpoints using Jetty 10.
*
* Category: http
* Since: 1.2
@@ -1250,7 +1250,7 @@ public interface JettyHttpEndpointBuilderFactory {
}
/**
* Jetty (camel-jetty)
- * Expose HTTP endpoints using Jetty 9.
+ * Expose HTTP endpoints using Jetty 10.
*
* Category: http
* Since: 1.2
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WebsocketEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WebsocketEndpointBuilderFactory.java
index 08cd983d822..d4c3c2c98d0 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WebsocketEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WebsocketEndpointBuilderFactory.java
@@ -1435,7 +1435,7 @@ public interface WebsocketEndpointBuilderFactory {
/**
* Remote address of the websocket session.
*
- * The option is a: {@code java.net.InetSocketAddress} type.
+ * The option is a: {@code java.net.SocketAddress} type.
*
* Group: consumer
*
diff --git a/dsl/camel-kamelet-main/src/generated/resources/camel-component-known-dependencies.properties b/dsl/camel-kamelet-main/src/generated/resources/camel-component-known-dependencies.properties
index 6b557c392c8..84521c42410 100644
--- a/dsl/camel-kamelet-main/src/generated/resources/camel-component-known-dependencies.properties
+++ b/dsl/camel-kamelet-main/src/generated/resources/camel-component-known-dependencies.properties
@@ -183,7 +183,7 @@ org.apache.camel.component.jcache.JCacheComponent=camel:jcache
org.apache.camel.component.jclouds.JcloudsComponent=camel:jclouds
org.apache.camel.component.jcr.JcrComponent=camel:jcr
org.apache.camel.component.jdbc.JdbcComponent=camel:jdbc
-org.apache.camel.component.jetty9.JettyHttpComponent9=camel:jetty
+org.apache.camel.component.jetty10.JettyHttpComponent10=camel:jetty
org.apache.camel.component.jgroups.JGroupsComponent=camel:jgroups
org.apache.camel.component.jgroups.raft.JGroupsRaftComponent=camel:jgroups-raft
org.apache.camel.component.jira.JiraComponent=camel:jira
diff --git a/parent/pom.xml b/parent/pom.xml
index a5d31ff4a28..79ccb2b64a6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -65,7 +65,7 @@
<aries-blueprint-proxy-version>1.1.12</aries-blueprint-proxy-version>
<aries-spifly-version>1.3.5</aries-spifly-version>
<aries-util-version>1.1.3</aries-util-version>
- <arquillian-jetty-embedded-9-version>1.0.0.CR3</arquillian-jetty-embedded-9-version>
+ <arquillian-jetty-embedded-10-version>1.0.0.Final</arquillian-jetty-embedded-10-version>
<arquillian-version>1.6.0.Final</arquillian-version>
<arquillian-weld-embedded-version>2.0.0.Final</arquillian-weld-embedded-version>
<as2-lib-version>4.11.0</as2-lib-version>
@@ -307,8 +307,8 @@
<jetcd-grpc-version>1.47.0</jetcd-grpc-version>
<jetcd-guava-version>31.1-jre</jetcd-guava-version>
<jetcd-version>0.7.3</jetcd-version>
+ <jetty-version>10.0.17</jetty-version>
<jetty9-version>9.4.53.v20231009</jetty9-version>
- <jetty-version>${jetty9-version}</jetty-version>
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
<jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
<jettison-version>1.5.3</jettison-version>
diff --git a/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyEmbeddedService.java b/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyEmbeddedService.java
index bffe10568bd..5316b0359ab 100644
--- a/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyEmbeddedService.java
+++ b/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyEmbeddedService.java
@@ -28,6 +28,7 @@ import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.util.ssl.SslContextFactory;
+import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
@@ -54,10 +55,7 @@ public class JettyEmbeddedService implements JettyService, BeforeEachCallback, A
ServerConnector connector;
SSLContext sslContext = jettyConfiguration.getSslContext();
if (sslContext != null) {
- SslContextFactory sslContextFactory = new SslContextFactory.Server();
- sslContextFactory.setSslContext(sslContext);
-
- connector = new ServerConnector(server, new SslConnectionFactory(sslContextFactory, null));
+ connector = new ServerConnector(server, createSslConnectionFactory(sslContext));
} else {
connector = new ServerConnector(server);
}
@@ -65,6 +63,30 @@ public class JettyEmbeddedService implements JettyService, BeforeEachCallback, A
return connector;
}
+ @NotNull
+ private static SslConnectionFactory createSslConnectionFactory(SSLContext sslContext) {
+ try {
+ SslContextFactory sslContextFactory = createSslContextFactory(sslContext);
+ sslContextFactory.setSslContext(sslContext);
+ return SslConnectionFactory.class.getConstructor(sslContextFactory.getClass(), String.class)
+ .newInstance(sslContextFactory, null);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @NotNull
+ private static SslContextFactory createSslContextFactory(SSLContext sslContext) throws Exception {
+ Class<?> factoryClass;
+ if (Server.getVersion().startsWith("9")) {
+ // Jetty 9 detected
+ factoryClass = Class.forName("org.eclipse.jetty.util.ssl.SslContextFactory");
+ } else {
+ factoryClass = Class.forName("org.eclipse.jetty.util.ssl.SslContextFactory$Server");
+ }
+ return (SslContextFactory) factoryClass.getConstructor().newInstance();
+ }
+
@Override
public void registerProperties() {
System.setProperty(JettyProperties.JETTY_ADDRESS, "localhost:" + getPort());
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index b64b3b56fb3..1f88b720563 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -1001,7 +1001,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
return "AtmosphereWebsocket";
case "org.apache.camel.component.zookeepermaster.MasterComponent":
return "ZooKeeperMaster";
- case "org.apache.camel.component.jetty9.JettyHttpComponent9":
+ case "org.apache.camel.component.jetty10.JettyHttpComponent10":
return "JettyHttp";
case "org.apache.camel.component.elasticsearch.ElasticsearchComponent":
return "ElasticsearchRest";