You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2019/09/26 13:08:10 UTC

[camel] branch CAMEL-13965 updated (2d0a787 -> 3969ac8)

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

aldettinger pushed a change to branch CAMEL-13965
in repository https://gitbox.apache.org/repos/asf/camel.git.


    omit 2d0a787  CAMEL-13965: Added the @CamelSpringBootTest annotation
     add 32a3c81  Camel-Debezium: Makes mysql-connector excluded and provided
     add 40e6bc8  Merge pull request #3191 from apache/debezium-mysql-fix
     add c9e9292  Add in the documentation about the dependency inclusion
     add 50d6d19  Merge pull request #3194 from omarsmak/dbz-mysql-docs-example-fix
     add 0230a86  Camel 13949 (#3190)
     add 54105bb  Regen docs
     add 277f2a5  Upgrade Johnzon to version 1.2.0
     add 08591b9  Revert "CAMEL-13615 - Camel-Zipkin: Zipkin-reporter Move to new Apache coordinates"
     add 937e5a1  Revert "CAMEL-13508 - Camel-Zipkin: Move to new Apache coordinates"
     add a6b4e52  CAMEL-14015 - Camel-Zipkin: Going back to non-ASF artifacts
     add 23c7a27  Regen docs
     add f0e0c56  Upgrade Zipkin to version 2.17.0
     add 9787260  Upgrade Zipkin Reporter to version 2.10.3
     add e4f9e68  Upgrade Brave Zipkin to version 5.7.0
     add f297d70  cleanup camel-example-spring-jms a bit
     add aa12e71  CAMEL-14000 - remove Endpoint from Map when corresponding Pool is empty
     add 240e821  Merge pull request #3186 from johnpoth/CAMEL-14000
     add eb6ff21  Regen
     add b89a227  Fixed the URI syntax for aws-s3 endpoint
     add c4e805c  Regn docs
     add d9353ff  Regen
     add ccaa06e  CAMEL-13965: Added the @CamelSpringBootTest annotation
     add 436f5ef  Update backlogdebugger.adoc
     add 50097a5  Update asynchronous-routing-engine.adoc
     add 6184880  Update async.adoc
     add 40c0695  Regen
     add 18728d6  Regen docs
     add d0057b6  Camel-Kubernetes: Add sample code for service accounts
     add 0d3abff  Regen docs
     add 45f3513  Fixed typo in camel-kubernetes docs
     add 8b9fecf  Regen docs
     add 17b762cb CAMEL-14007 Expose BoxFolder.canUpload to let user check if a file can be uploaded https://issues.apache.org/jira/browse/CAMEL-14007
     add 292a530  CAMEL-14007 - Fixed CS
     add adafe29  Camel-Kubernetes: Add sample code for openshift builds docs
     add 8aa0bad  Regen docs
     add 41dd718  Camel-Kubernetes: Add build configs docs
     add fa439f8  Regen docs
     add ae1ebd2  fix typos
     add 8a988eb  Camel 13947 (#3199)
     add 8157af4  Upgrade kotlin
     add 18cb3a5  Allow clients to send custom tags to Zipkin server (#3185)
     new 3969ac8  CAMEL-13965: Added a JUnit 5 version of camel-example-spring-boot tests (testing coexistence of JUnit 4 and JUnit 5)

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   (2d0a787)
            \
             N -- N -- N   refs/heads/CAMEL-13965 (3969ac8)

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                               |  10 -
 apache-camel/src/main/descriptors/common-bin.xml   |   2 -
 bom/camel-bom/pom.xml                              |  10 -
 .../apache/camel/component/ahc/BaseAhcTest.java    |   4 +-
 .../component/amqp/AMQPConnectionDetails.java      |   2 +-
 .../apache/camel/component/aws/s3/S3Endpoint.java  |   4 +-
 components/camel-blueprint/pom.xml                 |  19 +-
 .../camel/blueprint/CamelContextFactoryBean.java   |   2 +-
 .../blueprint/handler/CamelNamespaceHandler.java   |   5 -
 .../integration/BonitaIntegrationTestSupport.java  |   8 +-
 .../camel/component/box/api/BoxFilesManager.java   | 137 +++-
 components/camel-box/camel-box-component/pom.xml   |   4 +
 .../cdi/bean/CustomPropertiesCamelContext.java     |   3 +-
 components/camel-debezium/pom.xml                  |  15 +-
 .../src/main/docs/debezium-component.adoc          |  11 +
 .../bigquery/integration/BigQueryTestSupport.java  |   3 +-
 .../component/google/pubsub/PubsubTestSupport.java |   4 +-
 .../component/influxdb/AbstractInfluxDbTest.java   |   4 +-
 components/camel-jasypt/pom.xml                    |   8 +-
 .../component/jasypt/JasyptPropertiesTest.java     |   2 +-
 .../camel/component/jetty/BaseJettyTest.java       |   3 +-
 .../component/kafka/BaseEmbeddedKafkaTest.java     |   5 +-
 .../kubernetes-service-accounts-component.adoc     |  32 +
 .../main/docs/kubernetes-services-component.adoc   |  51 ++
 .../docs/openshift-build-configs-component.adoc    |  33 +
 .../src/main/docs/openshift-builds-component.adoc  |  33 +
 components/camel-microprofile-config/pom.xml       |   3 +-
 .../CamelMicroProfilePropertiesSourceTest.java     |   4 +-
 .../mongodb/gridfs/AbstractMongoDbTest.java        |   5 +-
 .../component/mongodb/AbstractMongoDbTest.java     |   5 +-
 .../camel/component/netty/http/BaseNettyTest.java  |   5 +-
 .../camel/component/netty/BaseNettyTest.java       |   3 +-
 .../PgReplicationSlotIntegrationTest.java          |   5 +-
 .../AbstractPgEventIntegrationTest.java            |   4 +-
 components/camel-properties/pom.xml                |  45 --
 .../component/properties/PropertiesEndpoint.java   |  86 --
 components/camel-spring-boot/pom.xml               |   4 -
 .../src/main/docs/spring-boot.adoc                 |  12 +-
 .../camel/spring/boot/CamelAutoConfiguration.java  |  25 +-
 .../PropertiesComponentAutoConfiguration.java      |  89 +++
 .../PropertiesComponentConfiguration.java          |  31 +-
 .../src/main/resources/META-INF/spring.factories   |   1 +
 components/camel-spring/pom.xml                    |  13 +-
 .../camel/spring/CamelContextFactoryBean.java      |   8 +-
 .../properties/SpringPropertiesComponent3Test.xml  |   4 +-
 .../properties/SpringPropertiesComponentTest.xml   |   4 +-
 .../camel/spring/SpringMDCWithBreadcrumbTest.xml   |   2 +-
 .../camel/component/sql/stored/ParserTest.java     |   4 +-
 .../test/blueprint/CamelBlueprintTestSupport.java  |   1 -
 ...printPropertiesLocationElementImplicitTest.java |   2 +-
 ...printPropertiesLocationElementOptionalTest.java |   2 +-
 .../BlueprintPropertiesLocationElementTest.java    |   2 +-
 components/camel-test-junit5/pom.xml               |   4 -
 .../apache/camel/test/junit5/CamelTestSupport.java |   4 +-
 .../spring/junit5/CamelAnnotationsHandler.java     |   4 +-
 .../junit5/CamelSpringTestContextLoader.java       |   9 +-
 .../CamelSpringPropertiesLocationElementTest.java  |   2 +-
 .../CamelSpringActiveProfileTest-context.xml       |   2 +-
 .../camel/test/spring/CamelAnnotationsHandler.java |   4 +-
 .../test/spring/CamelSpringTestContextLoader.java  |   9 +-
 .../CamelSpringPropertiesLocationElementTest.java  |   2 +-
 .../CamelSpringActiveProfileTest-context.xml       |   2 +-
 components/camel-test/pom.xml                      |   4 -
 .../apache/camel/test/junit4/CamelTestSupport.java |   4 +-
 .../spring/ContainerAwareSpringTestSupport.java    |   2 +-
 .../testcontainers/ContainerAwareTestSupport.java  |   2 +-
 .../camel/component/undertow/BaseUndertowTest.java |   4 +-
 components/camel-zipkin/pom.xml                    |   8 +-
 components/camel-zipkin/src/main/docs/zipkin.adoc  |  20 +-
 .../apache/camel/zipkin/ServiceHostFunction.java}  |  19 +-
 .../apache/camel/zipkin/ServicePortFunction.java}  |  17 +-
 .../camel/zipkin/ZipkinClientRequestAdapter.java   |   8 +
 .../java/org/apache/camel/zipkin/ZipkinTracer.java |  10 +-
 .../camel/zipkin/ZipkinClientCustomTagsTest.java   |  76 ++
 components/pom.xml                                 |   1 -
 components/readme.adoc                             |   7 +-
 .../main/java/org/apache/camel/CamelContext.java   |   7 +-
 .../org/apache/camel/spi/PropertiesComponent.java  |  18 +-
 .../src/main/docs/properties-component.adoc        | 122 +--
 .../AbstractLocationPropertiesSource.java          |   0
 .../properties/ClasspathPropertiesSource.java      |   0
 .../properties/DefaultPropertiesLookup.java        |   0
 .../properties/DefaultPropertiesParser.java        |   4 -
 .../properties/EnvPropertiesFunction.java          |   0
 .../component/properties/FilePropertiesSource.java |   0
 .../properties/LocationPropertiesSource.java       |   0
 .../component/properties/PropertiesComponent.java  |  31 +-
 .../component/properties/PropertiesFunction.java   |   0
 .../component/properties/PropertiesLocation.java   |   0
 .../component/properties/PropertiesLookup.java     |   0
 .../component/properties/PropertiesParser.java     |   0
 .../component/properties/RefPropertiesSource.java  |   0
 .../properties/ServiceHostPropertiesFunction.java  |   0
 .../properties/ServicePortPropertiesFunction.java  |   0
 .../properties/ServicePropertiesFunction.java      |   0
 .../properties/SysPropertiesFunction.java          |   0
 .../apache/camel/component/properties/package.html |   0
 .../camel/impl/engine/AbstractCamelContext.java    |  94 +--
 .../impl/engine/CamelPostProcessorHelper.java      |   3 -
 .../engine/PropertiesComponentFactoryResolver.java |  72 ++
 .../org/apache/camel/impl/engine/ServicePool.java  |  15 +-
 .../org/apache/camel/properties-component-factory  |  18 +
 core/camel-cloud/pom.xml                           |   4 +
 .../impl/cloud/ServiceCallConfigurationTest.java   |   1 -
 core/camel-core-engine/pom.xml                     | 555 ++++++++++---
 .../readme-eip.adoc                                |   0
 core/{camel-core => camel-core-engine}/readme.adoc |   0
 .../src/main/docs/eips/aggregate-eip.adoc          |   0
 .../src/main/docs/eips/batch-config-eip.adoc       |   0
 .../src/main/docs/eips/bean-eip.adoc               |   0
 .../src/main/docs/eips/choice-eip.adoc             |   0
 .../src/main/docs/eips/circuitBreaker-eip.adoc     |   0
 .../src/main/docs/eips/claimCheck-eip.adoc         |   0
 .../main/docs/eips/content-based-router-eip.adoc   |   0
 .../src/main/docs/eips/content-filter-eip.adoc     |   0
 .../src/main/docs/eips/convertBodyTo-eip.adoc      |   0
 .../src/main/docs/eips/customLoadBalancer-eip.adoc |   0
 .../src/main/docs/eips/delay-eip.adoc              |   0
 .../src/main/docs/eips/dynamic-router.adoc         |   0
 .../src/main/docs/eips/dynamicRouter-eip.adoc      |   0
 .../src/main/docs/eips/enrich-eip.adoc             |   0
 .../main/docs/eips/eventDrivenConsumer-eip.adoc    |   0
 .../src/main/docs/eips/failover-eip.adoc           |   0
 .../src/main/docs/eips/filter-eip.adoc             |   0
 .../src/main/docs/eips/from-eip.adoc               |   0
 .../src/main/docs/eips/hystrix-eip.adoc            |   0
 .../main/docs/eips/hystrixConfiguration-eip.adoc   |   0
 .../src/main/docs/eips/idempotentConsumer-eip.adoc |   0
 .../src/main/docs/eips/inOnly-eip.adoc             |   0
 .../src/main/docs/eips/inOut-eip.adoc              |   0
 .../src/main/docs/eips/loadBalance-eip.adoc        |   0
 .../src/main/docs/eips/log-eip.adoc                |   0
 .../src/main/docs/eips/loop-eip.adoc               |   0
 .../src/main/docs/eips/marshal-eip.adoc            |   0
 .../src/main/docs/eips/multicast-eip.adoc          |   0
 .../src/main/docs/eips/onFallback-eip.adoc         |   0
 .../src/main/docs/eips/otherwise-eip.adoc          |   0
 .../src/main/docs/eips/pipeline-eip.adoc           |   0
 .../src/main/docs/eips/pollEnrich-eip.adoc         |   0
 .../src/main/docs/eips/process-eip.adoc            |   0
 .../src/main/docs/eips/random-eip.adoc             |   0
 .../src/main/docs/eips/recipientList-eip.adoc      |   0
 .../src/main/docs/eips/removeHeader-eip.adoc       |   0
 .../src/main/docs/eips/removeHeaders-eip.adoc      |   0
 .../src/main/docs/eips/removeProperties-eip.adoc   |   0
 .../src/main/docs/eips/removeProperty-eip.adoc     |   0
 .../src/main/docs/eips/requestReply-eip.adoc       |   0
 .../src/main/docs/eips/resequence-eip.adoc         |   0
 .../src/main/docs/eips/rollback-eip.adoc           |   0
 .../src/main/docs/eips/roundRobin-eip.adoc         |   0
 .../src/main/docs/eips/routingSlip-eip.adoc        |   0
 .../src/main/docs/eips/saga-eip.adoc               |   0
 .../src/main/docs/eips/sample-eip.adoc             |   0
 .../src/main/docs/eips/script-eip.adoc             |   0
 .../src/main/docs/eips/serviceCall-eip.adoc        |   0
 .../src/main/docs/eips/setBody-eip.adoc            |   0
 .../src/main/docs/eips/setHeader-eip.adoc          |   0
 .../src/main/docs/eips/setOutHeader-eip.adoc       |   0
 .../src/main/docs/eips/setProperty-eip.adoc        |   0
 .../src/main/docs/eips/sort-eip.adoc               |   0
 .../src/main/docs/eips/split-eip.adoc              |   0
 .../src/main/docs/eips/step-eip.adoc               |   0
 .../src/main/docs/eips/sticky-eip.adoc             |   0
 .../src/main/docs/eips/stop-eip.adoc               |   0
 .../src/main/docs/eips/stream-config-eip.adoc      |   0
 .../src/main/docs/eips/threads-eip.adoc            |   0
 .../src/main/docs/eips/throttle-eip.adoc           |   0
 .../src/main/docs/eips/to-eip.adoc                 |   0
 .../src/main/docs/eips/toD-eip.adoc                |   0
 .../src/main/docs/eips/topic-eip.adoc              |   0
 .../src/main/docs/eips/transform-eip.adoc          |   0
 .../src/main/docs/eips/unmarshal-eip.adoc          |   0
 .../src/main/docs/eips/validate-eip.adoc           |   0
 .../src/main/docs/eips/weighted-eip.adoc           |   0
 .../src/main/docs/eips/when-eip.adoc               |   0
 .../src/main/docs/eips/wireTap-eip.adoc            |   0
 .../apache/camel/builder/AdviceWithBuilder.java    |   0
 .../camel/builder/AdviceWithRouteBuilder.java      |   0
 .../org/apache/camel/builder/AdviceWithTask.java   |   0
 .../org/apache/camel/builder/AdviceWithTasks.java  |   0
 .../camel/builder/AggregationStrategies.java       |   0
 .../camel/builder/AggregationStrategyClause.java   |   0
 .../java/org/apache/camel/builder/Builder.java     |   0
 .../org/apache/camel/builder/BuilderSupport.java   |   0
 .../org/apache/camel/builder/DataFormatClause.java |   0
 .../camel/builder/DeadLetterChannelBuilder.java    |   0
 .../camel/builder/DefaultErrorHandlerBuilder.java  |   0
 .../camel/builder/EndpointConsumerBuilder.java     |   0
 .../camel/builder/EndpointProducerBuilder.java     |   0
 .../org/apache/camel/builder/EnrichClause.java     |   0
 .../apache/camel/builder/ErrorHandlerBuilder.java  |   0
 .../camel/builder/ErrorHandlerBuilderRef.java      |   0
 .../camel/builder/ErrorHandlerBuilderSupport.java  |   0
 .../org/apache/camel/builder/ExchangeBuilder.java  |   0
 .../apache/camel/builder/ExpressionBuilder.java    |   0
 .../org/apache/camel/builder/ExpressionClause.java |   0
 .../camel/builder/ExpressionClauseSupport.java     |   0
 .../camel/builder/FlexibleAggregationStrategy.java |   0
 .../camel/builder/NoErrorHandlerBuilder.java       |   0
 .../org/apache/camel/builder/NotifyBuilder.java    |   0
 .../org/apache/camel/builder/PredicateBuilder.java |   0
 .../org/apache/camel/builder/PredicateClause.java  |   0
 .../org/apache/camel/builder/ProcessClause.java    |   0
 .../org/apache/camel/builder/ProxyBuilder.java     |   0
 .../org/apache/camel/builder/RouteBuilder.java     |   0
 .../org/apache/camel/builder/SimpleBuilder.java    |   0
 .../apache/camel/builder/ThreadPoolBuilder.java    |   0
 .../camel/builder/ThreadPoolProfileBuilder.java    |   0
 .../apache/camel/builder/TransformerBuilder.java   |   0
 .../org/apache/camel/builder/ValidatorBuilder.java |   0
 .../org/apache/camel/builder/ValueBuilder.java     |   0
 .../java/org/apache/camel/builder/package.html     |   0
 .../camel/impl/AbstractModelCamelContext.java      |   0
 .../org/apache/camel/impl/DefaultCamelContext.java |   7 +
 .../camel/impl/DefaultExecutorServiceManager.java  |   0
 .../java/org/apache/camel/impl/DefaultModel.java   |   0
 .../camel/impl/DefaultModelJAXBContextFactory.java |   0
 .../java/org/apache/camel/impl/JndiRegistry.java   |   0
 .../java/org/apache/camel/impl/RouteIdFactory.java |   0
 .../java/org/apache/camel/impl/RouteService.java   |   0
 .../impl/cluster/ClusteredRouteConfiguration.java  |   0
 .../impl/cluster/ClusteredRouteController.java     |   0
 .../camel/impl/cluster/ClusteredRouteFilter.java   |   0
 .../camel/impl/cluster/ClusteredRouteFilters.java  |   0
 .../camel/impl/cluster/ClusteredRoutePolicy.java   |   0
 .../impl/cluster/ClusteredRoutePolicyFactory.java  |   0
 .../org/apache/camel/impl/cluster/package.html     |   0
 .../main/java/org/apache/camel/impl/package.html   |   0
 .../apache/camel/model/AdviceWithDefinition.java   |   0
 .../apache/camel/model/AggregateDefinition.java    |   0
 .../org/apache/camel/model/BeanDefinition.java     |   0
 .../main/java/org/apache/camel/model/Block.java    |   0
 .../org/apache/camel/model/CatchDefinition.java    |   0
 .../org/apache/camel/model/ChoiceDefinition.java   |   0
 .../apache/camel/model/ClaimCheckDefinition.java   |   0
 .../apache/camel/model/ClaimCheckOperation.java    |   0
 .../java/org/apache/camel/model/Constants.java     |   0
 .../apache/camel/model/ContextScanDefinition.java  |   0
 .../apache/camel/model/ConvertBodyDefinition.java  |   0
 .../apache/camel/model/DataFormatDefinition.java   |   0
 .../DefinitionPropertyPlaceholderConfigurer.java   |   0
 .../org/apache/camel/model/DelayDefinition.java    |   0
 .../apache/camel/model/DescriptionDefinition.java  |   0
 .../camel/model/DynamicRouterDefinition.java       |   0
 .../camel/model/EndpointRequiredDefinition.java    |   0
 .../org/apache/camel/model/EnrichDefinition.java   |   0
 .../model/ExecutorServiceAwareDefinition.java      |   0
 .../org/apache/camel/model/ExpressionNode.java     |   0
 .../apache/camel/model/ExpressionNodeHelper.java   |   0
 .../model/ExpressionSubElementDefinition.java      |   0
 .../org/apache/camel/model/FilterDefinition.java   |   0
 .../org/apache/camel/model/FinallyDefinition.java  |   0
 .../org/apache/camel/model/FromDefinition.java     |   0
 .../apache/camel/model/GlobalOptionDefinition.java |   0
 .../camel/model/GlobalOptionsDefinition.java       |   0
 .../camel/model/HystrixConfigurationCommon.java    |   0
 .../model/HystrixConfigurationDefinition.java      |   0
 .../org/apache/camel/model/HystrixDefinition.java  |   0
 .../camel/model/IdempotentConsumerDefinition.java  |   0
 .../org/apache/camel/model/IdentifiedType.java     |   0
 .../org/apache/camel/model/InOnlyDefinition.java   |   0
 .../org/apache/camel/model/InOutDefinition.java    |   0
 .../apache/camel/model/InputTypeDefinition.java    |   0
 .../apache/camel/model/InterceptDefinition.java    |   0
 .../camel/model/InterceptFromDefinition.java       |   0
 .../model/InterceptSendToEndpointDefinition.java   |   0
 .../apache/camel/model/LoadBalanceDefinition.java  |   0
 .../apache/camel/model/LoadBalancerDefinition.java |   0
 .../java/org/apache/camel/model/LogDefinition.java |   0
 .../org/apache/camel/model/LoopDefinition.java     |   0
 .../org/apache/camel/model/MarshalDefinition.java  |   0
 .../main/java/org/apache/camel/model/Model.java    |   0
 .../org/apache/camel/model/ModelCamelContext.java  |   0
 .../java/org/apache/camel/model/ModelHelper.java   |   0
 .../apache/camel/model/MulticastDefinition.java    |   0
 .../org/apache/camel/model/NoOutputDefinition.java |   0
 .../apache/camel/model/OnCompletionDefinition.java |   0
 .../org/apache/camel/model/OnCompletionMode.java   |   0
 .../apache/camel/model/OnExceptionDefinition.java  |   0
 .../apache/camel/model/OnFallbackDefinition.java   |   0
 .../model/OptimisticLockRetryPolicyDefinition.java |   0
 .../camel/model/OptionalIdentifiedDefinition.java  |   0
 .../apache/camel/model/OtherAttributesAware.java   |   0
 .../apache/camel/model/OtherwiseDefinition.java    |   0
 .../org/apache/camel/model/OutputDefinition.java   |   0
 .../apache/camel/model/OutputExpressionNode.java   |   0
 .../java/org/apache/camel/model/OutputNode.java    |   0
 .../apache/camel/model/OutputTypeDefinition.java   |   0
 .../apache/camel/model/PackageScanDefinition.java  |   0
 .../org/apache/camel/model/PipelineDefinition.java |   0
 .../org/apache/camel/model/PolicyDefinition.java   |   0
 .../apache/camel/model/PollEnrichDefinition.java   |   0
 .../org/apache/camel/model/ProcessDefinition.java  |   0
 .../apache/camel/model/ProcessorDefinition.java    |   0
 .../camel/model/ProcessorDefinitionHelper.java     |   4 -
 .../org/apache/camel/model/PropertyDefinition.java |   0
 .../apache/camel/model/PropertyDefinitions.java    |   0
 .../camel/model/PropertyDescriptionsAdapter.java   |   0
 .../camel/model/RecipientListDefinition.java       |   0
 .../camel/model/RedeliveryPolicyDefinition.java    |   0
 .../apache/camel/model/RemoveHeaderDefinition.java |   0
 .../camel/model/RemoveHeadersDefinition.java       |   0
 .../camel/model/RemovePropertiesDefinition.java    |   0
 .../camel/model/RemovePropertyDefinition.java      |   0
 .../apache/camel/model/ResequenceDefinition.java   |   0
 .../camel/model/RestContextRefDefinition.java      |   0
 .../model/RestContextRefDefinitionHelper.java      |   0
 .../org/apache/camel/model/RollbackDefinition.java |   0
 .../apache/camel/model/RouteBuilderDefinition.java |   0
 .../org/apache/camel/model/RouteContainer.java     |   0
 .../camel/model/RouteContextRefDefinition.java     |   0
 .../model/RouteContextRefDefinitionHelper.java     |   0
 .../org/apache/camel/model/RouteDefinition.java    |   0
 .../apache/camel/model/RouteDefinitionHelper.java  |   0
 .../java/org/apache/camel/model/RouteFilters.java  |   0
 .../org/apache/camel/model/RoutesDefinition.java   |   0
 .../apache/camel/model/RoutingSlipDefinition.java  |   0
 .../camel/model/SagaActionUriDefinition.java       |   0
 .../org/apache/camel/model/SagaCompletionMode.java |   0
 .../org/apache/camel/model/SagaDefinition.java     |   0
 .../apache/camel/model/SagaOptionDefinition.java   |   0
 .../org/apache/camel/model/SagaPropagation.java    |   0
 .../org/apache/camel/model/SamplingDefinition.java |   0
 .../org/apache/camel/model/ScriptDefinition.java   |   0
 .../org/apache/camel/model/SendDefinition.java     |   0
 .../org/apache/camel/model/SetBodyDefinition.java  |   0
 .../camel/model/SetExchangePatternDefinition.java  |   0
 .../apache/camel/model/SetHeaderDefinition.java    |   0
 .../apache/camel/model/SetPropertyDefinition.java  |   0
 .../org/apache/camel/model/SortDefinition.java     |   0
 .../org/apache/camel/model/SplitDefinition.java    |   0
 .../org/apache/camel/model/StepDefinition.java     |   0
 .../org/apache/camel/model/StopDefinition.java     |   0
 .../camel/model/ThreadPoolProfileDefinition.java   |   0
 .../org/apache/camel/model/ThreadsDefinition.java  |   0
 .../org/apache/camel/model/ThrottleDefinition.java |   0
 .../camel/model/ThrowExceptionDefinition.java      |   0
 .../org/apache/camel/model/TimeUnitAdapter.java    |   0
 .../java/org/apache/camel/model/ToDefinition.java  |   0
 .../apache/camel/model/ToDynamicDefinition.java    |   0
 .../apache/camel/model/TransactedDefinition.java   |   0
 .../apache/camel/model/TransformDefinition.java    |   0
 .../java/org/apache/camel/model/TryDefinition.java |   0
 .../apache/camel/model/UnmarshalDefinition.java    |   0
 .../org/apache/camel/model/ValidateDefinition.java |   0
 .../org/apache/camel/model/WhenDefinition.java     |   0
 .../model/WhenSkipSendToEndpointDefinition.java    |   0
 .../org/apache/camel/model/WireTapDefinition.java  |   0
 ...klistServiceCallServiceFilterConfiguration.java |   0
 ...ngServiceCallServiceDiscoveryConfiguration.java |   0
 ...edServiceCallServiceDiscoveryConfiguration.java |   0
 ...binedServiceCallServiceFilterConfiguration.java |   0
 ...ulServiceCallServiceDiscoveryConfiguration.java |   0
 ...ustomServiceCallServiceFilterConfiguration.java |   0
 ...erviceCallServiceLoadBalancerConfiguration.java |   0
 ...nsServiceCallServiceDiscoveryConfiguration.java |   0
 ...cdServiceCallServiceDiscoveryConfiguration.java |   0
 ...althyServiceCallServiceFilterConfiguration.java |   0
 ...esServiceCallServiceDiscoveryConfiguration.java |   0
 ...roughServiceCallServiceFilterConfiguration.java |   0
 ...erviceCallServiceLoadBalancerConfiguration.java |   0
 .../cloud/ServiceCallConfigurationDefinition.java  |   0
 .../camel/model/cloud/ServiceCallDefinition.java   |   0
 .../cloud/ServiceCallDefinitionConstants.java      |   0
 .../cloud/ServiceCallExpressionConfiguration.java  |   0
 .../ServiceCallServiceChooserConfiguration.java    |   0
 .../ServiceCallServiceDiscoveryConfiguration.java  |   0
 .../ServiceCallServiceFilterConfiguration.java     |   0
 ...erviceCallServiceLoadBalancerConfiguration.java |   0
 ...icServiceCallServiceDiscoveryConfiguration.java |   0
 ...erServiceCallServiceDiscoveryConfiguration.java |   0
 .../org/apache/camel/model/cloud/package-info.java |   0
 .../camel/model/config/BatchResequencerConfig.java |   0
 .../camel/model/config/ResequencerConfig.java      |   0
 .../model/config/StreamResequencerConfig.java      |   0
 .../apache/camel/model/config/package-info.java    |   0
 .../camel/model/dataformat/ASN1DataFormat.java     |   0
 .../camel/model/dataformat/Any23DataFormat.java    |   0
 .../apache/camel/model/dataformat/Any23Type.java   |   0
 .../camel/model/dataformat/AvroDataFormat.java     |   0
 .../camel/model/dataformat/BarcodeDataFormat.java  |   0
 .../camel/model/dataformat/Base64DataFormat.java   |   0
 .../camel/model/dataformat/BeanioDataFormat.java   |   0
 .../camel/model/dataformat/BindyDataFormat.java    |   0
 .../apache/camel/model/dataformat/BindyType.java   |   0
 .../camel/model/dataformat/CBORDataFormat.java     |   0
 .../camel/model/dataformat/CryptoDataFormat.java   |   0
 .../camel/model/dataformat/CsvDataFormat.java      | 886 ++++++++++-----------
 .../camel/model/dataformat/CustomDataFormat.java   |   0
 .../model/dataformat/DataFormatsDefinition.java    |   0
 .../camel/model/dataformat/FhirDataformat.java     |   0
 .../camel/model/dataformat/FhirJsonDataFormat.java |   0
 .../camel/model/dataformat/FhirXmlDataFormat.java  |   0
 .../camel/model/dataformat/FlatpackDataFormat.java |   0
 .../camel/model/dataformat/GrokDataFormat.java     |   0
 .../camel/model/dataformat/GzipDataFormat.java     |   0
 .../camel/model/dataformat/HL7DataFormat.java      |   0
 .../camel/model/dataformat/IcalDataFormat.java     |   0
 .../model/dataformat/JacksonXMLDataFormat.java     |   0
 .../camel/model/dataformat/JaxbDataFormat.java     |   0
 .../camel/model/dataformat/JsonApiDataFormat.java  |   0
 .../camel/model/dataformat/JsonDataFormat.java     |   0
 .../apache/camel/model/dataformat/JsonLibrary.java |   0
 .../camel/model/dataformat/LZFDataFormat.java      |   0
 .../model/dataformat/MimeMultipartDataFormat.java  |   0
 .../camel/model/dataformat/PGPDataFormat.java      |   0
 .../camel/model/dataformat/ProtobufDataFormat.java |   0
 .../camel/model/dataformat/RssDataFormat.java      |   0
 .../camel/model/dataformat/SoapJaxbDataFormat.java |   0
 .../camel/model/dataformat/SyslogDataFormat.java   |   0
 .../camel/model/dataformat/TarFileDataFormat.java  |   0
 .../camel/model/dataformat/ThriftDataFormat.java   |   0
 .../model/dataformat/TidyMarkupDataFormat.java     |   0
 .../dataformat/UniVocityAbstractDataFormat.java    | 522 ++++++------
 .../model/dataformat/UniVocityCsvDataFormat.java   | 188 ++---
 .../dataformat/UniVocityFixedWidthDataFormat.java  | 168 ++--
 .../camel/model/dataformat/UniVocityHeader.java    | 120 +--
 .../model/dataformat/UniVocityTsvDataFormat.java   | 106 +--
 .../model/dataformat/XMLSecurityDataFormat.java    |   0
 .../camel/model/dataformat/XStreamDataFormat.java  |   0
 .../camel/model/dataformat/XmlRpcDataFormat.java   |   0
 .../camel/model/dataformat/YAMLDataFormat.java     |   0
 .../apache/camel/model/dataformat/YAMLLibrary.java |   0
 .../model/dataformat/YAMLTypeFilterDefinition.java |   0
 .../camel/model/dataformat/YAMLTypeFilterType.java |   0
 .../model/dataformat/ZipDeflaterDataFormat.java    |   0
 .../camel/model/dataformat/ZipFileDataFormat.java  |   0
 .../camel/model/dataformat/package-info.java       |   0
 .../camel/model/language/ConstantExpression.java   |   0
 .../model/language/ExchangePropertyExpression.java |   0
 .../camel/model/language/ExpressionDefinition.java |   0
 .../camel/model/language/GroovyExpression.java     |   0
 .../camel/model/language/HeaderExpression.java     |   0
 .../camel/model/language/Hl7TerserExpression.java  |   0
 .../camel/model/language/JsonPathExpression.java   |   0
 .../camel/model/language/LanguageExpression.java   |   0
 .../camel/model/language/MethodCallExpression.java |   0
 .../camel/model/language/MvelExpression.java       |   0
 .../model/language/NamespaceAwareExpression.java   |   0
 .../camel/model/language/OgnlExpression.java       |   0
 .../apache/camel/model/language/RefExpression.java |   0
 .../camel/model/language/SimpleExpression.java     |   0
 .../camel/model/language/SpELExpression.java       |   0
 .../camel/model/language/TokenizerExpression.java  |   0
 .../model/language/XMLTokenizerExpression.java     |   0
 .../camel/model/language/XPathExpression.java      |   0
 .../camel/model/language/XQueryExpression.java     |   0
 .../apache/camel/model/language/package-info.java  |   0
 .../loadbalancer/CustomLoadBalancerDefinition.java |   0
 .../FailoverLoadBalancerDefinition.java            |   0
 .../loadbalancer/RandomLoadBalancerDefinition.java |   0
 .../RoundRobinLoadBalancerDefinition.java          |   0
 .../loadbalancer/StickyLoadBalancerDefinition.java |   0
 .../loadbalancer/TopicLoadBalancerDefinition.java  |   0
 .../WeightedLoadBalancerDefinition.java            |   0
 .../camel/model/loadbalancer/package-info.java     |   0
 .../java/org/apache/camel/model/package-info.java  |   0
 .../apache/camel/model/rest/CollectionFormat.java  |   0
 .../camel/model/rest/DeleteVerbDefinition.java     |   0
 .../apache/camel/model/rest/GetVerbDefinition.java |   0
 .../camel/model/rest/HeadVerbDefinition.java       |   0
 .../camel/model/rest/PatchVerbDefinition.java      |   0
 .../camel/model/rest/PostVerbDefinition.java       |   0
 .../apache/camel/model/rest/PutVerbDefinition.java |   0
 .../camel/model/rest/RestBindingDefinition.java    |   0
 .../apache/camel/model/rest/RestBindingMode.java   |   0
 .../model/rest/RestConfigurationDefinition.java    |   0
 .../org/apache/camel/model/rest/RestConstants.java |   0
 .../org/apache/camel/model/rest/RestContainer.java |   0
 .../apache/camel/model/rest/RestDefinition.java    |   0
 .../camel/model/rest/RestHostNameResolver.java     |   0
 .../model/rest/RestOperationParamDefinition.java   |   0
 .../RestOperationResponseHeaderDefinition.java     |   0
 .../rest/RestOperationResponseMsgDefinition.java   |   0
 .../org/apache/camel/model/rest/RestParamType.java |   0
 .../camel/model/rest/RestPropertyDefinition.java   |   0
 .../camel/model/rest/RestSecuritiesDefinition.java |   0
 .../camel/model/rest/RestSecurityApiKey.java       |   0
 .../camel/model/rest/RestSecurityBasicAuth.java    |   0
 .../camel/model/rest/RestSecurityDefinition.java   |   0
 .../camel/model/rest/RestSecurityOAuth2.java       |   0
 .../apache/camel/model/rest/RestsDefinition.java   |   0
 .../camel/model/rest/SecurityDefinition.java       |   0
 .../apache/camel/model/rest/VerbDefinition.java    |   0
 .../org/apache/camel/model/rest/package-info.java  |   0
 .../transformer/CustomTransformerDefinition.java   |   0
 .../DataFormatTransformerDefinition.java           |   0
 .../transformer/EndpointTransformerDefinition.java |   0
 .../model/transformer/TransformerDefinition.java   |   0
 .../model/transformer/TransformersDefinition.java  |   0
 .../camel/model/transformer/package-info.java      |   0
 .../model/validator/CustomValidatorDefinition.java |   0
 .../validator/EndpointValidatorDefinition.java     |   0
 .../validator/PredicateValidatorDefinition.java    |   0
 .../camel/model/validator/ValidatorDefinition.java |   0
 .../model/validator/ValidatorsDefinition.java      |   0
 .../apache/camel/model/validator/package-info.java |   0
 .../org/apache/camel/reifier/AggregateReifier.java |   0
 .../java/org/apache/camel/reifier/BeanReifier.java |   0
 .../org/apache/camel/reifier/CatchReifier.java     |   0
 .../org/apache/camel/reifier/ChoiceReifier.java    |   0
 .../apache/camel/reifier/ClaimCheckReifier.java    |   0
 .../apache/camel/reifier/ConvertBodyReifier.java   |   0
 .../org/apache/camel/reifier/DelayReifier.java     |   0
 .../apache/camel/reifier/DynamicRouterReifier.java |   0
 .../org/apache/camel/reifier/EnrichReifier.java    |   0
 .../apache/camel/reifier/ExpressionReifier.java    |   0
 .../org/apache/camel/reifier/FilterReifier.java    |   0
 .../org/apache/camel/reifier/FinallyReifier.java   |   0
 .../org/apache/camel/reifier/HystrixReifier.java   |   0
 .../camel/reifier/IdempotentConsumerReifier.java   |   0
 .../apache/camel/reifier/InterceptFromReifier.java |   0
 .../org/apache/camel/reifier/InterceptReifier.java |   0
 .../reifier/InterceptSendToEndpointReifier.java    |   0
 .../apache/camel/reifier/LoadBalanceReifier.java   |   0
 .../java/org/apache/camel/reifier/LogReifier.java  |   0
 .../java/org/apache/camel/reifier/LoopReifier.java |   0
 .../org/apache/camel/reifier/MarshalReifier.java   |   0
 .../org/apache/camel/reifier/MulticastReifier.java |   0
 .../apache/camel/reifier/OnCompletionReifier.java  |   0
 .../apache/camel/reifier/OnExceptionReifier.java   |   0
 .../apache/camel/reifier/OnFallbackReifier.java    |   0
 .../org/apache/camel/reifier/OtherwiseReifier.java |   0
 .../org/apache/camel/reifier/PipelineReifier.java  |   0
 .../org/apache/camel/reifier/PolicyReifier.java    |   0
 .../apache/camel/reifier/PollEnrichReifier.java    |   0
 .../org/apache/camel/reifier/ProcessReifier.java   |   0
 .../org/apache/camel/reifier/ProcessorReifier.java |   0
 .../apache/camel/reifier/RecipientListReifier.java |   0
 .../apache/camel/reifier/RemoveHeaderReifier.java  |   0
 .../apache/camel/reifier/RemoveHeadersReifier.java |   0
 .../camel/reifier/RemovePropertiesReifier.java     |   0
 .../camel/reifier/RemovePropertyReifier.java       |   0
 .../apache/camel/reifier/ResequenceReifier.java    |   0
 .../org/apache/camel/reifier/RollbackReifier.java  |   0
 .../org/apache/camel/reifier/RouteReifier.java     |   0
 .../apache/camel/reifier/RoutingSlipReifier.java   |   0
 .../java/org/apache/camel/reifier/SagaReifier.java |   0
 .../org/apache/camel/reifier/SamplingReifier.java  |   0
 .../org/apache/camel/reifier/ScriptReifier.java    |   0
 .../java/org/apache/camel/reifier/SendReifier.java |   0
 .../apache/camel/reifier/ServiceCallReifier.java   |   0
 .../org/apache/camel/reifier/SetBodyReifier.java   |   0
 .../camel/reifier/SetExchangePatternReifier.java   |   0
 .../org/apache/camel/reifier/SetHeaderReifier.java |   0
 .../apache/camel/reifier/SetPropertyReifier.java   |   0
 .../java/org/apache/camel/reifier/SortReifier.java |   0
 .../org/apache/camel/reifier/SplitReifier.java     |   0
 .../java/org/apache/camel/reifier/StepReifier.java |   0
 .../java/org/apache/camel/reifier/StopReifier.java |   0
 .../org/apache/camel/reifier/ThreadsReifier.java   |   0
 .../org/apache/camel/reifier/ThrottleReifier.java  |   0
 .../camel/reifier/ThrowExceptionReifier.java       |   0
 .../org/apache/camel/reifier/ToDynamicReifier.java |   0
 .../apache/camel/reifier/TransactedReifier.java    |   0
 .../org/apache/camel/reifier/TransformReifier.java |   0
 .../java/org/apache/camel/reifier/TryReifier.java  |   0
 .../org/apache/camel/reifier/UnmarshalReifier.java |   0
 .../org/apache/camel/reifier/ValidateReifier.java  |   0
 .../java/org/apache/camel/reifier/WhenReifier.java |   0
 .../reifier/WhenSkipSendToEndpointReifier.java     |   0
 .../org/apache/camel/reifier/WireTapReifier.java   |   0
 .../reifier/dataformat/ASN1DataFormatReifier.java  |   0
 .../reifier/dataformat/Any23DataFormatReifier.java |   0
 .../reifier/dataformat/AvroDataFormatReifier.java  |   0
 .../dataformat/BarcodeDataFormatReifier.java       |   0
 .../dataformat/Base64DataFormatReifier.java        |   0
 .../dataformat/BeanioDataFormatReifier.java        |   0
 .../reifier/dataformat/BindyDataFormatReifier.java |   0
 .../reifier/dataformat/CBORDataFormatReifier.java  |   0
 .../dataformat/CryptoDataFormatReifier.java        |   0
 .../reifier/dataformat/CsvDataFormatReifier.java   |   0
 .../dataformat/CustomDataFormatReifier.java        |   0
 .../reifier/dataformat/DataFormatReifier.java      |   0
 .../reifier/dataformat/FhirDataFormatReifier.java  |   0
 .../dataformat/FhirJsonDataFormatReifier.java      |   0
 .../dataformat/FhirXmlDataFormatReifier.java       |   0
 .../dataformat/FlatpackDataFormatReifier.java      |   0
 .../reifier/dataformat/GrokDataFormatReifier.java  |  78 +-
 .../reifier/dataformat/GzipDataFormatReifier.java  |   0
 .../reifier/dataformat/HL7DataFormatReifier.java   |   0
 .../reifier/dataformat/IcalDataFormatReifier.java  |   0
 .../dataformat/JacksonXMLDataFormatReifier.java    |   0
 .../reifier/dataformat/JaxbDataFormatReifier.java  |   0
 .../dataformat/JsonApiDataFormatReifier.java       |   0
 .../reifier/dataformat/JsonDataFormatReifier.java  |   0
 .../reifier/dataformat/LZFDataFormatReifier.java   |   0
 .../dataformat/MimeMultipartDataFormatReifier.java |   0
 .../reifier/dataformat/PGPDataFormatReifier.java   |   0
 .../dataformat/ProtobufDataFormatReifier.java      |   0
 .../reifier/dataformat/RssDataFormatReifier.java   |   0
 .../dataformat/SoapJaxbDataFormatReifier.java      |   0
 .../dataformat/SyslogDataFormatReifier.java        |   0
 .../dataformat/TarFileDataFormatReifier.java       |   0
 .../dataformat/ThriftDataFormatReifier.java        |   0
 .../dataformat/TidyMarkupDataFormatReifier.java    |   0
 .../UniVocityAbstractDataFormatReifier.java        |   0
 .../dataformat/UniVocityCsvDataFormatReifier.java  |   0
 .../UniVocityFixedWidthDataFormatReifier.java      |   0
 .../dataformat/UniVocityTsvDataFormatReifier.java  |   0
 .../dataformat/XMLSecurityDataFormatReifier.java   |   0
 .../dataformat/XStreamDataFormatReifier.java       |   0
 .../dataformat/XmlRpcDataFormatReifier.java        |   0
 .../reifier/dataformat/YAMLDataFormatReifier.java  |   0
 .../reifier/dataformat/ZipDataFormatReifier.java   |   0
 .../dataformat/ZipFileDataFormatReifier.java       |   0
 .../errorhandler/DeadLetterChannelReifier.java     |   0
 .../errorhandler/DefaultErrorHandlerReifier.java   |   0
 .../errorhandler/ErrorHandlerRefReifier.java       |   0
 .../reifier/errorhandler/ErrorHandlerReifier.java  |   0
 .../errorhandler/NoErrorHandlerReifier.java        |   0
 .../loadbalancer/CustomLoadBalancerReifier.java    |   0
 .../loadbalancer/FailoverLoadBalancerReifier.java  |   0
 .../reifier/loadbalancer/LoadBalancerReifier.java  |   0
 .../loadbalancer/RandomLoadBalancerReifier.java    |   0
 .../RoundRobinLoadBalancerReifier.java             |   0
 .../loadbalancer/StickyLoadBalancerReifier.java    |   0
 .../loadbalancer/TopicLoadBalancerReifier.java     |   0
 .../loadbalancer/WeightedLoadBalancerReifier.java  |   0
 .../camel/reifier/rest/RestBindingReifier.java     |   0
 .../transformer/CustomTransformeReifier.java       |   0
 .../transformer/DataFormatTransformeReifier.java   |   0
 .../transformer/EndpointTransformeReifier.java     |   0
 .../reifier/transformer/TransformerReifier.java    |   0
 .../reifier/validator/CustomValidatorReifier.java  |   0
 .../validator/EndpointValidatorReifier.java        |   0
 .../validator/PredicateValidatorReifier.java       |   0
 .../camel/reifier/validator/ValidatorReifier.java  |   0
 .../src/main/schema/constant.json                  |   0
 .../src/main/schema/exchangeProperty.json          |   0
 .../src/main/schema/expression.json                |   0
 .../src/main/schema/groovy.json                    |   0
 .../src/main/schema/header.json                    |   0
 .../src/main/schema/hl7terser.json                 |   0
 .../src/main/schema/jsonpath.json                  |   0
 .../src/main/schema/language.json                  |   0
 .../src/main/schema/method.json                    |   0
 .../src/main/schema/mvel.json                      |   0
 .../src/main/schema/ognl.json                      |   0
 .../src/main/schema/ref.json                       |   0
 .../src/main/schema/simple.json                    |   0
 .../src/main/schema/spel.json                      |   0
 .../src/main/schema/tokenize.json                  |   0
 .../src/main/schema/xpath.json                     |   0
 .../src/main/schema/xquery.json                    |   0
 .../src/main/schema/xtokenize.json                 |   0
 core/camel-core-osgi/pom.xml                       |   5 +-
 core/camel-core-xml/pom.xml                        |   4 -
 .../core/xml/AbstractCamelContextFactoryBean.java  |   9 +-
 core/camel-core/pom.xml                            | 449 +----------
 core/camel-core/src/revapi/ignore.json             |  24 -
 .../camel/builder/xml/XPathFunctionsTest.java      |   6 +-
 .../file/FilerProducerDoneFileNameRouteTest.java   |   4 +-
 .../file/FilerProducerDoneFileNameTest.java        |   5 +-
 .../ComponentResolvePropertyPlaceholdersTest.java  |   6 +-
 .../OptionalPropertiesDslInvalidSyntaxTest.java    |   4 +-
 .../properties/OptionalPropertiesDslTest.java      |   4 +-
 ...onentAdviceWithInterceptSendToEndpointTest.java |   4 +-
 ...opertiesComponentConcatenatePropertiesTest.java |   8 +-
 .../PropertiesComponentDisableDefaultsTest.java    |   7 +-
 ...pertiesComponentEIPChoiceConvertBodyToTest.java |   6 +-
 .../PropertiesComponentEIPChoiceSimpleTest.java    |   8 +-
 .../PropertiesComponentEIPConvertBodyToTest.java   |   6 +-
 .../PropertiesComponentEIPRoutingSlipTest.java     |   6 +-
 .../PropertiesComponentEncodingTest.java           |   6 +-
 .../PropertiesComponentEndpointMandatoryTest.java  |  50 --
 .../PropertiesComponentEndpointTest.java           |   6 +-
 .../PropertiesComponentFunctionTest.java           |   2 +-
 .../PropertiesComponentGetOrElseTest.java          | 102 ---
 .../PropertiesComponentInitialPropertiesTest.java  |   4 +-
 .../PropertiesComponentInterceptFromTest.java      |   6 +-
 ...ertiesComponentInterceptSendToEndpointTest.java |   4 +-
 ...ponentLoadPropertiesFromFileTrimValuesTest.java |   4 +-
 .../PropertiesComponentLoadPropertiesTest.java     |   4 +-
 .../PropertiesComponentNestPropertiesTest.java     |  72 --
 ...ertiesComponentOnExceptionDelayPatternTest.java |   6 +-
 .../PropertiesComponentOnExceptionTest.java        |   6 +-
 ...esComponentOverridePropertiesNonStringTest.java |   6 +-
 .../PropertiesComponentOverridePropertiesTest.java |   6 +-
 .../PropertiesComponentPropertiesSourceTest.java   |  14 +-
 .../properties/PropertiesComponentRefTest.java     |  80 --
 .../PropertiesComponentRegistryTest.java           |   4 +-
 .../PropertiesComponentSetHeaderSimpleTest.java    |   6 +-
 .../PropertiesComponentSimpleLanguageTest.java     |  70 --
 .../properties/PropertiesComponentTest.java        | 446 -----------
 .../PropertiesEnvironmentVariableOverrideTest.java |  67 --
 .../properties/PropertiesRouteFromTest.java        |   4 +-
 .../properties/PropertiesRouteIdTest.java          |   4 +-
 .../properties/XPathPropertyPlaceholderTest.java   |   2 +-
 .../XsltIncludeClasspathDotInDirectoryTest.java    |   2 +
 .../camel/impl/MultipleLifecycleStrategyTest.java  |   2 +-
 .../impl/engine/CamelPostProcessorHelperTest.java  |   6 +-
 .../issues/PropertiesAvailableEverywhereTest.java  |   4 +-
 .../TransactedPropertyPlaceholderIssueTest.java    |   6 +-
 ...LWithDotInParameterPropertyPlaceholderTest.java |   6 +-
 .../PropertyInjectAnnotationParameterTest.java     |   5 +-
 .../simple/SimplePropertiesNestedTest.java         |  64 --
 .../language/simple/SimpleWithPropertiesTest.java  |  53 --
 .../camel/processor/RouteAutoStartupTest.java      |  10 +-
 .../camel/processor/SimpleMockPlaceholderTest.java |   5 +-
 .../InterceptFromPropertyPlaceholderTest.java      |   6 +-
 .../support/jsse/AbstractJsseParametersTest.java   |   8 +-
 ...mlChoiceFilterRoutePropertyPlaceholderTest.java |   3 +-
 .../camel/util/DumpModelAsXmlPlaceholdersTest.java |   4 +-
 .../builder/endpoint/EndpointBuilderFactory.java   |   1 -
 .../dsl/PropertiesEndpointBuilderFactory.java      | 411 ----------
 .../endpoint/dsl/S3EndpointBuilderFactory.java     |   8 +-
 .../endpoint/ProcessorDefinitionDslTest.java       |   2 -
 core/camel-main/pom.xml                            |   5 -
 .../camel/main/DefaultConfigurationConfigurer.java |   5 +
 .../management/BacklogTracerStreamCachingTest.java |   1 -
 .../management/CamelChoiceWithManagementTest.java  |   2 -
 .../management/ExceptionWithManagementTest.java    |   2 -
 ...RoutesWithPropertyPlaceholdersFromXmlPTest.java |   7 +-
 .../camel/management/ManagedCustomPolicyTest.java  |   1 -
 .../management/ManagedErrorHandlerOptionsTest.java |   2 -
 .../ManagedErrorHandlerRedeliveryTest.java         |   2 -
 .../ManagedFailoverLoadBalancerTest.java           |   2 -
 .../management/ManagedFileIdempotentClearTest.java |   2 -
 .../ManagedFileIdempotentConsumerTest.java         |   2 -
 .../management/ManagedFromRestPlaceholderTest.java |   7 +-
 .../management/ManagedInflightRepositoryTest.java  |   2 -
 .../management/ManagedInflightStatisticsTest.java  |   2 -
 .../management/ManagedInlinedProcessorTest.java    |   2 -
 .../ManagedMemoryIdempotentClearTest.java          |   2 -
 .../ManagedMemoryIdempotentConsumerTest.java       |   2 -
 .../management/ManagedNonManagedServiceTest.java   |   2 +-
 ...edProducerRouteAddRemoveRegisterAlwaysTest.java |   2 +-
 .../management/ManagedRedeliverRouteOnlyTest.java  |   2 -
 .../camel/management/ManagedRedeliverTest.java     |   2 -
 .../management/ManagedRouteAddFromRouteTest.java   |   2 -
 .../management/ManagedRouteAddRemoveTest.java      |   2 +-
 .../ManagedRouteDirectWhileIssueLeakTest.java      |   2 -
 .../ManagedRouteDumpRouteAsXmlPlaceholderTest.java |   7 +-
 .../camel/management/ManagedThrottlerTest.java     |   2 -
 .../management/MultiInstanceProcessorTest.java     |   2 -
 .../apache/camel/processor/NoErrorHandlerTest.java |   2 -
 .../ReduceStacksNeededDuringRoutingTest.java       |   2 -
 .../processor/async/AsyncEndpointWithJMXTest.java  |   2 -
 .../apache/camel/support/IntrospectionSupport.java |   7 +-
 .../camel/support/builder/ExpressionBuilder.java   |   7 +-
 core/pom.xml                                       |   2 +-
 docs/components/modules/ROOT/nav.adoc              |   2 +-
 .../modules/ROOT/pages/debezium-component.adoc     |  11 +
 docs/components/modules/ROOT/pages/index.adoc      |   1 -
 .../kubernetes-service-accounts-component.adoc     |  32 +
 .../ROOT/pages/kubernetes-services-component.adoc  |  51 ++
 .../pages/openshift-build-configs-component.adoc   |  33 +
 .../ROOT/pages/openshift-builds-component.adoc     |  33 +
 .../modules/ROOT/pages/properties-component.adoc   | 124 +--
 .../components/modules/ROOT/pages/spring-boot.adoc |  64 +-
 .../modules/ROOT/pages/test-spring-junit5.adoc     |   1 +
 docs/components/modules/ROOT/pages/zipkin.adoc     |   4 +-
 docs/gulpfile.js                                   |   8 +-
 .../modules/ROOT/pages/aggregate-eip.adoc          |   2 +-
 docs/user-manual/modules/ROOT/pages/async.adoc     |  94 ++-
 .../ROOT/pages/asynchronous-routing-engine.adoc    |  14 +-
 .../modules/ROOT/pages/backlogdebugger.adoc        |   2 +-
 .../modules/ROOT/pages/batch-config-eip.adoc       |   2 +-
 docs/user-manual/modules/ROOT/pages/bean-eip.adoc  |   2 +-
 .../ROOT/pages/camel-3-migration-guide.adoc        |   6 +-
 .../user-manual/modules/ROOT/pages/choice-eip.adoc |   2 +-
 .../modules/ROOT/pages/circuitBreaker-eip.adoc     |   2 +-
 .../modules/ROOT/pages/claimCheck-eip.adoc         |   2 +-
 .../ROOT/pages/content-based-router-eip.adoc       |   2 +-
 .../modules/ROOT/pages/content-filter-eip.adoc     |   2 +-
 .../modules/ROOT/pages/convertBodyTo-eip.adoc      |   2 +-
 .../modules/ROOT/pages/customLoadBalancer-eip.adoc |   2 +-
 docs/user-manual/modules/ROOT/pages/delay-eip.adoc |   2 +-
 .../modules/ROOT/pages/dynamic-router.adoc         |   2 +-
 .../modules/ROOT/pages/dynamicRouter-eip.adoc      |   2 +-
 .../user-manual/modules/ROOT/pages/enrich-eip.adoc |   2 +-
 .../ROOT/pages/eventDrivenConsumer-eip.adoc        |   2 +-
 .../modules/ROOT/pages/failover-eip.adoc           |   2 +-
 .../user-manual/modules/ROOT/pages/filter-eip.adoc |   2 +-
 docs/user-manual/modules/ROOT/pages/from-eip.adoc  |   2 +-
 .../modules/ROOT/pages/hystrix-eip.adoc            |   2 +-
 .../ROOT/pages/hystrixConfiguration-eip.adoc       |   2 +-
 .../modules/ROOT/pages/idempotentConsumer-eip.adoc |   2 +-
 .../user-manual/modules/ROOT/pages/inOnly-eip.adoc |   2 +-
 docs/user-manual/modules/ROOT/pages/inOut-eip.adoc |   2 +-
 .../modules/ROOT/pages/loadBalance-eip.adoc        |   2 +-
 docs/user-manual/modules/ROOT/pages/log-eip.adoc   |   2 +-
 docs/user-manual/modules/ROOT/pages/loop-eip.adoc  |   2 +-
 .../modules/ROOT/pages/marshal-eip.adoc            |   2 +-
 .../modules/ROOT/pages/multicast-eip.adoc          |   2 +-
 .../modules/ROOT/pages/onFallback-eip.adoc         |   2 +-
 .../modules/ROOT/pages/otherwise-eip.adoc          |   2 +-
 .../modules/ROOT/pages/pipeline-eip.adoc           |   2 +-
 .../modules/ROOT/pages/pollEnrich-eip.adoc         |   2 +-
 .../modules/ROOT/pages/process-eip.adoc            |   2 +-
 .../user-manual/modules/ROOT/pages/random-eip.adoc |   2 +-
 .../modules/ROOT/pages/recipientList-eip.adoc      |   2 +-
 .../modules/ROOT/pages/removeHeader-eip.adoc       |   2 +-
 .../modules/ROOT/pages/removeHeaders-eip.adoc      |   2 +-
 .../modules/ROOT/pages/removeProperties-eip.adoc   |   2 +-
 .../modules/ROOT/pages/removeProperty-eip.adoc     |   2 +-
 .../modules/ROOT/pages/requestReply-eip.adoc       |   2 +-
 .../modules/ROOT/pages/resequence-eip.adoc         |   2 +-
 .../modules/ROOT/pages/rollback-eip.adoc           |   2 +-
 .../modules/ROOT/pages/roundRobin-eip.adoc         |   2 +-
 .../modules/ROOT/pages/routingSlip-eip.adoc        |   2 +-
 docs/user-manual/modules/ROOT/pages/saga-eip.adoc  |   2 +-
 .../user-manual/modules/ROOT/pages/sample-eip.adoc |   2 +-
 .../user-manual/modules/ROOT/pages/script-eip.adoc |   2 +-
 .../modules/ROOT/pages/serviceCall-eip.adoc        |   2 +-
 .../modules/ROOT/pages/setBody-eip.adoc            |   2 +-
 .../modules/ROOT/pages/setHeader-eip.adoc          |   2 +-
 .../modules/ROOT/pages/setOutHeader-eip.adoc       |   2 +-
 .../modules/ROOT/pages/setProperty-eip.adoc        |   2 +-
 docs/user-manual/modules/ROOT/pages/sort-eip.adoc  |   2 +-
 docs/user-manual/modules/ROOT/pages/split-eip.adoc |   2 +-
 docs/user-manual/modules/ROOT/pages/step-eip.adoc  |   2 +-
 .../user-manual/modules/ROOT/pages/sticky-eip.adoc |   2 +-
 docs/user-manual/modules/ROOT/pages/stop-eip.adoc  |   2 +-
 .../modules/ROOT/pages/stream-config-eip.adoc      |   2 +-
 .../modules/ROOT/pages/threads-eip.adoc            |   2 +-
 .../modules/ROOT/pages/throttle-eip.adoc           |   2 +-
 docs/user-manual/modules/ROOT/pages/to-eip.adoc    |   2 +-
 docs/user-manual/modules/ROOT/pages/toD-eip.adoc   |   2 +-
 docs/user-manual/modules/ROOT/pages/topic-eip.adoc |   2 +-
 .../modules/ROOT/pages/transform-eip.adoc          |   2 +-
 .../modules/ROOT/pages/unmarshal-eip.adoc          |   2 +-
 .../ROOT/pages/using-propertyplaceholder.adoc      | 123 +--
 .../modules/ROOT/pages/validate-eip.adoc           |   2 +-
 .../modules/ROOT/pages/weighted-eip.adoc           |   2 +-
 docs/user-manual/modules/ROOT/pages/when-eip.adoc  |   2 +-
 .../modules/ROOT/pages/wireTap-eip.adoc            |   2 +-
 .../example/cxf/httptojms/CamelCxfExample.java     |   3 -
 .../example/cxf/jaxrs/CamelRouterBuilder.java      |   3 -
 examples/camel-example-debezium/README.adoc        |  10 +
 .../camel/example/ftp/MyFtpClientRouteBuilder.java |   4 +-
 .../camel/example/ftp/MyFtpServerRouteBuilder.java |   4 +-
 .../google/pubsub/MessageConsumerClient.java       |   4 +-
 .../google/pubsub/MessagePublisherClient.java      |   4 +-
 .../camel/example/kafka/MessageConsumerClient.java |   4 +-
 .../example/kafka/MessagePublisherClient.java      |   4 +-
 examples/camel-example-kotlin/pom.xml              |   2 +-
 .../splunk/SplunkPublishEventRouteBuilder.java     |   4 +-
 .../splunk/SplunkSavedSearchRouteBuilder.java      |   4 +-
 .../example/splunk/SplunkSearchRouteBuilder.java   |   4 +-
 examples/camel-example-spring-boot/pom.xml         |  11 +-
 .../sample/camel/FooApplicationJUnit5Test.java     |  52 ++
 .../sample/camel/MyCamelApplicationJUnit5Test.java |  48 ++
 .../apache/camel/example/client/CamelClient.java   |  15 +-
 .../camel/example/client/CamelClientEndpoint.java  |  15 +-
 .../camel/example/client/CamelClientRemoting.java  |  13 +-
 parent/pom.xml                                     |  35 +-
 .../karaf/features/src/main/resources/features.xml |  12 +-
 .../s3/springboot/S3ComponentConfiguration.java    |   4 +-
 .../camel-properties-starter/pom.xml               |  53 --
 .../PropertiesComponentAutoConfiguration.java      | 128 ---
 .../src/main/resources/META-INF/LICENSE.txt        | 203 -----
 .../src/main/resources/META-INF/NOTICE.txt         |  11 -
 .../src/main/resources/META-INF/spring.factories   |  19 -
 .../src/main/resources/META-INF/spring.provides    |  17 -
 platforms/spring-boot/components-starter/pom.xml   |   1 -
 .../camel-spring-boot-dependencies/pom.xml         |  10 -
 .../maven/packaging/PackageDataFormatMojo.java     |   2 +-
 .../camel/maven/packaging/PackageHelper.java       |   2 +-
 .../camel/maven/packaging/PackageLanguageMojo.java |   2 +-
 .../maven/packaging/PrepareCatalogKarafMojo.java   |   2 +-
 .../camel/maven/packaging/PrepareCatalogMojo.java  |   2 +-
 .../packaging/PrepareCatalogSpringBootMojo.java    |   2 +-
 .../camel/maven/packaging/PrepareReadmeMojo.java   |   2 +-
 .../maven/packaging/model/ComponentModel.java      |   2 +-
 .../maven/packaging/model/DataFormatModel.java     |   2 +-
 .../camel/maven/packaging/model/LanguageModel.java |   2 +-
 868 files changed, 2908 insertions(+), 4833 deletions(-)
 delete mode 100644 components/camel-properties/pom.xml
 delete mode 100644 components/camel-properties/src/main/java/org/apache/camel/component/properties/PropertiesEndpoint.java
 create mode 100644 components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentAutoConfiguration.java
 rename {platforms/spring-boot/components-starter/camel-properties-starter/src/main/java/org/apache/camel/component/properties/springboot => components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties}/PropertiesComponentConfiguration.java (84%)
 copy components/{camel-properties/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java => camel-zipkin/src/main/java/org/apache/camel/zipkin/ServiceHostFunction.java} (84%)
 copy components/{camel-properties/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java => camel-zipkin/src/main/java/org/apache/camel/zipkin/ServicePortFunction.java} (82%)
 create mode 100644 components/camel-zipkin/src/test/java/org/apache/camel/zipkin/ZipkinClientCustomTagsTest.java
 rename {components/camel-properties => core/camel-base}/src/main/docs/properties-component.adoc (81%)
 rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java (100%)
 rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java (100%)
 rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/DefaultPropertiesLookup.java (100%)
 rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java (96%)
 rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/EnvPropertiesFunction.java (100%)
 rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java (100%)
 rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/LocationPropertiesSource.java (100%)
 rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java (95%)
 rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/PropertiesFunction.java (100%)
 rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/PropertiesLocation.java (100%)
 rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/PropertiesLookup.java (100%)
 rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/PropertiesParser.java (100%)
 rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/RefPropertiesSource.java (100%)
 rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java (100%)
 rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java (100%)
 rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java (100%)
 rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/SysPropertiesFunction.java (100%)
 rename {components/camel-properties => core/camel-base}/src/main/java/org/apache/camel/component/properties/package.html (100%)
 create mode 100644 core/camel-base/src/main/java/org/apache/camel/impl/engine/PropertiesComponentFactoryResolver.java
 create mode 100644 core/camel-base/src/main/resources/META-INF/services/org/apache/camel/properties-component-factory
 rename core/{camel-core => camel-core-engine}/readme-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/readme.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/aggregate-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/batch-config-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/bean-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/choice-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/circuitBreaker-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/claimCheck-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/content-based-router-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/content-filter-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/convertBodyTo-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/customLoadBalancer-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/delay-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/dynamic-router.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/dynamicRouter-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/enrich-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/eventDrivenConsumer-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/failover-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/filter-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/from-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/hystrix-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/hystrixConfiguration-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/idempotentConsumer-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/inOnly-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/inOut-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/loadBalance-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/log-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/loop-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/marshal-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/multicast-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/onFallback-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/otherwise-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/pipeline-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/pollEnrich-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/process-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/random-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/recipientList-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/removeHeader-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/removeHeaders-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/removeProperties-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/removeProperty-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/requestReply-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/resequence-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/rollback-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/roundRobin-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/routingSlip-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/saga-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/sample-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/script-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/serviceCall-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/setBody-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/setHeader-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/setOutHeader-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/setProperty-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/sort-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/split-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/step-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/sticky-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/stop-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/stream-config-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/threads-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/throttle-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/to-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/toD-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/topic-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/transform-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/unmarshal-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/validate-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/weighted-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/when-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/docs/eips/wireTap-eip.adoc (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/AdviceWithTask.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/AdviceWithTasks.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/AggregationStrategies.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/AggregationStrategyClause.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/Builder.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/BuilderSupport.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/DataFormatClause.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/EndpointProducerBuilder.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/EnrichClause.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/ExchangeBuilder.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/ExpressionBuilder.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/ExpressionClause.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/FlexibleAggregationStrategy.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/NotifyBuilder.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/PredicateBuilder.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/PredicateClause.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/ProcessClause.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/ProxyBuilder.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/RouteBuilder.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/SimpleBuilder.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/TransformerBuilder.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/ValidatorBuilder.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/ValueBuilder.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/builder/package.html (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/impl/AbstractModelCamelContext.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (97%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/impl/DefaultModel.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/impl/DefaultModelJAXBContextFactory.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/impl/JndiRegistry.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/impl/RouteIdFactory.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/impl/RouteService.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteConfiguration.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilters.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/impl/cluster/package.html (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/impl/package.html (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/AdviceWithDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/AggregateDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/BeanDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/Block.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/CatchDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ChoiceDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ClaimCheckDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ClaimCheckOperation.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/Constants.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ContextScanDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/DataFormatDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/DefinitionPropertyPlaceholderConfigurer.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/DelayDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/DescriptionDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/EndpointRequiredDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/EnrichDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ExpressionNode.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ExpressionNodeHelper.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ExpressionSubElementDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/FilterDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/FinallyDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/FromDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/GlobalOptionDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/HystrixDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/IdentifiedType.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/InOnlyDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/InOutDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/InputTypeDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/InterceptDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/InterceptFromDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/LogDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/LoopDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/MarshalDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/Model.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ModelCamelContext.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ModelHelper.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/MulticastDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/NoOutputDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/OnCompletionDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/OnCompletionMode.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/OnExceptionDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/OnFallbackDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/OtherAttributesAware.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/OtherwiseDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/OutputDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/OutputExpressionNode.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/OutputNode.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/OutputTypeDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/PackageScanDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/PipelineDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/PolicyDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/PollEnrichDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ProcessDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ProcessorDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java (99%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/PropertyDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/PropertyDefinitions.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/PropertyDescriptionsAdapter.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/RecipientListDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ResequenceDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/RestContextRefDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/RestContextRefDefinitionHelper.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/RollbackDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/RouteContainer.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/RouteDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/RouteFilters.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/RoutesDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/SagaActionUriDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/SagaCompletionMode.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/SagaDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/SagaOptionDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/SagaPropagation.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/SamplingDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ScriptDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/SendDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/SetBodyDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/SetHeaderDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/SetPropertyDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/SortDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/SplitDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/StepDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/StopDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ThreadsDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ThrottleDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/TimeUnitAdapter.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ToDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ToDynamicDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/TransactedDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/TransformDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/TryDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/UnmarshalDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/ValidateDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/WhenDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/WireTapDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/BlacklistServiceCallServiceFilterConfiguration.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceDiscoveryConfiguration.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/CustomServiceCallServiceFilterConfiguration.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/EtcdServiceCallServiceDiscoveryConfiguration.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/HealthyServiceCallServiceFilterConfiguration.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/PassThroughServiceCallServiceFilterConfiguration.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/RibbonServiceCallServiceLoadBalancerConfiguration.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/cloud/package-info.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/config/ResequencerConfig.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/config/package-info.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/ASN1DataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/Any23Type.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/BindyType.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/CBORDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java (96%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/FhirJsonDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/FhirXmlDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/GrokDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/JsonApiDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/ThriftDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java (96%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java (96%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java (97%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java (96%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java (97%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterType.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/ZipDeflaterDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/dataformat/package-info.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/language/ConstantExpression.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/language/GroovyExpression.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/language/HeaderExpression.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/language/Hl7TerserExpression.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/language/JsonPathExpression.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/language/LanguageExpression.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/language/MethodCallExpression.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/language/MvelExpression.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/language/OgnlExpression.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/language/RefExpression.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/language/SimpleExpression.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/language/SpELExpression.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/language/TokenizerExpression.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/language/XPathExpression.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/language/XQueryExpression.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/language/package-info.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/loadbalancer/package-info.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/package-info.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/CollectionFormat.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/PatchVerbDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/RestBindingMode.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/RestConstants.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/RestContainer.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/RestDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/RestOperationResponseHeaderDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/RestParamType.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/RestSecurityApiKey.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/RestSecurityBasicAuth.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/RestSecurityDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/RestSecurityOAuth2.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/RestsDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/SecurityDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/VerbDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/rest/package-info.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/transformer/package-info.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/validator/ValidatorDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/validator/ValidatorsDefinition.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/model/validator/package-info.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/AggregateReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/BeanReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/CatchReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/ChoiceReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/ClaimCheckReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/ConvertBodyReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/DelayReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/DynamicRouterReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/EnrichReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/ExpressionReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/FilterReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/FinallyReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/HystrixReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/IdempotentConsumerReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/InterceptReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/LoadBalanceReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/LogReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/LoopReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/MarshalReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/MulticastReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/OnExceptionReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/OnFallbackReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/OtherwiseReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/PipelineReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/PolicyReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/PollEnrichReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/ProcessReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/ProcessorReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/RecipientListReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/RemoveHeaderReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/RemoveHeadersReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/RemovePropertiesReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/RemovePropertyReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/ResequenceReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/RollbackReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/RouteReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/RoutingSlipReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/SagaReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/SamplingReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/ScriptReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/SendReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/ServiceCallReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/SetBodyReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/SetExchangePatternReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/SortReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/SplitReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/StepReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/StopReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/ThreadsReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/ThrottleReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/ThrowExceptionReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/ToDynamicReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/TransactedReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/TransformReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/TryReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/UnmarshalReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/ValidateReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/WhenReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/WhenSkipSendToEndpointReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/WireTapReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/ASN1DataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/Any23DataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/AvroDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/BarcodeDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/Base64DataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/BeanioDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/BindyDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/CBORDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/CryptoDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/CsvDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/CustomDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/FhirDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/FhirJsonDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/FhirXmlDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/FlatpackDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/GrokDataFormatReifier.java (97%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/GzipDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/HL7DataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/IcalDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/JacksonXMLDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/JaxbDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/JsonApiDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/LZFDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/MimeMultipartDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/PGPDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/ProtobufDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/RssDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/SoapJaxbDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/SyslogDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/TarFileDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/ThriftDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/TidyMarkupDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/UniVocityAbstractDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/UniVocityCsvDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/UniVocityFixedWidthDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/UniVocityTsvDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/XMLSecurityDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/XStreamDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/XmlRpcDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/YAMLDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/ZipDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/dataformat/ZipFileDataFormatReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerRefReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/errorhandler/NoErrorHandlerReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/loadbalancer/CustomLoadBalancerReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/loadbalancer/FailoverLoadBalancerReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/loadbalancer/LoadBalancerReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/loadbalancer/RandomLoadBalancerReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/loadbalancer/RoundRobinLoadBalancerReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/loadbalancer/StickyLoadBalancerReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/loadbalancer/TopicLoadBalancerReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/loadbalancer/WeightedLoadBalancerReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/transformer/CustomTransformeReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/transformer/DataFormatTransformeReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/transformer/EndpointTransformeReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/transformer/TransformerReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/validator/CustomValidatorReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/validator/EndpointValidatorReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/validator/PredicateValidatorReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/java/org/apache/camel/reifier/validator/ValidatorReifier.java (100%)
 rename core/{camel-core => camel-core-engine}/src/main/schema/constant.json (100%)
 rename core/{camel-core => camel-core-engine}/src/main/schema/exchangeProperty.json (100%)
 rename core/{camel-core => camel-core-engine}/src/main/schema/expression.json (100%)
 rename core/{camel-core => camel-core-engine}/src/main/schema/groovy.json (100%)
 rename core/{camel-core => camel-core-engine}/src/main/schema/header.json (100%)
 rename core/{camel-core => camel-core-engine}/src/main/schema/hl7terser.json (100%)
 rename core/{camel-core => camel-core-engine}/src/main/schema/jsonpath.json (100%)
 rename core/{camel-core => camel-core-engine}/src/main/schema/language.json (100%)
 rename core/{camel-core => camel-core-engine}/src/main/schema/method.json (100%)
 rename core/{camel-core => camel-core-engine}/src/main/schema/mvel.json (100%)
 rename core/{camel-core => camel-core-engine}/src/main/schema/ognl.json (100%)
 rename core/{camel-core => camel-core-engine}/src/main/schema/ref.json (100%)
 rename core/{camel-core => camel-core-engine}/src/main/schema/simple.json (100%)
 rename core/{camel-core => camel-core-engine}/src/main/schema/spel.json (100%)
 rename core/{camel-core => camel-core-engine}/src/main/schema/tokenize.json (100%)
 rename core/{camel-core => camel-core-engine}/src/main/schema/xpath.json (100%)
 rename core/{camel-core => camel-core-engine}/src/main/schema/xquery.json (100%)
 rename core/{camel-core => camel-core-engine}/src/main/schema/xtokenize.json (100%)
 delete mode 100644 core/camel-core/src/revapi/ignore.json
 delete mode 100644 core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentEndpointMandatoryTest.java
 delete mode 100644 core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentGetOrElseTest.java
 delete mode 100644 core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentNestPropertiesTest.java
 delete mode 100644 core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentRefTest.java
 delete mode 100644 core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentSimpleLanguageTest.java
 delete mode 100644 core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentTest.java
 delete mode 100644 core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesEnvironmentVariableOverrideTest.java
 delete mode 100644 core/camel-core/src/test/java/org/apache/camel/language/simple/SimplePropertiesNestedTest.java
 delete mode 100644 core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleWithPropertiesTest.java
 delete mode 100644 core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/PropertiesEndpointBuilderFactory.java
 create mode 100644 examples/camel-example-spring-boot/src/test/java/sample/camel/FooApplicationJUnit5Test.java
 create mode 100644 examples/camel-example-spring-boot/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java
 delete mode 100644 platforms/spring-boot/components-starter/camel-properties-starter/pom.xml
 delete mode 100644 platforms/spring-boot/components-starter/camel-properties-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java
 delete mode 100644 platforms/spring-boot/components-starter/camel-properties-starter/src/main/resources/META-INF/LICENSE.txt
 delete mode 100644 platforms/spring-boot/components-starter/camel-properties-starter/src/main/resources/META-INF/NOTICE.txt
 delete mode 100644 platforms/spring-boot/components-starter/camel-properties-starter/src/main/resources/META-INF/spring.factories
 delete mode 100644 platforms/spring-boot/components-starter/camel-properties-starter/src/main/resources/META-INF/spring.provides


[camel] 01/01: CAMEL-13965: Added a JUnit 5 version of camel-example-spring-boot tests (testing coexistence of JUnit 4 and JUnit 5)

Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aldettinger pushed a commit to branch CAMEL-13965
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 3969ac84f24d3371aa85d9e6a0495f750f46633d
Author: aldettinger <al...@gmail.com>
AuthorDate: Thu Sep 26 15:06:16 2019 +0200

    CAMEL-13965: Added a JUnit 5 version of camel-example-spring-boot tests (testing coexistence of JUnit 4 and JUnit 5)
---
 examples/camel-example-spring-boot/pom.xml         | 11 ++++-
 .../sample/camel/FooApplicationJUnit5Test.java     | 52 ++++++++++++++++++++++
 .../sample/camel/MyCamelApplicationJUnit5Test.java | 48 ++++++++++++++++++++
 parent/pom.xml                                     | 16 ++-----
 4 files changed, 114 insertions(+), 13 deletions(-)

diff --git a/examples/camel-example-spring-boot/pom.xml b/examples/camel-example-spring-boot/pom.xml
index 2f2e789..9925258 100644
--- a/examples/camel-example-spring-boot/pom.xml
+++ b/examples/camel-example-spring-boot/pom.xml
@@ -104,7 +104,16 @@
             <artifactId>camel-test-spring</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-spring-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/examples/camel-example-spring-boot/src/test/java/sample/camel/FooApplicationJUnit5Test.java b/examples/camel-example-spring-boot/src/test/java/sample/camel/FooApplicationJUnit5Test.java
new file mode 100644
index 0000000..5e88f59
--- /dev/null
+++ b/examples/camel-example-spring-boot/src/test/java/sample/camel/FooApplicationJUnit5Test.java
@@ -0,0 +1,52 @@
+/*
+ * 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 sample.camel;
+
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.NotifyBuilder;
+import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
+import org.apache.camel.test.spring.junit5.EnableRouteCoverage;
+import org.apache.camel.test.spring.junit5.MockEndpoints;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import static org.junit.Assert.assertTrue;
+
+@CamelSpringBootTest
+@SpringBootTest(classes = MyCamelApplication.class,
+    properties = "greeting = Hello foo")
+@EnableRouteCoverage
+@MockEndpoints("log:foo") // mock the log:foo endpoint => mock:log:foo which we then use in the testing
+//@Ignore // enable me to run this test as well so we can cover testing the route completely
+public class FooApplicationJUnit5Test {
+
+    @Autowired
+    private CamelContext camelContext;
+
+    @Test
+    public void shouldSayFoo() throws Exception {
+        // we expect that one or more messages is automatic done by the Camel
+        // route as it uses a timer to trigger
+        NotifyBuilder notify = new NotifyBuilder(camelContext).whenDone(1).create();
+
+        assertTrue(notify.matches(10, TimeUnit.SECONDS));
+    }
+
+}
diff --git a/examples/camel-example-spring-boot/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java b/examples/camel-example-spring-boot/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java
new file mode 100644
index 0000000..b990532
--- /dev/null
+++ b/examples/camel-example-spring-boot/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java
@@ -0,0 +1,48 @@
+/*
+ * 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 sample.camel;
+
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.NotifyBuilder;
+import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
+import org.apache.camel.test.spring.junit5.EnableRouteCoverage;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import static org.junit.Assert.assertTrue;
+
+@CamelSpringBootTest
+@SpringBootTest(classes = MyCamelApplication.class)
+@EnableRouteCoverage
+public class MyCamelApplicationJUnit5Test {
+
+    @Autowired
+    private CamelContext camelContext;
+
+    @Test
+    public void shouldProduceMessages() throws Exception {
+        // we expect that one or more messages is automatic done by the Camel
+        // route as it uses a timer to trigger
+        NotifyBuilder notify = new NotifyBuilder(camelContext).whenDone(1).create();
+
+        assertTrue(notify.matches(10, TimeUnit.SECONDS));
+    }
+
+}
diff --git a/parent/pom.xml b/parent/pom.xml
index e4cf7ec..be46bc3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4820,19 +4820,11 @@
                 <version>${junit-version}</version>
             </dependency>
             <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-api</artifactId>
-                <version>${junit-jupiter-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-engine</artifactId>
-                <version>${junit-jupiter-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.junit.vintage</groupId>
-                <artifactId>junit-vintage-engine</artifactId>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
                 <version>${junit-jupiter-version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>com.google.truth</groupId>