You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ff...@apache.org on 2021/12/21 15:11:03 UTC

[camel] 03/09: Merge branch 'main' of github.com:apache/camel into main

This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit e9f6f08e734c9403fea2a5242fa69b61b2636646
Merge: 89d0892 1c4ac1d
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Thu Nov 4 11:42:42 2021 -0400

    Merge branch 'main' of github.com:apache/camel into main

 camel-dependencies/pom.xml                         |  28 +-
 .../org/apache/camel/catalog/components/log.json   |   2 +-
 .../apache/camel/catalog/components/quartz.json    |   3 +-
 .../camel/catalog/components/salesforce.json       |   4 +
 .../org/apache/camel/catalog/components/seda.json  |   5 +-
 .../org/apache/camel/catalog/components/stub.json  |   5 +-
 .../org/apache/camel/catalog/components/vm.json    |   5 +-
 .../apache/camel/catalog/dataformats/any23.json    |   2 +-
 .../apache/camel/catalog/dataformats/fhirJson.json |   2 +-
 .../apache/camel/catalog/dataformats/fhirXml.json  |   2 +-
 .../apache/camel/catalog/dataformats/protobuf.json |   2 +-
 .../org/apache/camel/catalog/languages/bean.json   |   2 +-
 .../apache/camel/catalog/languages/jsonpath.json   |   2 +-
 .../org/apache/camel/catalog/languages/xpath.json  |   2 +-
 .../apache/camel/catalog/languages/xtokenize.json  |   2 +-
 .../org/apache/camel/catalog/models/any23.json     |   2 +-
 .../org/apache/camel/catalog/models/bean.json      |   2 +-
 .../catalog/models/cachingServiceDiscovery.json    |   2 +-
 .../apache/camel/catalog/models/claimCheck.json    |   2 +-
 .../org/apache/camel/catalog/models/fhirJson.json  |   2 +-
 .../org/apache/camel/catalog/models/fhirXml.json   |   2 +-
 .../camel/catalog/models/hystrixConfiguration.json |   2 +-
 .../org/apache/camel/catalog/models/jsonpath.json  |   2 +-
 .../catalog/models/kubernetesServiceDiscovery.json |   2 +-
 .../org/apache/camel/catalog/models/log.json       |   2 +-
 .../org/apache/camel/catalog/models/method.json    |   2 +-
 .../org/apache/camel/catalog/models/oauth2.json    |   2 +-
 .../org/apache/camel/catalog/models/protobuf.json  |   2 +-
 .../catalog/models/resilience4jConfiguration.json  |   2 +-
 .../org/apache/camel/catalog/models/saga.json      |   2 +-
 .../org/apache/camel/catalog/models/sample.json    |   2 +-
 .../apache/camel/catalog/models/serviceCall.json   |   2 +-
 .../catalog/models/serviceCallConfiguration.json   |   2 +-
 .../camel/catalog/models/setExchangePattern.json   |   2 +-
 .../apache/camel/catalog/models/threadPool.json    |   4 +-
 .../camel/catalog/models/threadPoolProfile.json    |   4 +-
 .../org/apache/camel/catalog/models/threads.json   |   4 +-
 .../org/apache/camel/catalog/models/to.json        |   2 +-
 .../org/apache/camel/catalog/models/toD.json       |   2 +-
 .../org/apache/camel/catalog/models/wireTap.json   |   2 +-
 .../org/apache/camel/catalog/models/xpath.json     |   2 +-
 .../org/apache/camel/catalog/models/xtokenize.json |   2 +-
 .../org/apache/camel/dataformat/any23/any23.json   |   2 +-
 .../camel/component/aws2/sqs/Sqs2Consumer.java     |  19 +-
 .../org/apache/camel/language/bean/bean.json       |   2 +-
 .../component/couchdb/CouchDbChangesetTracker.java |  53 ++-
 .../component/debezium/DebeziumComponent.java      |   3 +-
 .../EmbeddedDebeziumConfiguration.java             |  15 +-
 .../debezium/DebeziumMongodbComponent.java         |   7 +-
 .../debezium/DebeziumMongodbComponentTest.java     |  36 --
 .../component/debezium/DebeziumMySqlComponent.java |   7 +-
 .../debezium/DebeziumMySqlComponentTest.java       |  35 --
 .../debezium/DebeziumPostgresComponent.java        |   7 +-
 .../debezium/DebeziumPostgresComponentTest.java    |  34 --
 .../debezium/DebeziumSqlserverComponent.java       |   8 +-
 .../debezium/DebeziumSqlserverComponentTest.java   |  34 --
 .../org/apache/camel/component/fhir/fhirJson.json  |   2 +-
 .../org/apache/camel/component/fhir/fhirXml.json   |   2 +-
 .../camel/component/file/remote/FtpOperations.java | 128 +++---
 .../component/file/remote/SftpOperations.java      | 104 ++---
 .../remote/strategy/ExclusiveReadLockCheck.java    | 136 ++++++
 .../FtpChangedExclusiveReadLockStrategy.java       | 121 +-----
 .../remote/strategy/FtpProcessStrategyFactory.java |  51 +--
 .../strategy/SftpProcessStrategyFactory.java       |  51 +--
 .../file/remote/strategy/StrategyUtil.java         |  67 +++
 .../FtpReconnectAttemptServerStoppedIT.java        |  19 +-
 .../file/remote/services/FtpEmbeddedService.java   |  12 +
 .../file/remote/services/SftpEmbeddedService.java  |  20 +-
 .../camel-hl7/src/main/docs/hl7-dataformat.adoc    |   4 +-
 .../http/common/HttpRestHeaderFilterStrategy.java  |  13 +-
 .../common/HttpRestHeaderFilterStrategyTest.java   |  15 +-
 .../jetty/rest/RestJettyContentTypeTest.java       |  20 +-
 .../camel/component/scp/ScpServerTestSupport.java  |   4 +-
 .../org/apache/camel/jsonpath/jsonpath.json        |   2 +-
 .../cluster/KubernetesClusterService.java          |   2 +
 .../org/apache/camel/component/log/log.json        |   2 +-
 .../apache/camel/component/log/LogEndpoint.java    |   2 +-
 .../AbstractCamelMicroProfileHealthCheck.java      |  26 +-
 ...CamelMicroProfileHealthCheckRepositoryTest.java |   4 +
 .../mllp/internal/TcpServerBindThread.java         |  65 +--
 .../component/mongodb/gridfs/GridFsConsumer.java   | 179 ++++----
 .../http/cloud/NettyHttpServiceCallRouteTest.java  |  20 +-
 components/camel-openapi-java/pom.xml              |   2 +
 .../src/main/docs/springdoc.adoc                   |  21 +
 .../openapi/DefaultRestDefinitionsResolver.java    |   2 +-
 .../org/apache/camel/openapi/OpenApiHelper.java    |   2 +-
 .../camel/openapi/OpenApiRestProducerFactory.java  |  15 +-
 .../apache/camel/openapi/RestModelConverters.java  |   2 +-
 .../apache/camel/openapi/RestOpenApiProcessor.java |   4 +-
 .../apache/camel/openapi/RestOpenApiReader.java    |  13 +-
 .../apache/camel/openapi/RestOpenApiSupport.java   |  25 +-
 .../org/apache/camel/openapi/ComplexTypesTest.java |   2 +-
 ...estOpenApiModelApiSecurityRequirementsTest.java |   4 +-
 .../RestOpenApiReaderApiDocsOverrideTest.java      |   4 +-
 .../openapi/RestOpenApiReaderApiDocsTest.java      |   4 +-
 .../openapi/RestOpenApiReaderDayOfWeekTest.java    |   4 +-
 ...RestOpenApiReaderEnableVendorExtensionTest.java |   4 +-
 .../RestOpenApiReaderFileResponseModelTest.java    |   4 +-
 .../RestOpenApiReaderModelApiSecurityTest.java     |   4 +-
 .../RestOpenApiReaderModelBookOrderTest.java       |   4 +-
 .../camel/openapi/RestOpenApiReaderModelTest.java  |   4 +-
 .../RestOpenApiReaderOverrideHostApiDocsTest.java  |   4 +-
 .../RestOpenApiReaderPropertyPlaceholderTest.java  |   2 +-
 .../camel/openapi/RestOpenApiReaderTest.java       |   4 +-
 .../openapi/RestOpenApiV2SecuritySchemesTest.java  |   2 +-
 .../openapi/RestOpenApiV3SecuritySchemesTest.java  |   4 +-
 ...pringRestOpenApiReaderModelApiSecurityTest.java |   4 +-
 .../src/main/docs/platform-http-component.adoc     |  23 +-
 .../apache/camel/dataformat/protobuf/protobuf.json |   2 +-
 components/camel-quartz/pom.xml                    |  28 --
 .../component/quartz/QuartzEndpointConfigurer.java |   6 -
 .../component/quartz/QuartzEndpointUriFactory.java |   3 +-
 .../org/apache/camel/component/quartz/quartz.json  |   3 +-
 .../camel/component/quartz/QuartzEndpoint.java     |  74 +---
 ...owTest.java => QuartzCronRouteFireNowTest.java} |  17 +-
 .../quartz/QuartzRouteFireNowOnlyOnceTest.java     |   2 +-
 .../component/quartz/QuartzRouteFireNowTest.java   |   2 +-
 .../salesforce/SalesforceComponentConfigurer.java  |   9 +
 .../salesforce/SalesforceEndpointConfigurer.java   |   9 +
 .../salesforce/SalesforceEndpointUriFactory.java   |   4 +-
 .../camel/component/salesforce/salesforce.json     |   4 +
 .../src/main/docs/salesforce-component.adoc        |   5 +-
 .../salesforce/SalesforceEndpointConfig.java       |  32 ++
 .../salesforce/api/dto/UpsertSObjectResult.java    |  31 +-
 .../internal/client/BulkApiV2Client.java           |   4 +-
 .../CompositeSObjectCollectionsApiClient.java      |  16 +-
 .../internal/client/DefaultBulkApiV2Client.java    |  17 +-
 ...efaultCompositeSObjectCollectionsApiClient.java |  57 ++-
 .../internal/processor/BulkApiV2Processor.java     |   6 +-
 .../CompositeSObjectCollectionsProcessor.java      |  14 +-
 .../BulkApiV2QueryJobIntegrationTest.java          |  68 ++-
 .../CompositeApiCollectionsIntegrationTest.java    |   3 +-
 .../component/seda/SedaComponentConfigurer.java    |   6 +
 .../org/apache/camel/component/seda/seda.json      |   5 +-
 .../apache/camel/component/seda/SedaComponent.java |  17 +
 .../apache/camel/component/seda/SedaEndpoint.java  |  11 +-
 .../servlet/rest/RestServletContentTypeTest.java   | 100 +++++
 .../org/apache/camel/spring/xml/threadPool.json    |   4 +-
 .../apache/camel/component/rest/RestRefTest.java   |   1 -
 .../rest/SpringFromRestConfigurationTest.java      |   1 -
 .../rest/SpringFromRestDuplicateTest.java          |   1 -
 .../rest/SpringFromRestGetEmbeddedRouteTest.java   |   1 -
 .../rest/SpringFromRestGetInterceptTest.java       |   1 -
 .../rest/SpringFromRestGetOnExceptionTest.java     |   1 -
 .../SpringFromRestGetRouteOnExceptionTest.java     |   1 -
 .../component/rest/SpringFromRestGetTest.java      |   1 -
 .../rest/SpringFromRestIdAndDescriptionTest.java   |   1 -
 .../rest/SpringFromRestUriPrefixTest.java          |   1 -
 .../camel/spring/SpringEndpointPropertyTest.java   |   2 -
 .../org/apache/camel/spring/SpringTestSupport.java |   5 +-
 .../aggregate/jdbc/JdbcAggregationRepository.java  |  12 +-
 .../org/apache/camel/component/stub/stub.json      |   5 +-
 .../apache/camel/swagger/RestSwaggerProcessor.java |   2 +-
 .../apache/camel/swagger/RestSwaggerReader.java    |  11 +-
 .../apache/camel/swagger/RestSwaggerSupport.java   |   6 +-
 .../camel/swagger/RestSwaggerArrayEnumTest.java    |   2 +-
 .../RestSwaggerReaderApiDocsOverrideTest.java      |   2 +-
 .../swagger/RestSwaggerReaderApiDocsTest.java      |   2 +-
 .../swagger/RestSwaggerReaderDayOfWeekTest.java    |   2 +-
 .../RestSwaggerReaderEmptyAllowableValuesTest.java |   2 +-
 ...RestSwaggerReaderEnableVendorExtensionTest.java |   2 +-
 .../RestSwaggerReaderFileResponseModelTest.java    |   2 +-
 .../RestSwaggerReaderModelApiSecurityTest.java     |   2 +-
 .../RestSwaggerReaderModelBookOrderTest.java       |   2 +-
 .../camel/swagger/RestSwaggerReaderModelTest.java  |   2 +-
 .../RestSwaggerReaderOverrideHostApiDocsTest.java  |   2 +-
 .../camel/swagger/RestSwaggerReaderTest.java       |   2 +-
 ...pringRestSwaggerReaderModelApiSecurityTest.java |   2 +-
 components/camel-telegram/pom.xml                  |   5 +
 .../TelegramConsumerHealthCheckErrorTest.java      | 107 +++++
 .../TelegramConsumerHealthCheckOkTest.java         | 101 +++++
 .../telegram/util/TelegramMockRoutes.java          |  45 +-
 .../src/main/docs/test-spring-junit5.adoc          |  10 +-
 .../undertow/rest/RestUndertowContentTypeTest.java |  70 +++-
 .../org/apache/camel/component/vm/vm.json          |   5 +-
 .../org/apache/camel/language/xpath/xpath.json     |   2 +-
 .../camel-xpath/src/main/docs/xpath-language.adoc  |   4 +-
 .../java/org/apache/camel/CamelContextAware.java   |   2 +-
 .../src/main/java/org/apache/camel/Route.java      |  12 +-
 .../java/org/apache/camel/health/HealthCheck.java  |  17 +-
 .../HealthCheckAware.java}                         |  31 +-
 .../camel/health/HealthCheckConfiguration.java     |  24 ++
 .../apache/camel/health/HealthCheckRegistry.java   |  10 +-
 .../apache/camel/health/HealthCheckRepository.java |  13 +
 .../main/java/org/apache/camel/spi/RouteError.java |   8 +
 .../main/java/org/apache/camel/spi/UnitOfWork.java |   4 +-
 .../camel/impl/engine/CamelInternalProcessor.java  |  18 +-
 .../camel/impl/engine/DefaultUnitOfWork.java       |   8 +
 .../camel/impl/engine/FileStateRepository.java     |   4 +-
 .../apache/camel/impl/engine/MDCUnitOfWork.java    |  23 +-
 .../impl/engine/SharedCamelInternalProcessor.java  |   3 +-
 .../src/main/docs/properties-component.adoc        |   2 +-
 .../dsl/SalesforceComponentBuilderFactory.java     |  39 ++
 .../component/dsl/SedaComponentBuilderFactory.java |  19 +
 .../component/dsl/StubComponentBuilderFactory.java |  19 +
 .../component/dsl/VmComponentBuilderFactory.java   |  19 +
 core/camel-core-engine/src/main/docs/antora.yml    |   4 +-
 .../docs/modules/eips/pages/aggregate-eip.adoc     |  22 +-
 .../modules/eips/pages/correlation-identifier.adoc |   2 +-
 .../main/docs/modules/eips/pages/filter-eip.adoc   |   8 +-
 .../main/docs/modules/eips/pages/marshal-eip.adoc  |   2 +
 .../docs/modules/eips/pages/setProperty-eip.adoc   |   4 +-
 .../main/docs/modules/eips/pages/split-eip.adoc    |   6 +-
 .../main/docs/modules/eips/pages/threads-eip.adoc  |   4 +-
 .../main/docs/modules/eips/pages/throttle-eip.adoc |   2 +-
 .../src/main/docs/modules/eips/pages/to-eip.adoc   |   4 +-
 .../modules/eips/pages/transactional-client.adoc   |  88 ++--
 .../docs/modules/eips/pages/unmarshal-eip.adoc     |   2 +
 .../docs/modules/languages/pages/ref-language.adoc |   4 +-
 .../resources/org/apache/camel/model/bean.json     |   2 +-
 .../org/apache/camel/model/claimCheck.json         |   2 +-
 .../camel/model/cloud/cachingServiceDiscovery.json |   2 +-
 .../model/cloud/kubernetesServiceDiscovery.json    |   2 +-
 .../org/apache/camel/model/cloud/serviceCall.json  |   2 +-
 .../model/cloud/serviceCallConfiguration.json      |   2 +-
 .../org/apache/camel/model/dataformat/any23.json   |   2 +-
 .../apache/camel/model/dataformat/fhirJson.json    |   2 +-
 .../org/apache/camel/model/dataformat/fhirXml.json |   2 +-
 .../apache/camel/model/dataformat/protobuf.json    |   2 +-
 .../apache/camel/model/hystrixConfiguration.json   |   2 +-
 .../org/apache/camel/model/language/jsonpath.json  |   2 +-
 .../org/apache/camel/model/language/method.json    |   2 +-
 .../org/apache/camel/model/language/xpath.json     |   2 +-
 .../org/apache/camel/model/language/xtokenize.json |   2 +-
 .../resources/org/apache/camel/model/log.json      |   2 +-
 .../camel/model/resilience4jConfiguration.json     |   2 +-
 .../org/apache/camel/model/rest/oauth2.json        |   2 +-
 .../resources/org/apache/camel/model/saga.json     |   2 +-
 .../resources/org/apache/camel/model/sample.json   |   2 +-
 .../org/apache/camel/model/setExchangePattern.json |   2 +-
 .../org/apache/camel/model/threadPoolProfile.json  |   4 +-
 .../resources/org/apache/camel/model/threads.json  |   4 +-
 .../resources/org/apache/camel/model/to.json       |   2 +-
 .../resources/org/apache/camel/model/toD.json      |   2 +-
 .../resources/org/apache/camel/model/wireTap.json  |   2 +-
 .../apache/camel/processor/RestBindingAdvice.java  |  17 +-
 .../org/apache/camel/core/xml/routeController.json |   2 +-
 core/camel-core/pom.xml                            |   1 +
 .../camel/CamelParallelExecutionStrategy.java      |  86 ++++
 .../java/org/apache/camel/ContextTestSupport.java  |   8 +-
 .../test/java/org/apache/camel/TestSupport.java    |   5 +
 .../org/apache/camel/builder/ErrorHandlerTest.java |  15 -
 .../ComponentResolvePropertyPlaceholdersTest.java  |   2 +
 .../SchedulerMulticastParallelGreedyTest.java      |  45 +-
 .../camel/component/seda/SedaEndpointTest.java     |   1 +
 .../apache/camel/component/seda/SedaRouteTest.java |  23 +-
 .../apache/camel/impl/health/HealthCheckTest.java  |  22 +-
 .../apache/camel/processor/MDCClearingTest.java    |  20 +-
 ...a => MDCResetMidRouteProducerTemplateTest.java} |   4 +-
 .../org/apache/camel/processor/MDCResetTest.java   |  11 +-
 .../src/test/resources/junit-platform.properties   |  24 ++
 .../src/test/resources/log4j2.properties           |   3 +
 .../endpoint/dsl/QuartzEndpointBuilderFactory.java |  39 +-
 .../dsl/SalesforceEndpointBuilderFactory.java      | 174 ++++++++
 .../endpoint/dsl/SedaEndpointBuilderFactory.java   |  18 +-
 .../endpoint/dsl/StubEndpointBuilderFactory.java   |  18 +-
 .../endpoint/dsl/VmEndpointBuilderFactory.java     |  18 +-
 .../camel/impl/health/AbstractHealthCheck.java     |  40 +-
 .../impl/health/HealthCheckRegistryRepository.java |   1 +
 .../apache/camel/impl/health/RouteHealthCheck.java |  35 ++
 ...althCheckConfigurationPropertiesConfigurer.java |   6 +
 .../java/org/apache/camel/main/MyAddress.java      |  26 +-
 .../org/apache/camel/main/BaseMainSupport.java     |   1 +
 .../java/org/apache/camel/main/MainSupport.java    |   2 +-
 .../camel/main/MainBeansConstructorTest.java       |  49 +++
 .../test/java/org/apache/camel/main/MyOrder.java   |  26 +-
 .../api/management/mbean/CamelOpenMBeanTypes.java  |  15 +-
 .../camel/management/mbean/ManagedCamelHealth.java |  27 ++
 .../management/ManagedCustomComponentNameTest.java |   2 +-
 .../management/ManagedUnregisterComponentTest.java |   2 +-
 core/camel-support/pom.xml                         |  20 +
 .../org/apache/camel/support/DefaultConsumer.java  |  17 +-
 .../DefaultScheduledPollConsumerScheduler.java     |   2 +-
 .../camel/support/PropertyBindingSupport.java      |  15 +-
 .../camel/support/ScheduledPollConsumer.java       |  31 +-
 .../support/ScheduledPollConsumerHealthCheck.java  |  78 ++++
 .../org/apache/camel/support/UnitOfWorkHelper.java |   6 +
 .../support/processor/DelegateSyncProcessor.java   |  11 +-
 .../idempotent/FileIdempotentRepository.java       |   4 +-
 .../camel/support/task/AbstractTaskBuilder.java}   |  45 +-
 .../apache/camel/support/task/BackgroundTask.java  | 157 +++++++
 .../apache/camel/support/task/BlockingTask.java    |  50 +++
 .../apache/camel/support/task/ForegroundTask.java  | 123 ++++++
 .../java/org/apache/camel/support/task/Task.java   |  21 +-
 .../org/apache/camel/support/task/TaskBuilder.java |  29 +-
 .../java/org/apache/camel/support/task/Tasks.java  |  60 +++
 .../apache/camel/support/task/budget/Budget.java}  |  36 +-
 .../camel/support/task/budget/BudgetBuilder.java   |  28 +-
 .../apache/camel/support/task/budget/Budgets.java  |  91 ++++
 .../task/budget/IterationBoundedBudget.java        |  74 ++++
 .../task/budget/IterationBoundedBudgetBuilder.java |  57 +++
 .../support/task/budget/IterationBudget.java}      |  45 +-
 .../task/budget/IterationTimeBoundedBudget.java    |  84 ++++
 .../budget/IterationTimeBoundedBudgetBuilder.java  |  65 +++
 .../support/task/budget/TimeBoundedBudget.java     |  28 +-
 .../camel/support/task/budget/TimeBudget.java      |  27 +-
 .../camel/support/task/BackgroundTaskTest.java     | 146 +++++++
 .../camel/support/task/ForegroundTaskTest.java     | 132 ++++++
 .../camel/support/task/ForegroundTimeTaskTest.java | 157 +++++++
 .../apache/camel/support/task/TaskTestSupport.java |  74 ++++
 .../src/test/resources/log4j2.properties           |  19 +-
 .../camel/language/xtokenizer/xtokenize.json       |   2 +-
 .../apache/camel/converter/jaxp/StaxConverter.java |   4 +-
 .../xtokenizer/XMLTokenExpressionIterator.java     |   6 +-
 docs/components/antora.yml                         |  10 +-
 .../ROOT/partials/component-configure-options.adoc |   6 +-
 docs/components/modules/others/nav.adoc            |   1 +
 .../components/modules/others/pages/springdoc.adoc |   1 +
 docs/user-manual-nav.adoc.template                 |   2 +-
 docs/user-manual/antora.yml                        |   2 +-
 .../ROOT/assets/images/camel-components.png        | Bin 229901 -> 0 bytes
 .../images/images/EventDrivenConsumerSolution.gif  | Bin 0 -> 2077 bytes
 .../images/images/MessageEndpointSolution.gif      | Bin 0 -> 3816 bytes
 .../assets/images/images/MessageTranslator.gif     | Bin 0 -> 2183 bytes
 .../assets/images/images/camel-architecture.png    | Bin 0 -> 96105 bytes
 .../ROOT/assets/images/images/camel-context.png    | Bin 0 -> 30667 bytes
 .../ROOT/assets/images/{ => images}/debug.png      | Bin
 .../ROOT/assets/images/images/endpoint-factory.png | Bin 0 -> 52188 bytes
 .../assets/images/images/endpoint-uri-syntax.png   | Bin 0 -> 35436 bytes
 .../images/{ => images}/message_flow_in_route.png  | Bin
 .../images/{ => images}/service_lifecycle.png      | Bin
 docs/user-manual/modules/ROOT/nav.adoc             |   3 +-
 .../modules/ROOT/pages/Endpoint-dsl.adoc           |  31 +-
 ...configuration-of-camelcontext-using-spring.adoc | 125 ++----
 .../modules/ROOT/pages/architecture.adoc           |  74 ++--
 ...{backlogdebugger.adoc => backlog-debugger.adoc} |  80 +---
 .../modules/ROOT/pages/batch-consumer.adoc         |  29 +-
 .../modules/ROOT/pages/bean-binding.adoc           |  21 +-
 .../modules/ROOT/pages/bean-injection.adoc         |   1 -
 .../modules/ROOT/pages/bean-integration.adoc       |   8 +-
 .../modules/ROOT/pages/browsable-endpoint.adoc     |   4 +-
 docs/user-manual/modules/ROOT/pages/building.adoc  |  14 +-
 .../ROOT/pages/camel-3x-upgrade-guide-3_13.adoc    |  43 +-
 .../user-manual/modules/ROOT/pages/camel-boot.adoc |  32 --
 .../modules/ROOT/pages/camel-catalog.adoc          |  31 +-
 .../ROOT/pages/camel-component-maven-plugin.adoc   |  10 +-
 .../ROOT/pages/camel-configuration-utilities.adoc  | 141 ++++---
 .../modules/ROOT/pages/camel-jbang.adoc            |  18 +-
 .../modules/ROOT/pages/camel-maven-archetypes.adoc |   4 +-
 .../ROOT/pages/camel-report-maven-plugin.adoc      |  45 +-
 .../modules/ROOT/pages/camelcontext.adoc           | 219 +++++++++-
 .../user-manual/modules/ROOT/pages/clustering.adoc |   3 +-
 .../ROOT/pages/commercial-camel-offerings.adoc     |  55 +--
 .../modules/ROOT/pages/component-dsl.adoc          |  32 +-
 docs/user-manual/modules/ROOT/pages/component.adoc |   3 +
 ...ing-route-startup-ordering-and-autostartup.adoc | 135 +++---
 .../ROOT/pages/cronscheduledroutepolicy.adoc       |  40 +-
 .../modules/ROOT/pages/data-format.adoc            |  99 +----
 docs/user-manual/modules/ROOT/pages/debugger.adoc  |  28 +-
 .../modules/ROOT/pages/defaulterrorhandler.adoc    |  21 +-
 .../modules/ROOT/pages/delay-interceptor.adoc      |  10 +-
 docs/user-manual/modules/ROOT/pages/dsl.adoc       |  25 +-
 .../modules/ROOT/pages/endpoint-annotations.adoc   |   5 +-
 docs/user-manual/modules/ROOT/pages/endpoint.adoc  |  32 +-
 .../modules/ROOT/pages/health-check.adoc           |  63 ++-
 docs/user-manual/modules/ROOT/pages/index.adoc     |   3 +-
 docs/user-manual/modules/ROOT/pages/lifecycle.adoc |   2 +-
 .../pages/how-can-i-stop-a-route-from-a-route.adoc |   2 +-
 .../camel/dsl/groovy/common/GroovyDSL.groovy       |  11 +
 .../ProcessorDefinitionExtensions.groovy           |  12 +
 .../groovy/common/model/BeansConfiguration.groovy  |   9 +
 .../dsl/groovy/GroovyRouteBuilderLoaderTest.groovy |  10 +
 .../test/resources/routes/routes-with-beans.groovy |   4 +
 ...oovy => routes-with-set-header-variable.groovy} |  18 +-
 .../camel-groovy-dsl/src/main/docs/groovy-dsl.adoc |   2 +-
 .../src/main/docs/java-joor-dsl.adoc               |   2 +-
 dsl/camel-js-dsl/src/main/docs/js-dsl.adoc         |   2 +-
 .../camel/main/KameletDependencyDownloader.java    |   2 -
 dsl/camel-kotlin-dsl/src/main/docs/kotlin-dsl.adoc |   2 +-
 .../src/main/docs/java-xml-io-dsl.adoc             |   2 +-
 .../RestSwaggerReaderPropertyPlaceholderTest.java  |   2 +-
 .../src/main/docs/java-xml-jaxb-dsl.adoc           |   2 +-
 .../deserializers/ExpressionDeserializers.java     |   3 +
 .../dsl/yaml/deserializers/ModelDeserializers.java | 461 +++++++++++++++++----
 .../deserializers/ModelDeserializersResolver.java  |  93 +++++
 .../dsl/yaml/deserializers/CustomResolver.java     |   2 +
 .../ErrorHandlerBuilderDeserializer.java           |   2 +-
 .../RouteConfigurationDefinitionDeserializer.java  |   2 +-
 .../RouteTemplateBeanDefinitionDeserializer.java   |   2 +-
 .../RouteTemplateDefinitionDeserializer.java       |   2 +-
 .../dsl/yaml/GenerateYamlDeserializersMojo.java    |  19 +-
 .../maven/dsl/yaml/GenerateYamlSchemaMojo.java     |  91 ++--
 .../src/generated/resources/camel-yaml-dsl.json    | 102 +++++
 .../camel-yaml-dsl/src/main/docs/yaml-dsl.adoc     |   2 +-
 .../camel/dsl/yaml/KameletRoutesBuilderLoader.java |   4 +
 .../camel/dsl/yaml/YamlRoutesBuilderLoader.java    |  53 ++-
 .../dsl/yaml/YamlRoutesBuilderLoaderSupport.java   |   6 +-
 .../org/apache/camel/dsl/yaml/AggregateTest.groovy |  33 ++
 .../org/apache/camel/dsl/yaml/BeanTest.groovy      |  25 ++
 .../org/apache/camel/dsl/yaml/ChoiceTest.groovy    |   2 +-
 .../camel/dsl/yaml/CircuitBreakerTest.groovy       |  34 ++
 .../apache/camel/dsl/yaml/ConvertBodyTest.groovy   |  32 ++
 .../org/apache/camel/dsl/yaml/DelayTest.groovy     |  10 +
 .../apache/camel/dsl/yaml/DynamicRouterTest.groovy |   8 +
 .../org/apache/camel/dsl/yaml/SagaTest.groovy      |   5 +
 parent/pom.xml                                     |  31 +-
 .../services/InfinispanLocalContainerService.java  |   2 +-
 .../camel/maven/packaging/PrepareExampleMojo.java  |   2 +-
 .../camel/maven/packaging/SchemaGeneratorMojo.java |   5 +-
 399 files changed, 5807 insertions(+), 2449 deletions(-)