This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git.
from 4fdd73f CAMEL-10533: AggregateController - Add forceDiscardOfGroup method new 2450fd9 CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz new 2bd1cdf CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Update references new 0866b80 CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Update References in scheduler new 784b970 CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Update references, take 2 new 1370c7c CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Update references, take 3 new 524c3ce CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Update docs new dd9d73a CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Update docs, links and regen new 740d452 CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Karaf integration test and feature updated new 7130ca7 CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Karaf integration test added back test new 362a4f5 CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - SB integration test updated new c047566 CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed references in itest OSGI new 838edc6 CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed references in Javadoc new c2794a6 CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed references camel-blueprint new 51ac552 CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed references camel-catalog new 6b8eb75 CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed more references new ed5f13c CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed camel-mail test new 8e4438b CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed camel-zookeeper-master test new 6ff31d2 CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed camel-example-main-tiny new 087ab49 CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed camel-example-main new b5ef5da CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Added note in MIGRATION guide The 20 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: MIGRATION.md | 2 + apache-camel/pom.xml | 4 +- apache-camel/src/main/descriptors/common-bin.xml | 4 +- bom/camel-bom/pom.xml | 4 +- .../src/test/resources/sample-pretty.json | 2 +- .../camel-catalog/src/test/resources/sample.json | 2 +- .../src/main/docs/camel-main-maven-plugin.adoc | 2 +- .../camel-apns/src/main/docs/apns-component.adoc | 4 +- .../camel-atom/src/main/docs/atom-component.adoc | 4 +- .../src/main/docs/aws-ddbstream-component.adoc | 4 +- .../src/main/docs/aws-kinesis-component.adoc | 4 +- .../src/main/docs/aws-s3-component.adoc | 4 +- .../src/main/docs/aws-sqs-component.adoc | 4 +- .../src/main/docs/beanstalk-component.adoc | 4 +- .../blueprint/handler/CamelNamespaceHandler.java | 6 +- .../src/main/docs/cql-component.adoc | 4 +- .../src/main/docs/couchbase-component.adoc | 4 +- .../camel-elsql/src/main/docs/elsql-component.adoc | 4 +- .../camel-etcd/src/main/docs/etcd-component.adoc | 4 +- .../camel-file/src/main/docs/file-component.adoc | 4 +- .../src/main/docs/flatpack-component.adoc | 4 +- .../camel-ftp/src/main/docs/ftp-component.adoc | 4 +- .../camel-ftp/src/main/docs/ftps-component.adoc | 4 +- .../camel-ftp/src/main/docs/sftp-component.adoc | 4 +- .../docs/google-calendar-stream-component.adoc | 4 +- .../main/docs/google-mail-stream-component.adoc | 4 +- .../main/docs/google-sheets-stream-component.adoc | 4 +- .../camel-hdfs/src/main/docs/hdfs-component.adoc | 4 +- .../src/main/docs/hipchat-component.adoc | 4 +- .../src/main/docs/ironmq-component.adoc | 4 +- .../camel-jdbc/src/main/docs/jdbc-component.adoc | 2 +- .../camel-jooq/src/main/docs/jooq-component.adoc | 4 +- .../camel-jpa/src/main/docs/jpa-component.adoc | 4 +- .../camel-jt400/src/main/docs/jt400-component.adoc | 4 +- components/camel-mail/pom.xml | 2 +- .../camel-mail/src/main/docs/mail-component.adoc | 4 +- .../camel/component/mail/MailComponentTest.java | 2 +- .../src/main/docs/mybatis-component.adoc | 4 +- .../main/docs/pg-replication-slot-component.adoc | 4 +- components/{camel-quartz2 => camel-quartz}/pom.xml | 6 +- .../src/main/docs/quartz-component.adoc} | 82 ++++----- .../apache/camel/component/quartz2/CamelJob.java | 0 .../camel/component/quartz2/QuartzComponent.java | 2 +- .../camel/component/quartz2/QuartzConstants.java | 0 .../camel/component/quartz2/QuartzConsumer.java | 0 .../camel/component/quartz2/QuartzEndpoint.java | 2 +- .../camel/component/quartz2/QuartzHelper.java | 0 .../camel/component/quartz2/QuartzMessage.java | 0 .../camel/component/quartz2/StatefulCamelJob.java | 0 .../quartz2/QuartzScheduledPollConsumerJob.java | 0 .../QuartzScheduledPollConsumerScheduler.java | 4 +- .../quartz2/CronScheduledRoutePolicy.java | 2 +- .../camel/routepolicy/quartz2/ScheduledJob.java | 0 .../routepolicy/quartz2/ScheduledJobState.java | 0 .../routepolicy/quartz2/ScheduledRouteDetails.java | 0 .../routepolicy/quartz2/ScheduledRoutePolicy.java | 2 +- .../quartz2/ScheduledRoutePolicyConstants.java | 0 .../quartz2/SimpleScheduledRoutePolicy.java | 2 +- .../camel/component/quartz2/BaseQuartzTest.java | 2 +- .../quartz2/DelegateEndpointQuartzTest.java | 2 +- .../quartz2/QuartUnderscoreTimerNameTest.java | 2 +- .../quartz2/QuartzAddDynamicRouteTest.java | 2 +- ...uartzAddRoutesAfterCamelContextStartedTest.java | 2 +- .../component/quartz2/QuartzAutoStartTest.java | 4 +- ...omponentCamelContextSchedulerIsolationTest.java | 2 +- ...tzComponentCamelContextSharedSchedulerTest.java | 8 +- .../component/quartz2/QuartzComponentTest.java | 0 .../quartz2/QuartzCronRouteDurableJobTest.java | 2 +- .../component/quartz2/QuartzCronRouteTest.java | 2 +- .../quartz2/QuartzCronRouteWithSmallCacheTest.java | 2 +- .../quartz2/QuartzCronTriggerRouteTest.java | 2 +- .../quartz2/QuartzCustomCalendarFireTest.java | 4 +- .../quartz2/QuartzCustomCalendarNoFireTest.java | 4 +- .../quartz2/QuartzEndpointConfigureTest.java | 18 +- .../component/quartz2/QuartzInterruptTest.java | 6 +- .../quartz2/QuartzJobRouteUnderscoreTest.java | 2 +- .../component/quartz2/QuartzManagementTest.java | 2 +- .../quartz2/QuartzManuallyTriggerJobTest.java | 4 +- .../component/quartz2/QuartzNameCollisionTest.java | 20 +- .../quartz2/QuartzOneCamelContextRestartTest.java | 2 +- .../QuartzOneCamelContextSuspendResumeTest.java | 2 +- .../component/quartz2/QuartzPropertiesTest.java | 6 +- .../quartz2/QuartzRepeatIntervalTest.java | 2 +- .../quartz2/QuartzRouteFireNowOnlyOnceTest.java | 2 +- .../component/quartz2/QuartzRouteFireNowTest.java | 2 +- .../component/quartz2/QuartzRouteRestartTest.java | 2 +- .../camel/component/quartz2/QuartzRouteTest.java | 2 +- .../component/quartz2/QuartzSimpleRouteTest.java | 2 +- .../quartz2/QuartzStartDelayedOptionTest.java | 2 +- .../component/quartz2/QuartzStartDelayedTest.java | 4 +- .../QuartzStartDelayedWithReferenceTest.java | 4 +- .../quartz2/QuartzStatefulJobRouteTest.java | 2 +- .../component/quartz2/QuartzStopRouteTest.java | 2 +- .../component/quartz2/QuartzSuspendRouteTest.java | 2 +- .../quartz2/QuartzTwoCamelContextRestartTest.java | 4 +- .../QuartzTwoCamelContextSameNameClashTest.java | 4 +- .../QuartzTwoCamelContextSuspendResumeTest.java | 4 +- .../quartz2/QuartzTwoCamelContextTest.java | 6 +- ...QuartzConsumerTwoAppsClusteredFailoverTest.java | 0 ...QuartzConsumerTwoAppsClusteredRecoveryTest.java | 0 .../quartz2/SpringQuartzCronRouteTest.java | 0 ...PersistentStoreRestartAppChangeOptionsTest.java | 0 .../SpringQuartzPersistentStoreRestartAppTest.java | 0 ...pringQuartzPersistentStoreRestartRouteTest.java | 0 .../quartz2/SpringQuartzPersistentStoreTest.java | 0 .../component/quartz2/StatefulQuartzRouteTest.java | 2 +- .../FileConsumerQuartzSchedulerRestartTest.java | 0 .../quartz2/FileConsumerQuartzSchedulerTest.java | 0 .../quartz2/CronScheduledRoutePolicyTest.java | 18 +- .../camel/routepolicy/quartz2/DateFactory.java | 0 .../quartz2/MultiplePoliciesOnRouteTest.java | 4 +- .../camel/routepolicy/quartz2/MyRoutePolicy.java | 0 .../RouteAutoStopFalseCronScheduledPolicyTest.java | 0 .../SimpleScheduledCombinedRoutePolicyTest.java | 4 +- .../quartz2/SimpleScheduledRoutePolicyTest.java | 24 +-- .../SpringCronScheduledRoutePolicyTest.java | 0 .../quartz2/SpringMultiplePoliciesOnRouteTest.java | 0 .../SpringQuartzTwoAppsClusteredFailoverTest.java | 0 .../quartz2/SpringScheduledRoutePolicyTest.java | 0 .../SpringSimpleScheduledRoutePolicyTest.java | 0 .../src/test/resources/log4j2.properties | 2 +- .../SpringQuartzConsumerClusteredAppDatabase.xml | 0 .../SpringQuartzConsumerClusteredAppOne.xml | 0 .../SpringQuartzConsumerClusteredAppTwo.xml | 0 ...SpringQuartzConsumerRecoveryClusteredAppOne.xml | 2 +- ...SpringQuartzConsumerRecoveryClusteredAppTwo.xml | 2 +- .../quartz2/SpringQuartzCronRouteTest.xml | 2 +- ...entStoreRestartAppChangeCronExpressionTest1.xml | 0 ...entStoreRestartAppChangeCronExpressionTest2.xml | 0 ...entStoreRestartAppChangeCronExpressionTest3.xml | 0 ...PersistentStoreRestartAppChangeOptionsTest1.xml | 0 ...PersistentStoreRestartAppChangeOptionsTest2.xml | 0 .../SpringQuartzPersistentStoreRestartTest.xml | 2 +- .../quartz2/SpringQuartzPersistentStoreTest.xml | 2 +- .../camel/component}/quartz2/myquartz.properties | 0 .../camel/routepolicy/quartz2/CronPolicies.xml | 0 .../camel/routepolicy/quartz2/MultiplePolicies.xml | 0 .../camel/routepolicy/quartz2/SimplePolicies.xml | 0 .../quartz2/SpringQuartzClusteredAppDatabase.xml | 0 .../quartz2/SpringQuartzClusteredAppOne.xml | 0 .../quartz2/SpringQuartzClusteredAppTwo.xml | 0 .../camel/routepolicy}/quartz2/myquartz.properties | 0 .../src/test/resources/tables_derby.sql | 0 .../camel-rss/src/main/docs/rss-component.adoc | 4 +- .../src/main/docs/xquery-component.adoc | 4 +- .../src/main/docs/scheduler-component.adoc | 6 +- .../camel-slack/src/main/docs/slack-component.adoc | 4 +- .../camel-snmp/src/main/docs/snmp-component.adoc | 4 +- .../src/main/docs/splunk-component.adoc | 4 +- .../camel-sql/src/main/docs/sql-component.adoc | 4 +- .../camel-ssh/src/main/docs/ssh-component.adoc | 4 +- .../src/main/docs/telegram-component.adoc | 4 +- .../camel-timer/src/main/docs/timer-component.adoc | 4 +- .../main/docs/twitter-directmessage-component.adoc | 4 +- .../src/main/docs/twitter-search-component.adoc | 4 +- .../src/main/docs/twitter-streaming-component.adoc | 4 +- .../src/main/docs/twitter-timeline-component.adoc | 4 +- .../src/main/docs/weather-component.adoc | 4 +- .../src/main/docs/yammer-component.adoc | 4 +- components/camel-zookeeper-master/pom.xml | 2 +- .../MasterQuartz2EndpointTest-context.xml | 4 +- components/pom.xml | 2 +- components/readme.adoc | 4 +- .../camel/spi/ScheduledPollConsumerScheduler.java | 2 +- .../endpoint/dsl/ApnsEndpointBuilderFactory.java | 8 +- .../dsl/BeanstalkEndpointBuilderFactory.java | 8 +- .../dsl/CassandraEndpointBuilderFactory.java | 8 +- .../dsl/CouchbaseEndpointBuilderFactory.java | 8 +- .../endpoint/dsl/ElsqlEndpointBuilderFactory.java | 8 +- .../endpoint/dsl/EtcdEndpointBuilderFactory.java | 8 +- .../endpoint/dsl/FileEndpointBuilderFactory.java | 8 +- .../dsl/FlatpackEndpointBuilderFactory.java | 8 +- .../endpoint/dsl/FtpEndpointBuilderFactory.java | 8 +- .../endpoint/dsl/FtpsEndpointBuilderFactory.java | 8 +- .../endpoint/dsl/HdfsEndpointBuilderFactory.java | 8 +- .../dsl/HipchatEndpointBuilderFactory.java | 8 +- .../endpoint/dsl/IronMQEndpointBuilderFactory.java | 8 +- .../endpoint/dsl/JooqEndpointBuilderFactory.java | 8 +- .../endpoint/dsl/JpaEndpointBuilderFactory.java | 8 +- .../endpoint/dsl/Jt400EndpointBuilderFactory.java | 8 +- .../dsl/KinesisEndpointBuilderFactory.java | 8 +- .../endpoint/dsl/MailEndpointBuilderFactory.java | 8 +- .../dsl/MyBatisEndpointBuilderFactory.java | 8 +- .../endpoint/dsl/QuartzEndpointBuilderFactory.java | 12 +- .../endpoint/dsl/S3EndpointBuilderFactory.java | 8 +- .../endpoint/dsl/SftpEndpointBuilderFactory.java | 8 +- .../endpoint/dsl/SlackEndpointBuilderFactory.java | 8 +- .../endpoint/dsl/SplunkEndpointBuilderFactory.java | 8 +- .../endpoint/dsl/SqlEndpointBuilderFactory.java | 8 +- .../endpoint/dsl/SqsEndpointBuilderFactory.java | 8 +- .../endpoint/dsl/SshEndpointBuilderFactory.java | 8 +- .../dsl/TelegramEndpointBuilderFactory.java | 8 +- ...TwitterDirectMessageEndpointBuilderFactory.java | 8 +- .../dsl/TwitterSearchEndpointBuilderFactory.java | 8 +- .../dsl/TwitterTimelineEndpointBuilderFactory.java | 8 +- .../dsl/WeatherEndpointBuilderFactory.java | 8 +- .../endpoint/dsl/XQueryEndpointBuilderFactory.java | 8 +- .../endpoint/dsl/YammerEndpointBuilderFactory.java | 8 +- .../camel/support/ScheduledPollEndpoint.java | 24 +-- docs/components/modules/ROOT/nav.adoc | 2 +- .../modules/ROOT/pages/apns-component.adoc | 4 +- .../modules/ROOT/pages/atom-component.adoc | 4 +- .../ROOT/pages/aws-ddbstream-component.adoc | 4 +- .../modules/ROOT/pages/aws-kinesis-component.adoc | 4 +- .../modules/ROOT/pages/aws-s3-component.adoc | 4 +- .../modules/ROOT/pages/aws-sqs-component.adoc | 4 +- .../modules/ROOT/pages/beanstalk-component.adoc | 4 +- .../modules/ROOT/pages/couchbase-component.adoc | 4 +- .../modules/ROOT/pages/cql-component.adoc | 4 +- .../modules/ROOT/pages/elsql-component.adoc | 4 +- .../modules/ROOT/pages/etcd-component.adoc | 4 +- .../modules/ROOT/pages/file-component.adoc | 4 +- .../modules/ROOT/pages/flatpack-component.adoc | 4 +- .../modules/ROOT/pages/ftp-component.adoc | 4 +- .../modules/ROOT/pages/ftps-component.adoc | 4 +- .../pages/google-calendar-stream-component.adoc | 4 +- .../ROOT/pages/google-mail-stream-component.adoc | 4 +- .../ROOT/pages/google-sheets-stream-component.adoc | 4 +- .../modules/ROOT/pages/hdfs-component.adoc | 4 +- .../modules/ROOT/pages/hipchat-component.adoc | 4 +- .../modules/ROOT/pages/ironmq-component.adoc | 4 +- .../modules/ROOT/pages/jdbc-component.adoc | 2 +- .../modules/ROOT/pages/jooq-component.adoc | 4 +- .../modules/ROOT/pages/jpa-component.adoc | 4 +- .../modules/ROOT/pages/jt400-component.adoc | 4 +- .../modules/ROOT/pages/mail-component.adoc | 4 +- .../modules/ROOT/pages/mybatis-component.adoc | 4 +- .../ROOT/pages/pg-replication-slot-component.adoc | 4 +- ...uartz2-component.adoc => quartz-component.adoc} | 82 ++++----- .../modules/ROOT/pages/rss-component.adoc | 4 +- .../modules/ROOT/pages/scheduler-component.adoc | 6 +- .../modules/ROOT/pages/sftp-component.adoc | 4 +- .../modules/ROOT/pages/slack-component.adoc | 4 +- .../modules/ROOT/pages/snmp-component.adoc | 4 +- .../modules/ROOT/pages/splunk-component.adoc | 4 +- .../modules/ROOT/pages/sql-component.adoc | 4 +- .../modules/ROOT/pages/ssh-component.adoc | 4 +- .../modules/ROOT/pages/telegram-component.adoc | 4 +- .../modules/ROOT/pages/timer-component.adoc | 4 +- .../pages/twitter-directmessage-component.adoc | 4 +- .../ROOT/pages/twitter-search-component.adoc | 4 +- .../ROOT/pages/twitter-streaming-component.adoc | 4 +- .../ROOT/pages/twitter-timeline-component.adoc | 4 +- .../modules/ROOT/pages/weather-component.adoc | 4 +- .../modules/ROOT/pages/xquery-component.adoc | 4 +- .../modules/ROOT/pages/yammer-component.adoc | 4 +- .../ROOT/pages/cronscheduledroutepolicy.adoc | 8 +- ...-do-the-timer-and-quartz-endpoints-compare.adoc | 2 +- docs/user-manual/modules/ROOT/pages/index.adoc | 2 +- .../modules/ROOT/pages/polling-consumer.adoc | 16 +- .../ROOT/pages/simplescheduledroutepolicy.adoc | 8 +- examples/camel-example-main-artemis/pom.xml | 2 +- examples/camel-example-main-tiny/pom.xml | 2 +- .../org/apache/camel/example/MyRouteBuilder.java | 2 +- .../META-INF/spring-configuration-metadata.json | 4 +- .../src/main/resources/application.properties | 2 +- examples/camel-example-main/pom.xml | 2 +- .../org/apache/camel/example/MyRouteBuilder.java | 2 +- .../src/main/resources/application.properties | 2 +- parent/pom.xml | 4 +- .../karaf/features/src/main/resources/features.xml | 4 +- .../spring-boot/components-starter/README.adoc | 1 - .../pom.xml | 8 +- .../QuartzComponentAutoConfiguration.java | 8 +- .../springboot/QuartzComponentConfiguration.java | 4 +- .../src/main/resources/META-INF/LICENSE.txt | 0 .../src/main/resources/META-INF/NOTICE.txt | 0 .../src/main/resources/META-INF/spring.factories | 1 + .../src/main/resources/META-INF/spring.provides | 2 +- .../src/main/resources/META-INF/LICENSE.txt | 203 --------------------- .../src/main/resources/META-INF/NOTICE.txt | 11 -- .../additional-spring-configuration-metadata.json | 10 - platforms/spring-boot/components-starter/pom.xml | 2 +- .../camel-spring-boot-dependencies/pom.xml | 4 +- ...{CamelQuartz2Test.java => CamelQuartzTest.java} | 6 +- ...dateTest.java => CamelQuartzJmxUpdateTest.java} | 12 +- .../camel/itest/CamelQuartz2JmxUpdateTest.xml | 2 +- ...{CamelQuartz2Test.java => CamelQuartzTest.java} | 4 +- tests/camel-itest/pom.xml | 2 +- 279 files changed, 611 insertions(+), 833 deletions(-) rename components/{camel-quartz2 => camel-quartz}/pom.xml (96%) rename components/{camel-quartz2/src/main/docs/quartz2-component.adoc => camel-quartz/src/main/docs/quartz-component.adoc} (80%) rename components/{camel-quartz2 => camel-quartz}/src/main/java/org/apache/camel/component/quartz2/CamelJob.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java (99%) rename components/{camel-quartz2 => camel-quartz}/src/main/java/org/apache/camel/component/quartz2/QuartzConstants.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/main/java/org/apache/camel/component/quartz2/QuartzConsumer.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java (99%) rename components/{camel-quartz2 => camel-quartz}/src/main/java/org/apache/camel/component/quartz2/QuartzHelper.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/main/java/org/apache/camel/component/quartz2/QuartzMessage.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/main/java/org/apache/camel/component/quartz2/StatefulCamelJob.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java (99%) rename components/{camel-quartz2 => camel-quartz}/src/main/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicy.java (99%) rename components/{camel-quartz2 => camel-quartz}/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJob.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJobState.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRouteDetails.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicy.java (99%) rename components/{camel-quartz2 => camel-quartz}/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicyConstants.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/main/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicy.java (99%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/BaseQuartzTest.java (93%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/DelegateEndpointQuartzTest.java (97%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartUnderscoreTimerNameTest.java (94%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzAddDynamicRouteTest.java (94%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzAddRoutesAfterCamelContextStartedTest.java (92%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzAutoStartTest.java (89%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSchedulerIsolationTest.java (97%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSharedSchedulerTest.java (90%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzComponentTest.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteDurableJobTest.java (91%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteTest.java (96%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteWithSmallCacheTest.java (96%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzCronTriggerRouteTest.java (94%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java (95%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java (94%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzEndpointConfigureTest.java (93%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzInterruptTest.java (86%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzJobRouteUnderscoreTest.java (94%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzManagementTest.java (93%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzManuallyTriggerJobTest.java (95%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzNameCollisionTest.java (85%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextRestartTest.java (95%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextSuspendResumeTest.java (95%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzPropertiesTest.java (92%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzRepeatIntervalTest.java (94%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowOnlyOnceTest.java (93%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowTest.java (93%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzRouteRestartTest.java (95%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzRouteTest.java (92%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzSimpleRouteTest.java (95%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedOptionTest.java (91%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedTest.java (90%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java (89%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzStatefulJobRouteTest.java (95%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzStopRouteTest.java (96%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzSuspendRouteTest.java (96%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextRestartTest.java (92%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSameNameClashTest.java (94%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSuspendResumeTest.java (93%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextTest.java (91%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppTest.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartRouteTest.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/component/quartz2/StatefulQuartzRouteTest.java (94%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerRestartTest.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerTest.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java (90%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/routepolicy/quartz2/DateFactory.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/routepolicy/quartz2/MultiplePoliciesOnRouteTest.java (93%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/routepolicy/quartz2/MyRoutePolicy.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/routepolicy/quartz2/RouteAutoStopFalseCronScheduledPolicyTest.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledCombinedRoutePolicyTest.java (93%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java (88%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/routepolicy/quartz2/SpringCronScheduledRoutePolicyTest.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/routepolicy/quartz2/SpringMultiplePoliciesOnRouteTest.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/routepolicy/quartz2/SpringQuartzTwoAppsClusteredFailoverTest.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/java/org/apache/camel/routepolicy/quartz2/SpringSimpleScheduledRoutePolicyTest.java (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/resources/log4j2.properties (96%) rename components/{camel-quartz2 => camel-quartz}/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppDatabase.xml (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml (95%) rename components/{camel-quartz2 => camel-quartz}/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml (95%) rename components/{camel-quartz2 => camel-quartz}/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.xml (95%) rename components/{camel-quartz2 => camel-quartz}/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml (96%) rename components/{camel-quartz2 => camel-quartz}/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml (96%) rename components/{camel-quartz2/src/test/resources/org/apache/camel/routepolicy => camel-quartz/src/test/resources/org/apache/camel/component}/quartz2/myquartz.properties (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/resources/org/apache/camel/routepolicy/quartz2/CronPolicies.xml (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/resources/org/apache/camel/routepolicy/quartz2/MultiplePolicies.xml (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/resources/org/apache/camel/routepolicy/quartz2/SimplePolicies.xml (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppDatabase.xml (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml (100%) rename components/{camel-quartz2/src/test/resources/org/apache/camel/component => camel-quartz/src/test/resources/org/apache/camel/routepolicy}/quartz2/myquartz.properties (100%) rename components/{camel-quartz2 => camel-quartz}/src/test/resources/tables_derby.sql (100%) rename docs/components/modules/ROOT/pages/{quartz2-component.adoc => quartz-component.adoc} (80%) rename platforms/spring-boot/components-starter/{camel-quartz2-starter => camel-quartz-starter}/pom.xml (89%) rename platforms/spring-boot/components-starter/{camel-quartz2-starter => camel-quartz-starter}/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentAutoConfiguration.java (96%) rename platforms/spring-boot/components-starter/{camel-quartz2-starter => camel-quartz-starter}/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentConfiguration.java (97%) copy {tooling/maven/camel-package-maven-plugin => platforms/spring-boot/components-starter/camel-quartz-starter}/src/main/resources/META-INF/LICENSE.txt (100%) copy {tooling/maven/camel-package-maven-plugin => platforms/spring-boot/components-starter/camel-quartz-starter}/src/main/resources/META-INF/NOTICE.txt (100%) rename platforms/spring-boot/components-starter/{camel-quartz2-starter => camel-quartz-starter}/src/main/resources/META-INF/spring.factories (99%) rename platforms/spring-boot/components-starter/{camel-quartz2-starter => camel-quartz-starter}/src/main/resources/META-INF/spring.provides (97%) delete mode 100644 platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/LICENSE.txt delete mode 100644 platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/NOTICE.txt delete mode 100644 platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/{CamelQuartz2Test.java => CamelQuartzTest.java} (94%) rename tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/{CamelQuartz2JmxUpdateTest.java => CamelQuartzJmxUpdateTest.java} (95%) rename tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/{CamelQuartz2Test.java => CamelQuartzTest.java} (92%)