This is an automated email from the ASF dual-hosted git repository. janbednar pushed a change to branch CAMEL-13853 in repository https://gitbox.apache.org/repos/asf/camel.git.
discard 4d12fdc Merge branch 'master' of https://github.com/apache/camel into CAMEL-13853 discard 43b594c CAMEL-13853: fix tests discard 7c7efa0 CAMEL-13853: fix tests discard 091c4b4 CAMEL-13853: fix tests discard cda1d1a Merge branch 'master' of https://github.com/apache/camel into CAMEL-13853 discard 65e2582 CAMEL-13853: AvailablePortFinder now delegates the port selection to OS discard 4672cd8 CAMEL-13853: AvailablePortFinder now delegates the port selection to OS discard d6193ce CAMEL-13853: AvailablePortFinder now delegates the port selection to OS discard 677a128 Merge branch 'master' of https://github.com/apache/camel into CAMEL-13853 discard c7f36cd CAMEL-13853: Fixed AvailablePortFinder for WSL add 5ba4736 cleanups for camel-hdfs2 to camel-hdfs component renaming add 4fca029 cleanups for camel-quartz2 to camel-quartz component renaming new 6796109 CAMEL-13853: AvailablePortFinder now delegates the port selection to OS 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 (4d12fdc) \ N -- N -- N refs/heads/CAMEL-13853 (6796109) 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: .../file/remote/sftp/SftpECKeyFileConsumeTest.java | 2 +- .../remote/sftp/SftpFromSedaDeleteFileTest.java | 2 +- .../file/remote/sftp/SftpKeyFileConsumeTest.java | 2 +- .../remote/sftp/SftpKeyPairDSAConsumeTest.java | 10 +-- .../file/remote/sftp/SftpKeyUriConsumeTest.java | 2 +- .../file/remote/sftp/SftpServerTestSupport.java | 14 ++-- .../camel-ftp/src/test/resources/known_hosts | 3 +- components/camel-hdfs/pom.xml | 2 +- .../camel-hdfs/src/main/docs/hdfs-component.adoc | 4 +- .../component/{hdfs2 => hdfs}/HdfsComponent.java | 2 +- .../{hdfs2 => hdfs}/HdfsCompressionCodec.java | 4 +- .../{hdfs2 => hdfs}/HdfsConfiguration.java | 2 +- .../component/{hdfs2 => hdfs}/HdfsConstants.java | 2 +- .../component/{hdfs2 => hdfs}/HdfsConsumer.java | 4 +- .../component/{hdfs2 => hdfs}/HdfsEndpoint.java | 2 +- .../{hdfs2 => hdfs}/HdfsFileSystemType.java | 2 +- .../component/{hdfs2 => hdfs}/HdfsFileType.java | 10 +-- .../component/{hdfs2 => hdfs}/HdfsHeader.java | 2 +- .../camel/component/{hdfs2 => hdfs}/HdfsInfo.java | 2 +- .../component/{hdfs2 => hdfs}/HdfsInfoFactory.java | 2 +- .../component/{hdfs2 => hdfs}/HdfsInputStream.java | 4 +- .../component/{hdfs2 => hdfs}/HdfsOsgiHelper.java | 2 +- .../{hdfs2 => hdfs}/HdfsOutputStream.java | 2 +- .../component/{hdfs2 => hdfs}/HdfsProducer.java | 2 +- .../{hdfs2 => hdfs}/HdfsWritableFactories.java | 2 +- .../camel/component/{hdfs2 => hdfs}/Holder.java | 6 +- .../component/{hdfs2 => hdfs}/WritableType.java | 2 +- .../{hdfs2 => hdfs}/osgi/HdfsActivator.java | 2 +- .../{hdfs2 => hdfs}/FromFileToHdfsTest.java | 2 +- .../{hdfs2 => hdfs}/HdfsConsumerTest.java | 4 +- .../{hdfs2 => hdfs}/HdfsProducerConsumerTest.java | 6 +- .../{hdfs2 => hdfs}/HdfsProducerSplitTest.java | 4 +- .../{hdfs2 => hdfs}/HdfsProducerTest.java | 2 +- .../component/{hdfs2 => hdfs}/HdfsTestSupport.java | 2 +- .../integration/HdfsAppendTest.java | 2 +- .../HdfsProducerConsumerIntegrationTest.java | 4 +- .../camel/component/mail/MailComponentTest.java | 2 +- .../camel/component/netty/http/BaseNettyTest.java | 1 - .../camel/component/netty/BaseNettyTest.java | 1 - components/camel-quartz/pom.xml | 2 +- .../src/main/docs/quartz-component.adoc | 8 +- .../component/{quartz2 => quartz}/CamelJob.java | 14 ++-- .../{quartz2 => quartz}/QuartzComponent.java | 3 +- .../{quartz2 => quartz}/QuartzConstants.java | 4 +- .../{quartz2 => quartz}/QuartzConsumer.java | 2 +- .../{quartz2 => quartz}/QuartzEndpoint.java | 18 ++--- .../{quartz2 => quartz}/QuartzHelper.java | 8 +- .../{quartz2 => quartz}/QuartzMessage.java | 2 +- .../{quartz2 => quartz}/StatefulCamelJob.java | 2 +- .../QuartzScheduledPollConsumerJob.java | 4 +- .../QuartzScheduledPollConsumerScheduler.java | 8 +- .../CronScheduledRoutePolicy.java | 12 +-- .../{quartz2 => quartz}/ScheduledJob.java | 6 +- .../{quartz2 => quartz}/ScheduledJobState.java | 2 +- .../{quartz2 => quartz}/ScheduledRouteDetails.java | 2 +- .../{quartz2 => quartz}/ScheduledRoutePolicy.java | 44 +++++------ .../ScheduledRoutePolicyConstants.java | 6 +- .../SimpleScheduledRoutePolicy.java | 18 ++--- .../{quartz2 => quartz}/BaseQuartzTest.java | 2 +- .../DelegateEndpointQuartzTest.java | 16 ++-- .../QuartUnderscoreTimerNameTest.java | 4 +- .../QuartzAddDynamicRouteTest.java | 4 +- ...uartzAddRoutesAfterCamelContextStartedTest.java | 2 +- .../{quartz2 => quartz}/QuartzAutoStartTest.java | 2 +- ...omponentCamelContextSchedulerIsolationTest.java | 2 +- ...tzComponentCamelContextSharedSchedulerTest.java | 12 +-- .../{quartz2 => quartz}/QuartzComponentTest.java | 2 +- .../QuartzCronRouteDurableJobTest.java | 4 +- .../{quartz2 => quartz}/QuartzCronRouteTest.java | 4 +- .../QuartzCronRouteWithSmallCacheTest.java | 4 +- .../QuartzCronTriggerRouteTest.java | 2 +- .../QuartzCustomCalendarFireTest.java | 2 +- .../QuartzCustomCalendarNoFireTest.java | 2 +- .../QuartzEndpointConfigureTest.java | 4 +- .../{quartz2 => quartz}/QuartzInterruptTest.java | 4 +- .../QuartzJobRouteUnderscoreTest.java | 4 +- .../{quartz2 => quartz}/QuartzManagementTest.java | 2 +- .../QuartzManuallyTriggerJobTest.java | 12 +-- .../QuartzNameCollisionTest.java | 2 +- .../QuartzOneCamelContextRestartTest.java | 2 +- .../QuartzOneCamelContextSuspendResumeTest.java | 2 +- .../{quartz2 => quartz}/QuartzPropertiesTest.java | 6 +- .../QuartzRepeatIntervalTest.java | 4 +- .../QuartzRouteFireNowOnlyOnceTest.java | 6 +- .../QuartzRouteFireNowTest.java | 6 +- .../QuartzRouteRestartTest.java | 10 +-- .../{quartz2 => quartz}/QuartzRouteTest.java | 4 +- .../{quartz2 => quartz}/QuartzSimpleRouteTest.java | 4 +- .../QuartzStartDelayedOptionTest.java | 2 +- .../QuartzStartDelayedTest.java | 2 +- .../QuartzStartDelayedWithReferenceTest.java | 2 +- .../QuartzStatefulJobRouteTest.java | 4 +- .../{quartz2 => quartz}/QuartzStopRouteTest.java | 4 +- .../QuartzSuspendRouteTest.java | 4 +- .../QuartzTwoCamelContextRestartTest.java | 2 +- .../QuartzTwoCamelContextSameNameClashTest.java | 4 +- .../QuartzTwoCamelContextSuspendResumeTest.java | 2 +- .../QuartzTwoCamelContextTest.java | 14 ++-- ...QuartzConsumerTwoAppsClusteredFailoverTest.java | 14 ++-- ...QuartzConsumerTwoAppsClusteredRecoveryTest.java | 8 +- .../SpringQuartzCronRouteTest.java | 4 +- ...PersistentStoreRestartAppChangeOptionsTest.java | 22 +++--- .../SpringQuartzPersistentStoreRestartAppTest.java | 8 +- ...pringQuartzPersistentStoreRestartRouteTest.java | 4 +- .../SpringQuartzPersistentStoreTest.java | 4 +- .../StatefulQuartzRouteTest.java | 2 +- .../FileConsumerQuartzSchedulerRestartTest.java | 2 +- .../FileConsumerQuartzSchedulerTest.java | 2 +- .../CronScheduledRoutePolicyTest.java | 50 ++++++------ .../{quartz2 => quartz}/DateFactory.java | 2 +- .../MultiplePoliciesOnRouteTest.java | 20 ++--- .../{quartz2 => quartz}/MyRoutePolicy.java | 4 +- .../RouteAutoStopFalseCronScheduledPolicyTest.java | 2 +- .../SimpleScheduledCombinedRoutePolicyTest.java | 18 ++--- .../SimpleScheduledRoutePolicyTest.java | 88 +++++++++++----------- .../SpringCronScheduledRoutePolicyTest.java | 12 +-- .../SpringMultiplePoliciesOnRouteTest.java | 6 +- .../SpringQuartzTwoAppsClusteredFailoverTest.java | 8 +- .../SpringScheduledRoutePolicyTest.java | 50 ++++++------ .../SpringSimpleScheduledRoutePolicyTest.java | 14 ++-- .../SpringQuartzConsumerClusteredAppDatabase.xml | 0 .../SpringQuartzConsumerClusteredAppOne.xml | 4 +- .../SpringQuartzConsumerClusteredAppTwo.xml | 4 +- ...SpringQuartzConsumerRecoveryClusteredAppOne.xml | 4 +- ...SpringQuartzConsumerRecoveryClusteredAppTwo.xml | 2 +- .../SpringQuartzCronRouteTest.xml | 0 ...entStoreRestartAppChangeCronExpressionTest1.xml | 2 +- ...entStoreRestartAppChangeCronExpressionTest2.xml | 2 +- ...entStoreRestartAppChangeCronExpressionTest3.xml | 2 +- ...PersistentStoreRestartAppChangeOptionsTest1.xml | 2 +- ...PersistentStoreRestartAppChangeOptionsTest2.xml | 2 +- .../SpringQuartzPersistentStoreRestartTest.xml | 2 +- .../SpringQuartzPersistentStoreTest.xml | 2 +- .../quartz}/myquartz.properties | 0 .../{quartz2 => quartz}/CronPolicies.xml | 10 +-- .../{quartz2 => quartz}/MultiplePolicies.xml | 4 +- .../{quartz2 => quartz}/SimplePolicies.xml | 12 +-- .../SpringQuartzClusteredAppDatabase.xml | 0 .../SpringQuartzClusteredAppOne.xml | 4 +- .../SpringQuartzClusteredAppTwo.xml | 4 +- .../quartz}/myquartz.properties | 0 .../src/test/resources/tables_derby.sql | 22 +++--- ...ointTest.java => MasterQuartzEndpointTest.java} | 2 +- ...xt.xml => MasterQuartzEndpointTest-context.xml} | 0 core/camel-core/pom.xml | 2 +- .../endpoint/dsl/HdfsEndpointBuilderFactory.java | 74 +++++++++--------- .../camel/support/ScheduledPollEndpoint.java | 6 +- .../modules/ROOT/pages/hdfs-component.adoc | 4 +- .../modules/ROOT/pages/quartz-component.adoc | 8 +- .../ROOT/pages/cronscheduledroutepolicy.adoc | 2 +- .../META-INF/spring-configuration-metadata.json | 52 ++++++------- .../META-INF/spring-configuration-metadata.json | 50 ++++++------ .../META-INF/spring-configuration-metadata.json | 52 ++++++------- parent/pom.xml | 2 +- .../karaf/features/src/main/resources/features.xml | 2 +- .../springboot/HdfsComponentAutoConfiguration.java | 4 +- .../springboot/HdfsComponentConfiguration.java | 2 +- .../src/main/resources/META-INF/spring.factories | 2 +- .../QuartzComponentAutoConfiguration.java | 4 +- .../springboot/QuartzComponentConfiguration.java | 2 +- .../src/main/resources/META-INF/spring.factories | 2 +- .../camel/itest/CamelQuartzJmxUpdateTest.java | 2 +- ...UpdateTest.xml => CamelQuartzJmxUpdateTest.xml} | 0 .../quartz/FtpCronScheduledRoutePolicyTest.java | 2 +- 164 files changed, 579 insertions(+), 593 deletions(-) rename components/camel-hdfs/src/main/java/org/apache/camel/component/{hdfs2 => hdfs}/HdfsComponent.java (98%) rename components/camel-hdfs/src/main/java/org/apache/camel/component/{hdfs2 => hdfs}/HdfsCompressionCodec.java (96%) rename components/camel-hdfs/src/main/java/org/apache/camel/component/{hdfs2 => hdfs}/HdfsConfiguration.java (99%) rename components/camel-hdfs/src/main/java/org/apache/camel/component/{hdfs2 => hdfs}/HdfsConstants.java (97%) rename components/camel-hdfs/src/main/java/org/apache/camel/component/{hdfs2 => hdfs}/HdfsConsumer.java (99%) rename components/camel-hdfs/src/main/java/org/apache/camel/component/{hdfs2 => hdfs}/HdfsEndpoint.java (98%) rename components/camel-hdfs/src/main/java/org/apache/camel/component/{hdfs2 => hdfs}/HdfsFileSystemType.java (97%) rename components/camel-hdfs/src/main/java/org/apache/camel/component/{hdfs2 => hdfs}/HdfsFileType.java (99%) rename components/camel-hdfs/src/main/java/org/apache/camel/component/{hdfs2 => hdfs}/HdfsHeader.java (95%) rename components/camel-hdfs/src/main/java/org/apache/camel/component/{hdfs2 => hdfs}/HdfsInfo.java (97%) rename components/camel-hdfs/src/main/java/org/apache/camel/component/{hdfs2 => hdfs}/HdfsInfoFactory.java (97%) rename components/camel-hdfs/src/main/java/org/apache/camel/component/{hdfs2 => hdfs}/HdfsInputStream.java (98%) rename components/camel-hdfs/src/main/java/org/apache/camel/component/{hdfs2 => hdfs}/HdfsOsgiHelper.java (98%) rename components/camel-hdfs/src/main/java/org/apache/camel/component/{hdfs2 => hdfs}/HdfsOutputStream.java (99%) rename components/camel-hdfs/src/main/java/org/apache/camel/component/{hdfs2 => hdfs}/HdfsProducer.java (99%) rename components/camel-hdfs/src/main/java/org/apache/camel/component/{hdfs2 => hdfs}/HdfsWritableFactories.java (99%) rename components/camel-hdfs/src/main/java/org/apache/camel/component/{hdfs2 => hdfs}/Holder.java (96%) rename components/camel-hdfs/src/main/java/org/apache/camel/component/{hdfs2 => hdfs}/WritableType.java (98%) rename components/camel-hdfs/src/main/java/org/apache/camel/component/{hdfs2 => hdfs}/osgi/HdfsActivator.java (98%) rename components/camel-hdfs/src/test/java/org/apache/camel/component/{hdfs2 => hdfs}/FromFileToHdfsTest.java (98%) rename components/camel-hdfs/src/test/java/org/apache/camel/component/{hdfs2 => hdfs}/HdfsConsumerTest.java (99%) rename components/camel-hdfs/src/test/java/org/apache/camel/component/{hdfs2 => hdfs}/HdfsProducerConsumerTest.java (98%) rename components/camel-hdfs/src/test/java/org/apache/camel/component/{hdfs2 => hdfs}/HdfsProducerSplitTest.java (99%) rename components/camel-hdfs/src/test/java/org/apache/camel/component/{hdfs2 => hdfs}/HdfsProducerTest.java (99%) rename components/camel-hdfs/src/test/java/org/apache/camel/component/{hdfs2 => hdfs}/HdfsTestSupport.java (97%) rename components/camel-hdfs/src/test/java/org/apache/camel/component/{hdfs2 => hdfs}/integration/HdfsAppendTest.java (98%) rename components/camel-hdfs/src/test/java/org/apache/camel/component/{hdfs2 => hdfs}/integration/HdfsProducerConsumerIntegrationTest.java (99%) rename components/camel-quartz/src/main/java/org/apache/camel/component/{quartz2 => quartz}/CamelJob.java (97%) rename components/camel-quartz/src/main/java/org/apache/camel/component/{quartz2 => quartz}/QuartzComponent.java (99%) rename components/camel-quartz/src/main/java/org/apache/camel/component/{quartz2 => quartz}/QuartzConstants.java (97%) rename components/camel-quartz/src/main/java/org/apache/camel/component/{quartz2 => quartz}/QuartzConsumer.java (97%) rename components/camel-quartz/src/main/java/org/apache/camel/component/{quartz2 => quartz}/QuartzEndpoint.java (98%) rename components/camel-quartz/src/main/java/org/apache/camel/component/{quartz2 => quartz}/QuartzHelper.java (98%) rename components/camel-quartz/src/main/java/org/apache/camel/component/{quartz2 => quartz}/QuartzMessage.java (98%) rename components/camel-quartz/src/main/java/org/apache/camel/component/{quartz2 => quartz}/StatefulCamelJob.java (96%) rename components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/{quartz2 => quartz}/QuartzScheduledPollConsumerJob.java (96%) rename components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/{quartz2 => quartz}/QuartzScheduledPollConsumerScheduler.java (98%) rename components/camel-quartz/src/main/java/org/apache/camel/routepolicy/{quartz2 => quartz}/CronScheduledRoutePolicy.java (97%) rename components/camel-quartz/src/main/java/org/apache/camel/routepolicy/{quartz2 => quartz}/ScheduledJob.java (96%) rename components/camel-quartz/src/main/java/org/apache/camel/routepolicy/{quartz2 => quartz}/ScheduledJobState.java (96%) rename components/camel-quartz/src/main/java/org/apache/camel/routepolicy/{quartz2 => quartz}/ScheduledRouteDetails.java (98%) rename components/camel-quartz/src/main/java/org/apache/camel/routepolicy/{quartz2 => quartz}/ScheduledRoutePolicy.java (96%) rename components/camel-quartz/src/main/java/org/apache/camel/routepolicy/{quartz2 => quartz}/ScheduledRoutePolicyConstants.java (96%) rename components/camel-quartz/src/main/java/org/apache/camel/routepolicy/{quartz2 => quartz}/SimpleScheduledRoutePolicy.java (96%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/BaseQuartzTest.java (96%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/DelegateEndpointQuartzTest.java (97%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartUnderscoreTimerNameTest.java (97%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzAddDynamicRouteTest.java (97%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzAddRoutesAfterCamelContextStartedTest.java (97%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzAutoStartTest.java (97%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzComponentCamelContextSchedulerIsolationTest.java (98%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzComponentCamelContextSharedSchedulerTest.java (96%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzComponentTest.java (97%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzCronRouteDurableJobTest.java (96%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzCronRouteTest.java (98%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzCronRouteWithSmallCacheTest.java (98%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzCronTriggerRouteTest.java (97%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzCustomCalendarFireTest.java (98%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzCustomCalendarNoFireTest.java (98%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzEndpointConfigureTest.java (99%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzInterruptTest.java (97%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzJobRouteUnderscoreTest.java (97%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzManagementTest.java (98%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzManuallyTriggerJobTest.java (96%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzNameCollisionTest.java (99%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzOneCamelContextRestartTest.java (98%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzOneCamelContextSuspendResumeTest.java (97%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzPropertiesTest.java (94%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzRepeatIntervalTest.java (97%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzRouteFireNowOnlyOnceTest.java (97%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzRouteFireNowTest.java (97%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzRouteRestartTest.java (96%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzRouteTest.java (97%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzSimpleRouteTest.java (98%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzStartDelayedOptionTest.java (97%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzStartDelayedTest.java (97%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzStartDelayedWithReferenceTest.java (97%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzStatefulJobRouteTest.java (98%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzStopRouteTest.java (98%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzSuspendRouteTest.java (98%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzTwoCamelContextRestartTest.java (98%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzTwoCamelContextSameNameClashTest.java (97%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzTwoCamelContextSuspendResumeTest.java (98%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/QuartzTwoCamelContextTest.java (96%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java (92%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java (93%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/SpringQuartzCronRouteTest.java (93%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java (89%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/SpringQuartzPersistentStoreRestartAppTest.java (92%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/SpringQuartzPersistentStoreRestartRouteTest.java (95%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/SpringQuartzPersistentStoreTest.java (93%) rename components/camel-quartz/src/test/java/org/apache/camel/component/{quartz2 => quartz}/StatefulQuartzRouteTest.java (98%) rename components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/{quartz2 => quartz}/FileConsumerQuartzSchedulerRestartTest.java (98%) rename components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/{quartz2 => quartz}/FileConsumerQuartzSchedulerTest.java (97%) rename components/camel-quartz/src/test/java/org/apache/camel/routepolicy/{quartz2 => quartz}/CronScheduledRoutePolicyTest.java (92%) rename components/camel-quartz/src/test/java/org/apache/camel/routepolicy/{quartz2 => quartz}/DateFactory.java (95%) rename components/camel-quartz/src/test/java/org/apache/camel/routepolicy/{quartz2 => quartz}/MultiplePoliciesOnRouteTest.java (91%) rename components/camel-quartz/src/test/java/org/apache/camel/routepolicy/{quartz2 => quartz}/MyRoutePolicy.java (96%) rename components/camel-quartz/src/test/java/org/apache/camel/routepolicy/{quartz2 => quartz}/RouteAutoStopFalseCronScheduledPolicyTest.java (97%) rename components/camel-quartz/src/test/java/org/apache/camel/routepolicy/{quartz2 => quartz}/SimpleScheduledCombinedRoutePolicyTest.java (90%) rename components/camel-quartz/src/test/java/org/apache/camel/routepolicy/{quartz2 => quartz}/SimpleScheduledRoutePolicyTest.java (90%) rename components/camel-quartz/src/test/java/org/apache/camel/routepolicy/{quartz2 => quartz}/SpringCronScheduledRoutePolicyTest.java (92%) rename components/camel-quartz/src/test/java/org/apache/camel/routepolicy/{quartz2 => quartz}/SpringMultiplePoliciesOnRouteTest.java (94%) rename components/camel-quartz/src/test/java/org/apache/camel/routepolicy/{quartz2 => quartz}/SpringQuartzTwoAppsClusteredFailoverTest.java (93%) rename components/camel-quartz/src/test/java/org/apache/camel/routepolicy/{quartz2 => quartz}/SpringScheduledRoutePolicyTest.java (92%) rename components/camel-quartz/src/test/java/org/apache/camel/routepolicy/{quartz2 => quartz}/SpringSimpleScheduledRoutePolicyTest.java (92%) rename components/camel-quartz/src/test/resources/org/apache/camel/component/{quartz2 => quartz}/SpringQuartzConsumerClusteredAppDatabase.xml (100%) rename components/camel-quartz/src/test/resources/org/apache/camel/component/{quartz2 => quartz}/SpringQuartzConsumerClusteredAppOne.xml (95%) rename components/camel-quartz/src/test/resources/org/apache/camel/component/{quartz2 => quartz}/SpringQuartzConsumerClusteredAppTwo.xml (94%) rename components/camel-quartz/src/test/resources/org/apache/camel/component/{quartz2 => quartz}/SpringQuartzConsumerRecoveryClusteredAppOne.xml (96%) rename components/camel-quartz/src/test/resources/org/apache/camel/component/{quartz2 => quartz}/SpringQuartzConsumerRecoveryClusteredAppTwo.xml (97%) rename components/camel-quartz/src/test/resources/org/apache/camel/component/{quartz2 => quartz}/SpringQuartzCronRouteTest.xml (100%) rename components/camel-quartz/src/test/resources/org/apache/camel/component/{quartz2 => quartz}/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml (99%) rename components/camel-quartz/src/test/resources/org/apache/camel/component/{quartz2 => quartz}/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml (99%) rename components/camel-quartz/src/test/resources/org/apache/camel/component/{quartz2 => quartz}/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml (99%) rename components/camel-quartz/src/test/resources/org/apache/camel/component/{quartz2 => quartz}/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml (99%) rename components/camel-quartz/src/test/resources/org/apache/camel/component/{quartz2 => quartz}/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml (99%) rename components/camel-quartz/src/test/resources/org/apache/camel/component/{quartz2 => quartz}/SpringQuartzPersistentStoreRestartTest.xml (97%) rename components/camel-quartz/src/test/resources/org/apache/camel/component/{quartz2 => quartz}/SpringQuartzPersistentStoreTest.xml (97%) rename components/camel-quartz/src/test/resources/org/apache/camel/{routepolicy/quartz2 => component/quartz}/myquartz.properties (100%) rename components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/{quartz2 => quartz}/CronPolicies.xml (92%) rename components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/{quartz2 => quartz}/MultiplePolicies.xml (93%) rename components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/{quartz2 => quartz}/SimplePolicies.xml (90%) rename components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/{quartz2 => quartz}/SpringQuartzClusteredAppDatabase.xml (100%) rename components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/{quartz2 => quartz}/SpringQuartzClusteredAppOne.xml (96%) rename components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/{quartz2 => quartz}/SpringQuartzClusteredAppTwo.xml (96%) rename components/camel-quartz/src/test/resources/org/apache/camel/{component/quartz2 => routepolicy/quartz}/myquartz.properties (100%) rename components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/{MasterQuartz2EndpointTest.java => MasterQuartzEndpointTest.java} (96%) rename components/camel-zookeeper-master/src/test/resources/org/apache/camel/component/zookeepermaster/{MasterQuartz2EndpointTest-context.xml => MasterQuartzEndpointTest-context.xml} (100%) rename platforms/spring-boot/components-starter/camel-hdfs-starter/src/main/java/org/apache/camel/component/{hdfs2 => hdfs}/springboot/HdfsComponentAutoConfiguration.java (98%) rename platforms/spring-boot/components-starter/camel-hdfs-starter/src/main/java/org/apache/camel/component/{hdfs2 => hdfs}/springboot/HdfsComponentConfiguration.java (97%) rename platforms/spring-boot/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/{quartz2 => quartz}/springboot/QuartzComponentAutoConfiguration.java (98%) rename platforms/spring-boot/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/{quartz2 => quartz}/springboot/QuartzComponentConfiguration.java (99%) rename tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/{CamelQuartz2JmxUpdateTest.xml => CamelQuartzJmxUpdateTest.xml} (100%)
