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.


 discard ae2dff6  CAMEL-14084: Migrated remaining camel-consul tests to JUnit 5
 discard fbeb9ca  CAMEL-14084: Migrated camel-consul tests to 
camel-testcontainers-spring-junit5
     add 2997b61  fix parentheses
     add 0ff3f67  Merge pull request #3282 from jericbryledy/patch-1
     add f8db809  Regen
     add 870ad10  Fix camel-box upload "check" parameter, as not required 
(#3281)
     add 87791aa  tiny cleanups: - remove unused import statements - make use 
of type inference for generic instance creation - remove obsolete 'public', 
'static' and 'final' modifiers in interfaces - change field/method accesses to 
it's owning supertype - remove obsolete type castings - remove obsolete 
semicolons
     add 7441de9  Upgrade Hamcrest to version 2.2
     add ce90ba4  Upgrade AssertJ to version 3.14.0
     add 90b4f37  Upgrade Mockito to version 3.1.0
     add fdacc1d  Polished
     add 773e275  polish test
     add c88290f  CAMEL-14098 Camel-netty-http: update the test to check the 
channel is active
     add a53d891  Upgrade Box Java SDK to version 2.41.0
     add 2ba8bfa  CAMEL-14075: Upgrade to Spring Boot 2.2.0. Work in progress.
     add feca251  CAMEL-14075: Upgrade to Spring Boot 2.2.0. Isolte fix to 
camel-spring and camel-spring-boot
     add 6cc53d7  Undertow does not shut down properly in webhook route policy
     new 89c47fa  CAMEL-14084: Migrated camel-consul tests to 
camel-testcontainers-spring-junit5
     new a918c3b  CAMEL-14084: Migrated remaining camel-consul tests to 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   (ae2dff6)
            \
             N -- N -- N   refs/heads/CAMEL-13965 (a918c3b)

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 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../java/org/apache/camel/maven/GenerateMojo.java  |   1 -
 .../apache/camel/parser/RouteBuilderParser.java    |   2 -
 .../apache/camel/parser/xml/XmlRestDslTest.java    |   4 -
 .../component/activemq/ActiveMQComponent.java      |   4 +-
 .../ActiveMQReplyToHeaderUsingConverterTest.java   |   2 +-
 .../activemq/AutoExposeQueuesInCamelTest.java      |   2 +-
 ...nvokeRequestReplyUsingJmsReplyToHeaderTest.java |   4 +-
 .../any23/Any23DataFormatConfigurationsTest.java   |   2 +-
 .../any23/Any23DataFormatExtractorsTest.java       |   4 +-
 .../apache/camel/component/as2/api/AS2Charset.java |   4 +-
 .../camel/component/as2/api/AS2Constants.java      |  22 +-
 .../apache/camel/component/as2/api/AS2Header.java  |  46 ++--
 .../camel/component/as2/api/AS2MediaType.java      |  16 +-
 .../camel/component/as2/api/AS2MicAlgorithm.java   |   8 +-
 .../camel/component/as2/api/AS2MimeType.java       |  18 +-
 .../camel/component/as2/api/AS2ReportType.java     |   2 +-
 .../component/as2/api/AS2SignatureAlgorithm.java   |  36 +--
 .../component/as2/api/AS2TransferEncoding.java     |   6 +-
 .../apache/camel/component/as2/api/MDNField.java   |  18 +-
 .../as2/AS2ClientManagerIntegrationTest.java       |   2 +-
 .../as2/AS2ServerManagerIntegrationTest.java       |   1 -
 .../camel/component/atmos/AtmosEndpoint.java       |   1 -
 .../atomix/client/map/AtomixMapConsumer.java       |   2 -
 .../client/messaging/AtomixMessagingConsumer.java  |   2 -
 .../atomix/client/queue/AtomixQueueConsumer.java   |   2 -
 .../atomix/client/set/AtomixSetConsumer.java       |   2 -
 .../atomix/client/value/AtomixValueConsumer.java   |   2 -
 .../atomix/cluster/AtomixClusterService.java       |   1 -
 .../camel/avro/generated/KeyValueProtocol.java     |   4 +-
 .../camel/component/aws/ec2/EC2Configuration.java  |   1 -
 .../camel/component/aws/ec2/EC2Producer.java       |   1 -
 .../component/aws/ecs/AmazonECSClientMock.java     |   2 +-
 .../component/aws/eks/AmazonEKSClientMock.java     |   2 +-
 .../component/aws/iam/AmazonIAMClientMock.java     |   2 +-
 .../KinesisComponentIntegrationTest.java           |   2 -
 .../aws/lambda/AmazonLambdaClientMock.java         |   2 +-
 .../aws/lambda/LambdaComponentSpringTest.java      |   4 +-
 .../component/aws/lambda/LambdaProducerTest.java   |   4 +-
 .../component/aws/msk/AmazonMSKClientMock.java     |   2 +-
 .../aws/s3/S3ComponentConfigurationTest.java       |   1 -
 .../component/aws/sqs/AmazonSQSClientMock.java     |   8 +-
 .../camel/component/aws/swf/SWFConfiguration.java  |   1 -
 .../azure/queue/QueueServiceComponent.java         |   2 -
 .../BlueprintContainerBeanRepository.java          |   1 -
 .../camel/component/box/api/BoxFilesManager.java   |   4 +-
 .../camel/component/box/api/BoxSearchManager.java  |   3 -
 components/camel-box/camel-box-component/pom.xml   |   1 +
 .../box/BoxEventsManagerIntegrationTest.java       |   1 -
 .../braintree/DisputeGatewayIntegrationTest.java   |  12 +-
 .../NamedCassandraIdempotentRepository.java        |   2 +-
 .../component/cbor/CBORObjectListSplitTest.java    |   2 +-
 .../camel/cdi/bean/FirstCamelContextBean.java      |   1 -
 ...CometdProducerConsumerInOutInteractiveMain.java |   1 -
 ...oducerConsumerInteractiveAuthenticatedMain.java |   1 -
 ...tdProducerConsumerInteractiveExtensionMain.java |   1 -
 .../CometdProducerConsumerInteractiveMain.java     |   1 -
 .../camel/component/corda/CordaProducer.java       |  10 +-
 .../corda/CordaConsumerNetworkMapFeedTest.java     |   1 -
 .../CordaConsumerStartTrackedFlowDynamicTest.java  |   1 -
 .../corda/CordaConsumerStateMachineFeedTest.java   |   1 -
 .../corda/CordaConsumerTransactionMapFeedTest.java |   1 -
 .../CordaConsumerVaultTrackByCriteriaTest.java     |   1 -
 .../corda/CordaConsumerVaultTrackByTest.java       |   1 -
 ...ordaConsumerVaultTrackByWithPagingSpecTest.java |   1 -
 .../CordaConsumerVaultTrackByWithSortingTest.java  |   1 -
 .../cms/common/DefaultCryptoCmsConfiguration.java  |   1 -
 .../crypto/DigitalSignatureConfiguration.java      |   5 -
 .../camel/component/cxf/DefaultCxfBinding.java     |   2 +-
 .../cxf/jaxrs/CxfRsBlueprintEndpoint.java          |   2 +-
 .../cxf/CxfConsumerClientDisconnectedTest.java     |   2 +-
 .../cxf/CxfConsumerContinuationTimeoutTest.java    |   2 -
 .../component/cxf/CxfProducerContextTest.java      |   1 -
 .../jaxrs/CxfRsConsumerClientDisconnectedTest.java |   2 +-
 .../cxf/jaxrs/CxfRsConsumerWithBeanTest.java       |   2 +-
 .../cxf/jaxrs/CxfRsConvertBodyToTest.java          |   2 +-
 .../component/cxf/jaxrs/CxfRsProducerTest.java     |   2 +-
 .../component/cxf/jaxrs/CxfRsStreamCacheTest.java  |   2 +-
 .../component/cxf/mtom/CxfMtomConsumerTest.java    |   1 -
 .../camel/component/cxf/wsdl/OrderEndpoint.java    |   2 +-
 .../component/dataformat/DataFormatComponent.java  |   1 -
 .../component/debezium/DebeziumEndpointTest.java   |   2 +-
 .../debezium/DebeziumTypeConverterTest.java        |   8 +-
 ...ConnectorEmbeddedDebeziumConfigurationTest.java |   3 +-
 .../camel/maven/config/ConnectorConfigField.java   |   2 -
 .../maven/config/ConnectorConfigGeneratorTest.java |   6 +-
 .../camel/component/directvm/DirectVmEndpoint.java |   1 -
 .../docker/consumer/DockerEventsConsumer.java      |   2 -
 .../component/docker/producer/DockerProducer.java  |   1 -
 .../component/dropbox/core/DropboxAPIFacade.java   |   1 -
 .../camel/component/ehcache/EhcacheManager.java    |   4 +-
 .../elsql/ElsqlSqlPrepareStatementStrategy.java    |   2 -
 .../FacebookComponentPageIdProducerTest.java       |   2 -
 .../data/FacebookMethodsTypeHelperTest.java        |   2 -
 .../camel/component/fhir/api/FhirHistory.java      |   1 -
 .../apache/camel/component/fhir/api/FhirMeta.java  |   2 -
 .../apache/camel/component/fhir/api/FhirPatch.java |   1 -
 .../camel/component/fhir/api/FhirSearch.java       |   1 -
 .../camel/component/fhir/FhirLoadPageIT.java       |  12 +-
 .../camel/component/fhir/FhirOperationIT.java      |   8 +-
 .../spring/FhirDataformatConfigSpringTest.java     |   4 -
 .../FhirXmlDataformatErrorHandlerSpringTest.java   |   2 -
 .../camel/component/file/GenericFileConverter.java |   6 -
 .../camel/component/file/remote/FtpsEndpoint.java  |   2 +-
 .../SftpChangedExclusiveReadLockStrategy.java      |   1 -
 .../remote/sftp/SftpKeyPairDSAConsumeTest.java     |   6 -
 .../component/geocoder/GeoCoderProxyTest.java      |   1 -
 .../CalendarCalendarListIntegrationTest.java       |   2 -
 .../calendar/CalendarCalendarsIntegrationTest.java |   2 -
 .../google/mail/GoogleMailConfiguration.java       |   4 -
 .../pubsub/GooglePubsubConnectionFactory.java      |   2 +-
 .../camel/component/grape/GrapeEndpoint.java       |   2 +-
 .../camel/component/grape/GrapeProducer.java       |   2 +-
 .../grpc/auth/jwt/JwtCallCredentials.java          |   2 -
 .../hazelcast/HazelcastDefaultEndpoint.java        |   3 -
 .../org/apache/camel/http/common/HttpHelper.java   |   1 -
 .../ignite/compute/IgniteComputeProducer.java      |   2 +-
 .../camel/component/ignite/IgniteEventsTest.java   |   1 -
 .../component/irc/it/IrcMultiChannelRouteTest.java |   1 -
 .../camel/component/irc/it/IrcOnReplyTest.java     |   1 -
 .../camel/component/irc/it/IrcPrivmsgTest.java     |   3 -
 .../camel/component/irc/it/IrcRouteTest.java       |   3 -
 .../camel/component/irc/it/IrcsListUsersTest.java  |   9 -
 .../camel/converter/jaxb/JaxbDataFormat.java       |   2 -
 .../org/apache/camel/example/JAXBConvertTest.java  |   4 -
 .../CamelWorkItemHandlerIntegrationTests.java      |   2 +-
 .../jcache/policy/JCachePolicyTestBase.java        |   1 -
 .../jcache/policy/SpringJCachePolicyTest.java      |   2 -
 .../jcr/JcrRouteDifferentWorkspaceTestSupport.java |   1 -
 .../camel/component/jdbc/JdbcColumnTypeTest.java   |   4 -
 .../camel/component/jetty9/JettyHttpEndpoint9.java |   1 -
 .../apache/camel/component/jetty/HandlerTest.java  |   2 +-
 .../jetty/HttpBridgeMultipartRouteTest.java        |   1 -
 .../component/jetty/HttpStreamCacheFileTest.java   |   1 -
 .../component/jetty/JettyMuteExceptionTest.java    |   1 -
 .../jira/producer/WatcherProducerTest.java         |   2 +-
 .../component/jms/reply/QueueReplyManager.java     |   2 +-
 .../component/jms/reply/ReplyManagerSupport.java   |   1 -
 .../reply/SharedQueueMessageListenerContainer.java |   2 -
 .../component/jms/JmsRouteRequestReplyTest.java    |  13 +-
 .../jpa/JpaWithNamedQueryAndParametersTest.java    |   1 -
 .../camel/component/kafka/KafkaProducer.java       |   1 -
 .../component/kafka/KafkaConsumerFullTest.java     |   1 -
 .../camel/component/kafka/embedded/TestUtils.java  |   2 -
 .../config_maps/KubernetesConfigMapsEndpoint.java  |   2 -
 .../deployments/KubernetesDeploymentsConsumer.java |   1 -
 .../deployments/KubernetesDeploymentsEndpoint.java |   2 -
 .../deployments/KubernetesDeploymentsProducer.java |   1 -
 .../kubernetes/hpa/KubernetesHPAEndpoint.java      |   2 -
 .../kubernetes/job/KubernetesJobEndpoint.java      |   2 -
 .../namespaces/KubernetesNamespacesEndpoint.java   |   2 -
 .../kubernetes/nodes/KubernetesNodesEndpoint.java  |   2 -
 .../kubernetes/nodes/KubernetesNodesProducer.java  |   3 -
 .../KubernetesPersistentVolumesEndpoint.java       |   2 -
 .../KubernetesPersistentVolumesClaimsEndpoint.java |   2 -
 .../kubernetes/pods/KubernetesPodsEndpoint.java    |   2 -
 .../KubernetesReplicationControllersEndpoint.java  |   2 -
 .../KubernetesResourcesQuotaEndpoint.java          |   2 -
 .../secrets/KubernetesSecretsEndpoint.java         |   2 -
 .../KubernetesServiceAccountsEndpoint.java         |   2 -
 .../services/KubernetesServicesEndpoint.java       |   2 -
 .../OpenshiftBuildConfigsEndpoint.java             |   2 -
 .../openshift/builds/OpenshiftBuildsEndpoint.java  |   2 -
 .../producer/KubernetesNodesProducerTest.java      |   2 -
 .../OpenshiftBuildConfigsProducerTest.java         |   6 -
 .../linkedin/api/LinkedInOAuthRequestFilter.java   |   2 +-
 .../camel/component/linkedin/LinkedInEndpoint.java |   2 -
 .../apache/camel/component/log/LogComponent.java   |   1 -
 .../mail/MailAttachmentDuplicateNamesTest.java     |   1 -
 .../mail/MailAttachmentRedeliveryTest.java         |   1 -
 .../camel/component/mail/MailAttachmentTest.java   |   1 -
 .../mail/MailAttachmentsUmlautIssueTest.java       |   1 -
 .../camel/component/mail/MailComponentTest.java    |   1 -
 .../mail/MailContentTypeResolverTest.java          |   1 -
 .../component/mail/MailHtmlAttachmentTest.java     |   1 -
 .../mail/MimeMultipartAlternativeTest.java         |   1 -
 ...MultipartAlternativeWithLongerFilenameTest.java |   1 -
 .../mail/SpringMailSplitAttachmentsTest.java       |   1 -
 .../component/metrics/MetricsComponentTest.java    |   1 -
 .../milo/client/MiloClientConfiguration.java       |   2 -
 .../apache/camel/component/mock/MockEndpoint.java  |   4 +-
 .../camel/component/mongodb/MongoDbEndpoint.java   |   1 -
 .../mongodb/MongoDbConnectionBeansTest.java        |   7 -
 .../src/main/docs/mustache-component.adoc          |   2 +-
 .../netty/http/NettyHttpMuteExceptionTest.java     |   1 -
 .../netty/http/NettyHttpPostDataTest.java          |   5 +-
 .../ClientModeTCPNettyServerBootstrapFactory.java  |   2 +-
 .../apache/camel/component/nsq/NsqTestSupport.java |   2 +-
 .../olingo2/Olingo2ComponentConsumerTest.java      |  12 +-
 .../olingo4/Olingo4ComponentConsumerTest.java      |  18 +-
 .../openstack/common/OpenstackException.java       |   2 -
 .../openstack/cinder/VolumeProducerTest.java       |   2 -
 .../cinder/VolumeSnapshotProducerTest.java         |   1 -
 .../openstack/keystone/DomainProducerTest.java     |   1 -
 .../openstack/keystone/GroupProducerTest.java      |   1 -
 .../openstack/keystone/ProjectProducerTest.java    |   1 -
 .../openstack/keystone/RegionProducerTest.java     |   1 -
 .../openstack/keystone/UserProducerTest.java       |   1 -
 .../openstack/neutron/NetworkProducerTest.java     |   1 -
 .../openstack/neutron/PortProducerTest.java        |   1 -
 .../openstack/neutron/RouterProducerTest.java      |   1 -
 .../openstack/neutron/SubnetProducerTest.java      |   1 -
 .../openstack/nova/FlavorProducerTest.java         |   1 -
 .../openstack/nova/ServerProducerTest.java         |   1 -
 .../openstack/swift/ContainerProducerTest.java     |   2 -
 .../openstack/swift/ObjectProducerTest.java        |   1 -
 .../CamelMessagingHeadersExtractAdapterTest.java   |   2 +-
 .../CamelMessagingHeadersInjectAdapterTest.java    |   2 +-
 .../camel/component/paho/PahoConfiguration.java    |   1 -
 .../ProtobufMarshalAndUnmarshalJsonTest.java       |   1 -
 .../camel/component/pubnub/PubNubProducer.java     |   4 +-
 .../component/pulsar/PulsarComponentTest.java      |   4 +-
 .../quartz/ScheduledRoutePolicyConstants.java      |   2 +-
 .../quickfixj/examples/trading/TradeExecutor.java  |   2 +-
 .../rabbitmq/RabbitMQMessageConverter.java         |   2 -
 .../rabbitmq/RabbitMQProducerIntTest.java          |  10 +-
 .../streams/util/UnwrapStreamProcessor.java        |   1 -
 .../camel/component/rest/RestApiEndpoint.java      |   1 -
 .../robotframework/RobotFrameworkArguments.java    |   4 +-
 .../RobotFrameworkCamelConstants.java              |   6 +-
 .../salesforce/api/dto/AbstractDTOBase.java        |   1 -
 .../salesforce/api/dto/approval/Approvals.java     |   2 +-
 .../salesforce/api/dto/composite/SObjectNode.java  |   1 -
 .../internal/processor/JsonRestProcessor.java      |   1 -
 .../ChangeEventsConsumerIntegrationTest.java       |   6 +-
 .../api/dto/composite/SObjectBatchTest.java        |   2 -
 .../salesforce/dto/generated/Contact.java          |   1 -
 .../salesforce/dto/generated/Document.java         |   2 -
 .../salesforce/dto/generated/Line_Item__c.java     |   2 -
 .../salesforce/dto/generated/Merchandise__c.java   |   2 -
 .../salesforce/dto/generated/StringMSPTest.java    |   7 -
 .../camel/maven/CamelSalesforceMojoOutputTest.java |   1 -
 .../camel/component/xquery/XQueryEndpoint.java     |   1 -
 .../component/xslt/SaxonXsltFeatureRouteTest.java  |   2 -
 .../processor/SchematronProcessorFactory.java      |   1 -
 .../component/servlet/HttpClientRouteTest.java     |   1 -
 .../servlet/ServletMuteExceptionTest.java          |   2 -
 .../ServletSetExchangePropertyBeanTest.java        |   1 -
 .../sjms/batch/SjmsBatchConsumerTest.java          |   1 -
 .../camel/component/sjms2/Sjms2Endpoint.java       |   1 -
 .../camel/component/sjms2/Sjms2EndpointTest.java   |   1 -
 .../slack/SlackComponentVerifierExtension.java     |   4 +-
 .../camel/component/slack/SlackConsumer.java       |   4 +-
 .../apache/camel/component/solr/SolrFixtures.java  |   1 -
 .../camel-spark/src/main/docs/spark-component.adoc |   4 +-
 .../camel/spring/boot/CamelAutoConfiguration.java  |   4 +-
 .../boot/CamelSpringBootBeanPostProcessor.java}    |  23 +-
 .../CamelCloudServiceCallConfigurationTest.java    |   3 +-
 ...melCloudServiceCallGlobalConfigurationTest.java |   2 +
 .../CamelCloudServiceCallRefExpressionTest.java    |   2 +
 .../CamelCloudServiceCallSimpleExpressionTest.java |   2 +
 .../boot/cloud/CamelCloudServiceCallTest.java      |   2 +
 components/camel-spring-integration/pom.xml        |   4 +-
 ...CamelSpringDelegatingTestContextLoaderTest.java |   1 -
 .../RedisStringIdempotentRepository.java           |   1 -
 .../RedisStringIdempotentRepositoryTest.java       |   1 -
 .../spring/ws/SpringWebserviceComponent.java       |   1 -
 .../spring/ws/SpringWebserviceMessage.java         |   1 -
 .../spring/ws/testfilters/LocalMessageFilter.java  |   1 -
 .../camel/spring/CamelBeanPostProcessor.java       |  15 ++
 .../ConsumerTemplateMaximumCacheSizeTest.java      |   5 +-
 .../DefaultPackageResolverConfigureTest.java       |   4 -
 .../ErrorHandlerCamelContextRefNotFoundTest.java   |   1 -
 .../ErrorHandlerRouteContextRefNotFoundTest.java   |   1 -
 .../issues/SpringMainStartFailedIssueTest.java     |   1 -
 .../ManagedEndpointInjectRefEndpointTest.java      |   1 -
 .../spring/management/ManagedRefEndpointTest.java  |   1 -
 .../SpringCamelContextStartingFailedEventTest.java |   1 -
 ...gDeadLetterChannelInvalidDeadLetterUriTest.java |   1 -
 ...etterChannelInvalidOptionDeadLetterUriTest.java |   1 -
 ...ringDoubleLoadBalancerMisconfigurationTest.java |   1 -
 .../spring/processor/SpringFilterNoChildTest.java  |   1 -
 .../processor/SpringTryCatchMisconfiguredTest.java |   1 -
 ...ingTryCatchMustHaveExceptionConfiguredTest.java |   1 -
 .../scan/DefaultPackageScanClassResolverTest.java  |   9 +-
 .../sql/DefaultSqlProcessingStrategy.java          |   4 +-
 .../template/generated/SSPTParserTokenManager.java |   3 -
 .../sql/stored/ProducerBatchInvalidTest.java       |   1 -
 .../apache/camel/component/stub/StubEndpoint.java  |   1 -
 .../component/telegram/TelegramComponent.java      |   1 -
 .../telegram/TelegramConsumerMappingTest.java      |   1 -
 .../converter/FooConverterRegression.java          |   1 -
 .../management/ManagedRefEndpointTest.java         |   1 -
 .../junit5/CamelSpringTestContextLoader.java       |   1 -
 .../test/spring/CamelSpringTestContextLoader.java  |   1 -
 .../camel/test/spring/CamelSpringTestSupport.java  |   1 -
 .../test/spring/RouteCoverageEventNotifier.java    |   1 -
 .../org/apache/camel/test/junit4/TestSupport.java  |   3 -
 .../component/thrift/generated/Calculator.java     |  94 +++----
 .../thrift/generated/InvalidOperation.java         |   4 +-
 .../component/thrift/generated/Operation.java      |   5 -
 .../camel/component/thrift/generated/Work.java     |   4 +-
 .../dataformat/thrift/generated/Operation.java     |   5 -
 .../camel/dataformat/thrift/generated/Work.java    |   4 +-
 .../component/undertow/UndertowComponent.java      |  10 +-
 .../component/undertow/UndertowConstants.java      |   2 +-
 .../undertow/UndertowStreamingClientCallback.java  |   4 -
 .../component/undertow/MultiPartFormTest.java      |   1 -
 .../undertow/UndertowHttpStreamingTest.java        |   1 -
 .../undertow/UndertowNoAutoStartupTest.java}       |  32 +--
 .../integration/Web3jProducerGanacheTest.java      |   1 -
 .../camel/websocket/jsr356/JSR356Consumer.java     |   2 +-
 .../component/websocket/WebsocketConstants.java    |   2 +-
 .../camel/component/xj/JsonXmlStreamReader.java    |  59 +++--
 .../camel/component/xj/XmlJsonStreamWriter.java    |  19 +-
 .../xmlsecurity/XMLSecurityDataFormat.java         |   2 +-
 .../xmlsecurity/XMLSecurityDataFormatTest.java     |   2 -
 .../dataformat/zipfile/ZipFileDataFormat.java      |   4 -
 .../camel/zipkin/ZipkinMDCScopeDecoratorTest.java  |   1 -
 .../component/zookeepermaster/group/GroupTest.java |   1 -
 .../group/internal/ZooKeeperGroupTest.java         |   1 -
 .../component/zookeeper/NaturalSortComparator.java |   2 +-
 .../main/java/org/apache/camel/BindToRegistry.java |   5 +
 .../src/main/java/org/apache/camel/Channel.java    |   3 -
 .../org/apache/camel/ExtendedCamelContext.java     |  15 ++
 .../apache/camel/spi/PackageScanClassResolver.java |  16 +-
 .../camel/spi/PackageScanResourceResolver.java     |  67 +++++
 .../camel/support/service/ServiceHelper.java       |   1 -
 .../apache/camel/converter/ObjectConverter.java    |   4 +-
 .../TypeConvertersPackageScanClassResolver.java    |  10 +
 .../camel/impl/engine/AbstractCamelContext.java    |  23 +-
 .../camel/impl/engine/BasePackageScanResolver.java | 124 +++++++++
 .../impl/engine/DefaultCamelBeanPostProcessor.java |  21 +-
 .../engine/DefaultPackageScanClassResolver.java    |  94 +------
 .../engine/DefaultPackageScanResourceResolver.java | 277 +++++++++++++++++++++
 .../camel/impl/engine/DefaultProducerCache.java    |   1 -
 .../camel/processor/CamelInternalProcessor.java    |   2 +-
 .../camel/impl/AbstractModelCamelContext.java      |   1 -
 .../org/apache/camel/impl/DefaultCamelContext.java |   7 +
 .../apache/camel/model/RouteDefinitionHelper.java  |   2 +-
 .../camel/model/dataformat/Any23DataFormat.java    |   2 +-
 .../apache/camel/reifier/InterceptFromReifier.java |   2 +-
 .../org/apache/camel/reifier/ProcessorReifier.java |   5 +-
 .../errorhandler/DeadLetterChannelReifier.java     |   2 +-
 .../camel/core/osgi/OsgiFactoryFinderTest.java     |   1 -
 .../osgi/OsgiPackageScanClassResolverTest.java     |   8 +-
 .../test/java/org/apache/camel/TestSupport.java    |   3 +-
 .../camel/builder/xml/XPathFunctionsTest.java      |   1 -
 .../bean/BeanCreateBodyExceptionTest.java          |   1 -
 .../file/FilerProducerDoneFileNameTest.java        |   1 -
 .../issues/PropertiesAvailableEverywhereTest.java  |   1 -
 .../TransactedPropertyPlaceholderIssueTest.java    |   1 -
 .../camel/processor/RouteAutoStartupTest.java      |   1 -
 .../camel/processor/ThrottlingGroupingTest.java    |   8 +-
 .../InterceptFromPropertyPlaceholderTest.java      |   1 -
 ...mlChoiceFilterRoutePropertyPlaceholderTest.java |   1 -
 .../camel/util/DumpModelAsXmlPlaceholdersTest.java |   1 -
 .../org/apache/camel/model/scan-route.xml          |  29 +++
 core/camel-main/pom.xml                            |   6 +
 .../camel/main/DefaultConfigurationProperties.java |  12 +
 .../apache/camel/main/DefaultRoutesCollector.java  |  27 +-
 .../camel-main-configuration-metadata.json         |   4 +-
 .../org/apache/camel/main/xml/MainXmlTest.java     |  68 +++++
 .../org/apache/camel/main/xml/camel-dummy.xml      |  25 ++
 .../org/apache/camel/main/xml/camel-scan.xml       |  25 ++
 .../DefaultManagementObjectStrategy.java           |   6 +-
 .../management/JmxManagementStrategyFactory.java   |   2 -
 .../camel/management/mbean/ManagedTracer.java      |   5 -
 .../camel/management/ManagedComponentTest.java     |   3 -
 .../camel/management/ManagementTestSupport.java    |   1 -
 .../camel/support/ScheduledPollConsumer.java       |   1 -
 .../apache/camel/support/SimpleTypeConverter.java  |   2 +-
 .../builder/TokenXMLExpressionIterator.java        |   1 -
 .../java/org/apache/camel/util/AntPathMatcher.java |  23 ++
 .../org/apache/camel/util/OrderedProperties.java   |   2 +-
 .../org/apache/camel/util/AntPathMatcherTest.java  |  12 +
 .../modules/ROOT/pages/mustache-component.adoc     |   2 +-
 .../modules/ROOT/pages/spark-component.adoc        |   4 +-
 ...CamelSpringDelegatingTestContextLoaderTest.java |   1 -
 .../camel/example/billboard/BillboardAggrTest.java |   2 +-
 .../debezium/DebeziumMySqlConsumerToKinesis.java   |   1 -
 .../debezium/KinesisProducerToCassandra.java       |   1 -
 .../org/apache/camel/example/MyConfiguration.java  |   7 -
 examples/camel-example-main-xml/pom.xml            | 102 ++++++++
 examples/camel-example-main-xml/readme.adoc        |  34 +++
 .../src/main/data/foo.properties                   |   0
 .../org/apache/camel/example/MyApplication.java    |  33 +--
 .../main/java/org/apache/camel/example/MyBean.java |   0
 .../org/apache/camel/example/MyConfiguration.java  |   0
 .../org/apache/camel/example/MyRouteBuilder.java   |   0
 .../META-INF/spring-configuration-metadata.json    |   0
 .../src/main/resources/application.properties      |   0
 .../src/main/resources/logback.xml                 |   0
 .../src/main/resources/routes/my-route.xml         |  28 +++
 .../example/spring/boot/metrics/Application.java   |   1 -
 .../apache/camel/example/client/CamelClient.java   |   1 -
 .../example/telegram/usage/GetUpdatesUsage.java    |   3 -
 .../example/telegram/usage/SendVenueUsage.java     |   3 -
 examples/pom.xml                                   |   1 +
 parent/pom.xml                                     |  30 +--
 .../commands/AbstractLocalCamelController.java     |   4 +-
 .../apache/camel/commands/RouteStepCommand.java    |   1 -
 .../karaf/features/src/main/resources/features.xml |   1 +
 .../pom.xml                                        |   2 +
 .../camel-spring-boot-dependencies/pom.xml         |  10 -
 platforms/spring-boot/spring-boot-dm/pom.xml       |  12 +-
 .../camel/itest/springboot/CamelCordaTest.java     |   4 +
 .../itest/springboot/CamelWebsocketJsr356Test.java |   1 -
 .../camel/itest/issues/JettyHttpFileCacheTest.java |   1 -
 .../apache/camel/itest/jms/JmsIntegrationTest.java |   2 -
 .../apt/ComponentPropertyConfigurerGenerator.java  |   1 -
 .../apt/CoreEipAnnotationProcessorHelper.java      |   1 -
 .../maven/AbstractApiMethodGeneratorMojo.java      |   1 -
 .../camel/maven/FileApiMethodGeneratorMojo.java    |   1 -
 .../camel/maven/JavadocApiMethodGeneratorMojo.java |   1 -
 .../camel/maven/packaging/generics/ClassUtil.java  |   2 +-
 .../maven/packaging/generics/GenericsUtil.java     |   6 +-
 .../maven/packaging/model/StringHelperTest.java    |   2 +-
 407 files changed, 1429 insertions(+), 952 deletions(-)
 copy 
components/{camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/converter/FooConverterRegression.java
 => 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootBeanPostProcessor.java}
 (61%)
 copy 
components/{camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/converter/FooConverterRegression.java
 => 
camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowNoAutoStartupTest.java}
 (59%)
 create mode 100644 
core/camel-api/src/main/java/org/apache/camel/spi/PackageScanResourceResolver.java
 create mode 100644 
core/camel-base/src/main/java/org/apache/camel/impl/engine/BasePackageScanResolver.java
 create mode 100644 
core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java
 create mode 100644 
core/camel-core/src/test/resources/org/apache/camel/model/scan-route.xml
 create mode 100644 
core/camel-main/src/test/java/org/apache/camel/main/xml/MainXmlTest.java
 create mode 100644 
core/camel-main/src/test/resources/org/apache/camel/main/xml/camel-dummy.xml
 create mode 100644 
core/camel-main/src/test/resources/org/apache/camel/main/xml/camel-scan.xml
 create mode 100644 examples/camel-example-main-xml/pom.xml
 create mode 100644 examples/camel-example-main-xml/readme.adoc
 copy examples/{camel-example-main => 
camel-example-main-xml}/src/main/data/foo.properties (100%)
 copy 
components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/converter/FooConverterRegression.java
 => 
examples/camel-example-main-xml/src/main/java/org/apache/camel/example/MyApplication.java
 (52%)
 copy examples/{camel-example-main => 
camel-example-main-xml}/src/main/java/org/apache/camel/example/MyBean.java 
(100%)
 copy examples/{camel-example-main => 
camel-example-main-xml}/src/main/java/org/apache/camel/example/MyConfiguration.java
 (100%)
 copy examples/{camel-example-main => 
camel-example-main-xml}/src/main/java/org/apache/camel/example/MyRouteBuilder.java
 (100%)
 copy examples/{camel-example-main => 
camel-example-main-xml}/src/main/resources/META-INF/spring-configuration-metadata.json
 (100%)
 copy examples/{camel-example-main => 
camel-example-main-xml}/src/main/resources/application.properties (100%)
 copy examples/{camel-example-main => 
camel-example-main-xml}/src/main/resources/logback.xml (100%)
 create mode 100644 
examples/camel-example-main-xml/src/main/resources/routes/my-route.xml

Reply via email to