You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@camel.apache.org by ac...@apache.org on 2019/08/06 09:49:48 UTC

[camel] branch master updated (4fdd73f -> b5ef5da)

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%)

[camel] 07/20: CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Update docs, links and regen

Posted by ac...@apache.org.

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

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

commit dd9d73a8eff42d58bc39c0a63957a8bfdede10bf
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 10:34:22 2019 +0200

     CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Update docs, links and regen
---
 .../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 +-
 .../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 +-
 .../camel-mail/src/main/docs/mail-component.adoc   |  4 +-
 .../src/main/docs/mybatis-component.adoc           |  4 +-
 .../main/docs/pg-replication-slot-component.adoc   |  4 +-
 .../src/main/docs/quartz-component.adoc            | 34 ++++-----
 .../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/readme.adoc                             |  4 +-
 .../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/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 +--
 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 +--
 132 files changed, 391 insertions(+), 391 deletions(-)

diff --git a/components/camel-apns/src/main/docs/apns-component.adoc b/components/camel-apns/src/main/docs/apns-component.adoc
index 64f4a17..7cbc06d 100644
--- a/components/camel-apns/src/main/docs/apns-component.adoc
+++ b/components/camel-apns/src/main/docs/apns-component.adoc
@@ -110,8 +110,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-atom/src/main/docs/atom-component.adoc b/components/camel-atom/src/main/docs/atom-component.adoc
index 0dac79b..c525493 100644
--- a/components/camel-atom/src/main/docs/atom-component.adoc
+++ b/components/camel-atom/src/main/docs/atom-component.adoc
@@ -97,8 +97,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-aws-ddb/src/main/docs/aws-ddbstream-component.adoc b/components/camel-aws-ddb/src/main/docs/aws-ddbstream-component.adoc
index 1c522fe..a0d5f43 100644
--- a/components/camel-aws-ddb/src/main/docs/aws-ddbstream-component.adoc
+++ b/components/camel-aws-ddb/src/main/docs/aws-ddbstream-component.adoc
@@ -95,8 +95,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-aws-kinesis/src/main/docs/aws-kinesis-component.adoc b/components/camel-aws-kinesis/src/main/docs/aws-kinesis-component.adoc
index ee13b46..c1cb1f3 100644
--- a/components/camel-aws-kinesis/src/main/docs/aws-kinesis-component.adoc
+++ b/components/camel-aws-kinesis/src/main/docs/aws-kinesis-component.adoc
@@ -99,8 +99,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
index 2882a2e..e742444 100644
--- a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
+++ b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
@@ -135,8 +135,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc b/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc
index 9d62f5e..8393c61 100644
--- a/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc
+++ b/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc
@@ -116,8 +116,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc b/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc
index 9ea222e..4eeb521 100644
--- a/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc
+++ b/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc
@@ -121,8 +121,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-cassandraql/src/main/docs/cql-component.adoc b/components/camel-cassandraql/src/main/docs/cql-component.adoc
index 7f26053..8b72cc3 100644
--- a/components/camel-cassandraql/src/main/docs/cql-component.adoc
+++ b/components/camel-cassandraql/src/main/docs/cql-component.adoc
@@ -123,8 +123,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-couchbase/src/main/docs/couchbase-component.adoc b/components/camel-couchbase/src/main/docs/couchbase-component.adoc
index 8fd9e28..7fc8ab9 100644
--- a/components/camel-couchbase/src/main/docs/couchbase-component.adoc
+++ b/components/camel-couchbase/src/main/docs/couchbase-component.adoc
@@ -111,8 +111,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-elsql/src/main/docs/elsql-component.adoc b/components/camel-elsql/src/main/docs/elsql-component.adoc
index 5197a1b..ab1ba1a 100644
--- a/components/camel-elsql/src/main/docs/elsql-component.adoc
+++ b/components/camel-elsql/src/main/docs/elsql-component.adoc
@@ -138,8 +138,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-etcd/src/main/docs/etcd-component.adoc b/components/camel-etcd/src/main/docs/etcd-component.adoc
index cce49ea..33b2aa3 100644
--- a/components/camel-etcd/src/main/docs/etcd-component.adoc
+++ b/components/camel-etcd/src/main/docs/etcd-component.adoc
@@ -82,8 +82,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-file/src/main/docs/file-component.adoc b/components/camel-file/src/main/docs/file-component.adoc
index dae967f..d6536e6 100644
--- a/components/camel-file/src/main/docs/file-component.adoc
+++ b/components/camel-file/src/main/docs/file-component.adoc
@@ -175,8 +175,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-flatpack/src/main/docs/flatpack-component.adoc b/components/camel-flatpack/src/main/docs/flatpack-component.adoc
index 1614fb1..2571184 100644
--- a/components/camel-flatpack/src/main/docs/flatpack-component.adoc
+++ b/components/camel-flatpack/src/main/docs/flatpack-component.adoc
@@ -102,8 +102,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-ftp/src/main/docs/ftp-component.adoc b/components/camel-ftp/src/main/docs/ftp-component.adoc
index 44ce54d..abd50c9 100644
--- a/components/camel-ftp/src/main/docs/ftp-component.adoc
+++ b/components/camel-ftp/src/main/docs/ftp-component.adoc
@@ -207,8 +207,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-ftp/src/main/docs/ftps-component.adoc b/components/camel-ftp/src/main/docs/ftps-component.adoc
index 726cb2a..456504a 100644
--- a/components/camel-ftp/src/main/docs/ftps-component.adoc
+++ b/components/camel-ftp/src/main/docs/ftps-component.adoc
@@ -166,8 +166,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-ftp/src/main/docs/sftp-component.adoc b/components/camel-ftp/src/main/docs/sftp-component.adoc
index 444520d..4c3efd7 100644
--- a/components/camel-ftp/src/main/docs/sftp-component.adoc
+++ b/components/camel-ftp/src/main/docs/sftp-component.adoc
@@ -162,8 +162,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc b/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
index 74b68ff..864ddcc 100644
--- a/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
+++ b/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
@@ -112,8 +112,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc b/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
index 86c648a..4cbd6b0 100644
--- a/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
+++ b/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
@@ -108,8 +108,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
index bf3eb89..0607955 100644
--- a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
+++ b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
@@ -114,8 +114,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-hdfs/src/main/docs/hdfs-component.adoc b/components/camel-hdfs/src/main/docs/hdfs-component.adoc
index d6c1721..d2a5d8d 100644
--- a/components/camel-hdfs/src/main/docs/hdfs-component.adoc
+++ b/components/camel-hdfs/src/main/docs/hdfs-component.adoc
@@ -134,8 +134,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-hipchat/src/main/docs/hipchat-component.adoc b/components/camel-hipchat/src/main/docs/hipchat-component.adoc
index 6e37236..d94d65f 100644
--- a/components/camel-hipchat/src/main/docs/hipchat-component.adoc
+++ b/components/camel-hipchat/src/main/docs/hipchat-component.adoc
@@ -90,8 +90,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-ironmq/src/main/docs/ironmq-component.adoc b/components/camel-ironmq/src/main/docs/ironmq-component.adoc
index a90a236..bd3b19a 100644
--- a/components/camel-ironmq/src/main/docs/ironmq-component.adoc
+++ b/components/camel-ironmq/src/main/docs/ironmq-component.adoc
@@ -92,8 +92,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-jdbc/src/main/docs/jdbc-component.adoc b/components/camel-jdbc/src/main/docs/jdbc-component.adoc
index b676437..5fdc08a 100644
--- a/components/camel-jdbc/src/main/docs/jdbc-component.adoc
+++ b/components/camel-jdbc/src/main/docs/jdbc-component.adoc
@@ -242,7 +242,7 @@ from("direct:hello")
 
 If we want to poll a database using the JDBC component, we need to
 combine it with a polling scheduler such as the xref:timer-component.adoc[Timer]
-or xref:quartz2-component.adoc[Quartz] etc. In the following example, we retrieve
+or xref:quartz-component.adoc[Quartz] etc. In the following example, we retrieve
 data from the database every 60 seconds:
 
 [source,java]
diff --git a/components/camel-jooq/src/main/docs/jooq-component.adoc b/components/camel-jooq/src/main/docs/jooq-component.adoc
index ccb88bb..61c72e0 100644
--- a/components/camel-jooq/src/main/docs/jooq-component.adoc
+++ b/components/camel-jooq/src/main/docs/jooq-component.adoc
@@ -98,8 +98,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-jpa/src/main/docs/jpa-component.adoc b/components/camel-jpa/src/main/docs/jpa-component.adoc
index 4613901..09ac587 100644
--- a/components/camel-jpa/src/main/docs/jpa-component.adoc
+++ b/components/camel-jpa/src/main/docs/jpa-component.adoc
@@ -182,8 +182,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-jt400/src/main/docs/jt400-component.adoc b/components/camel-jt400/src/main/docs/jt400-component.adoc
index ff1fe01..a1dd862 100644
--- a/components/camel-jt400/src/main/docs/jt400-component.adoc
+++ b/components/camel-jt400/src/main/docs/jt400-component.adoc
@@ -107,8 +107,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-mail/src/main/docs/mail-component.adoc b/components/camel-mail/src/main/docs/mail-component.adoc
index af7d773..1fe6255 100644
--- a/components/camel-mail/src/main/docs/mail-component.adoc
+++ b/components/camel-mail/src/main/docs/mail-component.adoc
@@ -190,8 +190,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-mybatis/src/main/docs/mybatis-component.adoc b/components/camel-mybatis/src/main/docs/mybatis-component.adoc
index e0bab9e..55e0656 100644
--- a/components/camel-mybatis/src/main/docs/mybatis-component.adoc
+++ b/components/camel-mybatis/src/main/docs/mybatis-component.adoc
@@ -108,8 +108,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-pg-replication-slot/src/main/docs/pg-replication-slot-component.adoc b/components/camel-pg-replication-slot/src/main/docs/pg-replication-slot-component.adoc
index e4cca32..c60a921 100644
--- a/components/camel-pg-replication-slot/src/main/docs/pg-replication-slot-component.adoc
+++ b/components/camel-pg-replication-slot/src/main/docs/pg-replication-slot-component.adoc
@@ -99,8 +99,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-quartz/src/main/docs/quartz-component.adoc b/components/camel-quartz/src/main/docs/quartz-component.adoc
index a71bfed..bcda1ba 100644
--- a/components/camel-quartz/src/main/docs/quartz-component.adoc
+++ b/components/camel-quartz/src/main/docs/quartz-component.adoc
@@ -44,7 +44,7 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The Quartz2 component supports 12 options, which are listed below.
+The Quartz component supports 12 options, which are listed below.
 
 
 
@@ -70,10 +70,10 @@ The Quartz2 component supports 12 options, which are listed below.
 
 
 // endpoint options: START
-The Quartz2 endpoint is configured using URI syntax:
+The Quartz endpoint is configured using URI syntax:
 
 ----
-quartz2:groupName/triggerName
+quartz:groupName/triggerName
 ----
 
 with the following path and query parameters:
@@ -126,7 +126,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 <dependency>
   <groupId>org.apache.camel</groupId>
-  <artifactId>camel-quartz2-starter</artifactId>
+  <artifactId>camel-quartz-starter</artifactId>
   <version>x.x.x</version>
   <!-- use the same version as your Camel core version -->
 </dependency>
@@ -140,19 +140,19 @@ The component supports 13 options, which are listed below.
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *camel.component.quartz2.auto-start-scheduler* | Whether or not the scheduler should be auto started. This options is default true | true | Boolean
-| *camel.component.quartz2.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
-| *camel.component.quartz2.enable-jmx* | Whether to enable Quartz JMX which allows to manage the Quartz scheduler from JMX. This options is default true | true | Boolean
-| *camel.component.quartz2.enabled* | Enable quartz2 component | true | Boolean
-| *camel.component.quartz2.interrupt-jobs-on-shutdown* | Whether to interrupt jobs on shutdown which forces the scheduler to shutdown quicker and attempt to interrupt any running jobs. If this is enabled then any running jobs can fail due to being interrupted. | false | Boolean
-| *camel.component.quartz2.prefix-instance-name* | Whether to prefix the Quartz Scheduler instance name with the CamelContext name. This is enabled by default, to let each CamelContext use its own Quartz scheduler instance by default. You can set this option to false to reuse Quartz scheduler instances between multiple CamelContext's. | true | Boolean
-| *camel.component.quartz2.prefix-job-name-with-endpoint-id* | Whether to prefix the quartz job with the endpoint id. This option is default false. | false | Boolean
-| *camel.component.quartz2.properties* | Properties to configure the Quartz scheduler. The option is a java.util.Properties type. |  | String
-| *camel.component.quartz2.properties-file* | File name of the properties to load from the classpath |  | String
-| *camel.component.quartz2.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
-| *camel.component.quartz2.scheduler* | To use the custom configured Quartz scheduler, instead of creating a new Scheduler. The option is a org.quartz.Scheduler type. |  | String
-| *camel.component.quartz2.scheduler-factory* | To use the custom SchedulerFactory which is used to create the Scheduler. The option is a org.quartz.SchedulerFactory type. |  | String
-| *camel.component.quartz2.start-delayed-seconds* | Seconds to wait before starting the quartz scheduler. |  | Integer
+| *camel.component.quartz.auto-start-scheduler* | Whether or not the scheduler should be auto started. This options is default true | true | Boolean
+| *camel.component.quartz.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
+| *camel.component.quartz.enable-jmx* | Whether to enable Quartz JMX which allows to manage the Quartz scheduler from JMX. This options is default true | true | Boolean
+| *camel.component.quartz.enabled* | Whether to enable auto configuration of the quartz component. This is enabled by default. |  | Boolean
+| *camel.component.quartz.interrupt-jobs-on-shutdown* | Whether to interrupt jobs on shutdown which forces the scheduler to shutdown quicker and attempt to interrupt any running jobs. If this is enabled then any running jobs can fail due to being interrupted. | false | Boolean
+| *camel.component.quartz.prefix-instance-name* | Whether to prefix the Quartz Scheduler instance name with the CamelContext name. This is enabled by default, to let each CamelContext use its own Quartz scheduler instance by default. You can set this option to false to reuse Quartz scheduler instances between multiple CamelContext's. | true | Boolean
+| *camel.component.quartz.prefix-job-name-with-endpoint-id* | Whether to prefix the quartz job with the endpoint id. This option is default false. | false | Boolean
+| *camel.component.quartz.properties* | Properties to configure the Quartz scheduler. The option is a java.util.Properties type. |  | String
+| *camel.component.quartz.properties-file* | File name of the properties to load from the classpath |  | String
+| *camel.component.quartz.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
+| *camel.component.quartz.scheduler* | To use the custom configured Quartz scheduler, instead of creating a new Scheduler. The option is a org.quartz.Scheduler type. |  | String
+| *camel.component.quartz.scheduler-factory* | To use the custom SchedulerFactory which is used to create the Scheduler. The option is a org.quartz.SchedulerFactory type. |  | String
+| *camel.component.quartz.start-delayed-seconds* | Seconds to wait before starting the quartz scheduler. |  | Integer
 |===
 // spring-boot-auto-configure options: END
 
diff --git a/components/camel-rss/src/main/docs/rss-component.adoc b/components/camel-rss/src/main/docs/rss-component.adoc
index c9ed102..51f91be 100644
--- a/components/camel-rss/src/main/docs/rss-component.adoc
+++ b/components/camel-rss/src/main/docs/rss-component.adoc
@@ -105,8 +105,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-saxon/src/main/docs/xquery-component.adoc b/components/camel-saxon/src/main/docs/xquery-component.adoc
index 97d683d..008d0c2 100644
--- a/components/camel-saxon/src/main/docs/xquery-component.adoc
+++ b/components/camel-saxon/src/main/docs/xquery-component.adoc
@@ -87,8 +87,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-scheduler/src/main/docs/scheduler-component.adoc b/components/camel-scheduler/src/main/docs/scheduler-component.adoc
index d0496dd..b085407 100644
--- a/components/camel-scheduler/src/main/docs/scheduler-component.adoc
+++ b/components/camel-scheduler/src/main/docs/scheduler-component.adoc
@@ -87,8 +87,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
@@ -193,4 +193,4 @@ exchange.
 == See Also
 
 * xref:timer-component.adoc[Timer]
-* xref:quartz2-component.adoc[Quartz]
+* xref:quartz-component.adoc[Quartz]
diff --git a/components/camel-slack/src/main/docs/slack-component.adoc b/components/camel-slack/src/main/docs/slack-component.adoc
index f7adcd9..054e794 100644
--- a/components/camel-slack/src/main/docs/slack-component.adoc
+++ b/components/camel-slack/src/main/docs/slack-component.adoc
@@ -107,8 +107,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-snmp/src/main/docs/snmp-component.adoc b/components/camel-snmp/src/main/docs/snmp-component.adoc
index aabb12a..ca7dd87 100644
--- a/components/camel-snmp/src/main/docs/snmp-component.adoc
+++ b/components/camel-snmp/src/main/docs/snmp-component.adoc
@@ -108,8 +108,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-splunk/src/main/docs/splunk-component.adoc b/components/camel-splunk/src/main/docs/splunk-component.adoc
index a6d6145..c5ff212 100644
--- a/components/camel-splunk/src/main/docs/splunk-component.adoc
+++ b/components/camel-splunk/src/main/docs/splunk-component.adoc
@@ -163,8 +163,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-sql/src/main/docs/sql-component.adoc b/components/camel-sql/src/main/docs/sql-component.adoc
index 47882b6..9bd2788 100644
--- a/components/camel-sql/src/main/docs/sql-component.adoc
+++ b/components/camel-sql/src/main/docs/sql-component.adoc
@@ -189,8 +189,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-ssh/src/main/docs/ssh-component.adoc b/components/camel-ssh/src/main/docs/ssh-component.adoc
index f808e7d..1e955cb 100644
--- a/components/camel-ssh/src/main/docs/ssh-component.adoc
+++ b/components/camel-ssh/src/main/docs/ssh-component.adoc
@@ -109,8 +109,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-telegram/src/main/docs/telegram-component.adoc b/components/camel-telegram/src/main/docs/telegram-component.adoc
index 2b54dd8..506d31f 100644
--- a/components/camel-telegram/src/main/docs/telegram-component.adoc
+++ b/components/camel-telegram/src/main/docs/telegram-component.adoc
@@ -104,8 +104,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-timer/src/main/docs/timer-component.adoc b/components/camel-timer/src/main/docs/timer-component.adoc
index b0b751c..e83b32c 100644
--- a/components/camel-timer/src/main/docs/timer-component.adoc
+++ b/components/camel-timer/src/main/docs/timer-component.adoc
@@ -24,7 +24,7 @@ You can append query options to the URI in the following format,
 `exchange.getIn().getBody()` returns `null`.
 
 TIP:*Advanced Scheduler*
-See also the xref:quartz2-component.adoc[Quartz] component that supports much more
+See also the xref:quartz-component.adoc[Quartz] component that supports much more
 advanced scheduling.
 
 TIP:*Specify time in human friendly format*
@@ -206,4 +206,4 @@ starting the route. To do that you use the repeatCount option as shown:
 == See Also
 
 * xref:scheduler-component.adoc[Scheduler]
-* xref:quartz2-component.adoc[Quartz]
+* xref:quartz-component.adoc[Quartz]
diff --git a/components/camel-twitter/src/main/docs/twitter-directmessage-component.adoc b/components/camel-twitter/src/main/docs/twitter-directmessage-component.adoc
index dd5a394..f19ef61 100644
--- a/components/camel-twitter/src/main/docs/twitter-directmessage-component.adoc
+++ b/components/camel-twitter/src/main/docs/twitter-directmessage-component.adoc
@@ -86,8 +86,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-twitter/src/main/docs/twitter-search-component.adoc b/components/camel-twitter/src/main/docs/twitter-search-component.adoc
index 6577881..7419209 100644
--- a/components/camel-twitter/src/main/docs/twitter-search-component.adoc
+++ b/components/camel-twitter/src/main/docs/twitter-search-component.adoc
@@ -95,8 +95,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-twitter/src/main/docs/twitter-streaming-component.adoc b/components/camel-twitter/src/main/docs/twitter-streaming-component.adoc
index eca8253..99852d4 100644
--- a/components/camel-twitter/src/main/docs/twitter-streaming-component.adoc
+++ b/components/camel-twitter/src/main/docs/twitter-streaming-component.adoc
@@ -86,8 +86,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-twitter/src/main/docs/twitter-timeline-component.adoc b/components/camel-twitter/src/main/docs/twitter-timeline-component.adoc
index 89cb3d1..4d9ca89 100644
--- a/components/camel-twitter/src/main/docs/twitter-timeline-component.adoc
+++ b/components/camel-twitter/src/main/docs/twitter-timeline-component.adoc
@@ -87,8 +87,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-weather/src/main/docs/weather-component.adoc b/components/camel-weather/src/main/docs/weather-component.adoc
index ab9bd6a..d30db75 100644
--- a/components/camel-weather/src/main/docs/weather-component.adoc
+++ b/components/camel-weather/src/main/docs/weather-component.adoc
@@ -113,8 +113,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/camel-yammer/src/main/docs/yammer-component.adoc b/components/camel-yammer/src/main/docs/yammer-component.adoc
index 76322e5..6e35cda 100644
--- a/components/camel-yammer/src/main/docs/yammer-component.adoc
+++ b/components/camel-yammer/src/main/docs/yammer-component.adoc
@@ -114,8 +114,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/components/readme.adoc b/components/readme.adoc
index c4c26b7..ec107ac 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -679,8 +679,8 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated)
 | link:camel-pubnub/src/main/docs/pubnub-component.adoc[PubNub] (camel-pubnub) +
 `pubnub:channel` | 2.19 | To send and receive messages to PubNub data stream network for connected devices.
 
-| link:camel-quartz2/src/main/docs/quartz2-component.adoc[Quartz2] (camel-quartz2) +
-`quartz2:groupName/triggerName` | 2.12 | Provides a scheduled delivery of messages using the Quartz 2.x scheduler.
+| link:camel-quartz/src/main/docs/quartz-component.adoc[Quartz] (camel-quartz) +
+`quartz:groupName/triggerName` | 2.12 | Provides a scheduled delivery of messages using the Quartz 2.x scheduler.
 
 | link:camel-quickfix/src/main/docs/quickfix-component.adoc[QuickFix] (camel-quickfix) +
 `quickfix:configurationName` | 2.1 | The quickfix component allows to send Financial Interchange (FIX) messages to the QuickFix engine.
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ApnsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ApnsEndpointBuilderFactory.java
index d9236b1..71c10f9 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ApnsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ApnsEndpointBuilderFactory.java
@@ -341,7 +341,7 @@ public interface ApnsEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -356,7 +356,7 @@ public interface ApnsEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -371,7 +371,7 @@ public interface ApnsEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -385,7 +385,7 @@ public interface ApnsEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanstalkEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanstalkEndpointBuilderFactory.java
index f47ebe5..e038c14 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanstalkEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/BeanstalkEndpointBuilderFactory.java
@@ -512,7 +512,7 @@ public interface BeanstalkEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -527,7 +527,7 @@ public interface BeanstalkEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -542,7 +542,7 @@ public interface BeanstalkEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -556,7 +556,7 @@ public interface BeanstalkEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java
index 676075d..8dbc48f 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java
@@ -512,7 +512,7 @@ public interface CassandraEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -527,7 +527,7 @@ public interface CassandraEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -542,7 +542,7 @@ public interface CassandraEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -556,7 +556,7 @@ public interface CassandraEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java
index 86a5000..828f163 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java
@@ -477,7 +477,7 @@ public interface CouchbaseEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -492,7 +492,7 @@ public interface CouchbaseEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -507,7 +507,7 @@ public interface CouchbaseEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -521,7 +521,7 @@ public interface CouchbaseEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElsqlEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElsqlEndpointBuilderFactory.java
index 95ebef2..59a0c4c 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElsqlEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ElsqlEndpointBuilderFactory.java
@@ -709,7 +709,7 @@ public interface ElsqlEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -724,7 +724,7 @@ public interface ElsqlEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -739,7 +739,7 @@ public interface ElsqlEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -753,7 +753,7 @@ public interface ElsqlEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EtcdEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EtcdEndpointBuilderFactory.java
index ffe70a9..002e0a1 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EtcdEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/EtcdEndpointBuilderFactory.java
@@ -420,7 +420,7 @@ public interface EtcdEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -435,7 +435,7 @@ public interface EtcdEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -450,7 +450,7 @@ public interface EtcdEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -464,7 +464,7 @@ public interface EtcdEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
index e2ccc7d..1eaec3c 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
@@ -1526,7 +1526,7 @@ public interface FileEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -1541,7 +1541,7 @@ public interface FileEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -1556,7 +1556,7 @@ public interface FileEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -1570,7 +1570,7 @@ public interface FileEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlatpackEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlatpackEndpointBuilderFactory.java
index 58e7cbe..f026959 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlatpackEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FlatpackEndpointBuilderFactory.java
@@ -477,7 +477,7 @@ public interface FlatpackEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -492,7 +492,7 @@ public interface FlatpackEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -507,7 +507,7 @@ public interface FlatpackEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -521,7 +521,7 @@ public interface FlatpackEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
index afb4732..c89c932 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
@@ -1636,7 +1636,7 @@ public interface FtpEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -1651,7 +1651,7 @@ public interface FtpEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -1666,7 +1666,7 @@ public interface FtpEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -1680,7 +1680,7 @@ public interface FtpEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
index c27dbc0..30e2d02 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
@@ -1638,7 +1638,7 @@ public interface FtpsEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -1653,7 +1653,7 @@ public interface FtpsEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -1668,7 +1668,7 @@ public interface FtpsEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -1682,7 +1682,7 @@ public interface FtpsEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java
index 95b894c..04ebdb0 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java
@@ -487,7 +487,7 @@ public interface HdfsEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -502,7 +502,7 @@ public interface HdfsEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -517,7 +517,7 @@ public interface HdfsEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -531,7 +531,7 @@ public interface HdfsEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HipchatEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HipchatEndpointBuilderFactory.java
index 57a6260..6f9e5ef 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HipchatEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HipchatEndpointBuilderFactory.java
@@ -379,7 +379,7 @@ public interface HipchatEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -394,7 +394,7 @@ public interface HipchatEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -409,7 +409,7 @@ public interface HipchatEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -423,7 +423,7 @@ public interface HipchatEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IronMQEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IronMQEndpointBuilderFactory.java
index 120692f..5a44eff 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IronMQEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/IronMQEndpointBuilderFactory.java
@@ -540,7 +540,7 @@ public interface IronMQEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -555,7 +555,7 @@ public interface IronMQEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -570,7 +570,7 @@ public interface IronMQEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -584,7 +584,7 @@ public interface IronMQEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JooqEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JooqEndpointBuilderFactory.java
index 4fa6166..3de8925 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JooqEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JooqEndpointBuilderFactory.java
@@ -352,7 +352,7 @@ public interface JooqEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -367,7 +367,7 @@ public interface JooqEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -382,7 +382,7 @@ public interface JooqEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -396,7 +396,7 @@ public interface JooqEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JpaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JpaEndpointBuilderFactory.java
index 0bf468f..797f5c8 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JpaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JpaEndpointBuilderFactory.java
@@ -677,7 +677,7 @@ public interface JpaEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -692,7 +692,7 @@ public interface JpaEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -707,7 +707,7 @@ public interface JpaEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -721,7 +721,7 @@ public interface JpaEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Jt400EndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Jt400EndpointBuilderFactory.java
index 2e5b283..2f1e7a4 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Jt400EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Jt400EndpointBuilderFactory.java
@@ -533,7 +533,7 @@ public interface Jt400EndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -548,7 +548,7 @@ public interface Jt400EndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -563,7 +563,7 @@ public interface Jt400EndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -577,7 +577,7 @@ public interface Jt400EndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisEndpointBuilderFactory.java
index f77b82d..3c3ea9b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/KinesisEndpointBuilderFactory.java
@@ -514,7 +514,7 @@ public interface KinesisEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -529,7 +529,7 @@ public interface KinesisEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -544,7 +544,7 @@ public interface KinesisEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -558,7 +558,7 @@ public interface KinesisEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MailEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MailEndpointBuilderFactory.java
index 1ed6891..af2507c 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MailEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MailEndpointBuilderFactory.java
@@ -695,7 +695,7 @@ public interface MailEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -710,7 +710,7 @@ public interface MailEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -725,7 +725,7 @@ public interface MailEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -739,7 +739,7 @@ public interface MailEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MyBatisEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MyBatisEndpointBuilderFactory.java
index 8eb7692..ec90958 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MyBatisEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/MyBatisEndpointBuilderFactory.java
@@ -447,7 +447,7 @@ public interface MyBatisEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -462,7 +462,7 @@ public interface MyBatisEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -477,7 +477,7 @@ public interface MyBatisEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -491,7 +491,7 @@ public interface MyBatisEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java
index d964551..0fbcc15 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java
@@ -642,7 +642,7 @@ public interface S3EndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -657,7 +657,7 @@ public interface S3EndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -672,7 +672,7 @@ public interface S3EndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -686,7 +686,7 @@ public interface S3EndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java
index 6936d0c..eb6be50 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java
@@ -1640,7 +1640,7 @@ public interface SftpEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -1655,7 +1655,7 @@ public interface SftpEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -1670,7 +1670,7 @@ public interface SftpEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -1684,7 +1684,7 @@ public interface SftpEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SlackEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SlackEndpointBuilderFactory.java
index a686427..6172911 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SlackEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SlackEndpointBuilderFactory.java
@@ -362,7 +362,7 @@ public interface SlackEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -377,7 +377,7 @@ public interface SlackEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -392,7 +392,7 @@ public interface SlackEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -406,7 +406,7 @@ public interface SlackEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SplunkEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SplunkEndpointBuilderFactory.java
index c5d3b97..9da499a 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SplunkEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SplunkEndpointBuilderFactory.java
@@ -522,7 +522,7 @@ public interface SplunkEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -537,7 +537,7 @@ public interface SplunkEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -552,7 +552,7 @@ public interface SplunkEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -566,7 +566,7 @@ public interface SplunkEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlEndpointBuilderFactory.java
index 5fe1948..b0e5a45 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqlEndpointBuilderFactory.java
@@ -674,7 +674,7 @@ public interface SqlEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -689,7 +689,7 @@ public interface SqlEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -704,7 +704,7 @@ public interface SqlEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -718,7 +718,7 @@ public interface SqlEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqsEndpointBuilderFactory.java
index 4163086..8fbf417 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SqsEndpointBuilderFactory.java
@@ -764,7 +764,7 @@ public interface SqsEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -779,7 +779,7 @@ public interface SqsEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -794,7 +794,7 @@ public interface SqsEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -808,7 +808,7 @@ public interface SqsEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SshEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SshEndpointBuilderFactory.java
index 0d2097b..e44b268 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SshEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/SshEndpointBuilderFactory.java
@@ -406,7 +406,7 @@ public interface SshEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -421,7 +421,7 @@ public interface SshEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -436,7 +436,7 @@ public interface SshEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -450,7 +450,7 @@ public interface SshEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TelegramEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TelegramEndpointBuilderFactory.java
index 8f72420..f04090b 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TelegramEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TelegramEndpointBuilderFactory.java
@@ -381,7 +381,7 @@ public interface TelegramEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -396,7 +396,7 @@ public interface TelegramEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -411,7 +411,7 @@ public interface TelegramEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -425,7 +425,7 @@ public interface TelegramEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterDirectMessageEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterDirectMessageEndpointBuilderFactory.java
index 49d9bec..585f745 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterDirectMessageEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterDirectMessageEndpointBuilderFactory.java
@@ -479,7 +479,7 @@ public interface TwitterDirectMessageEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -494,7 +494,7 @@ public interface TwitterDirectMessageEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -510,7 +510,7 @@ public interface TwitterDirectMessageEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -524,7 +524,7 @@ public interface TwitterDirectMessageEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterSearchEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterSearchEndpointBuilderFactory.java
index 646401f..01cbecb 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterSearchEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterSearchEndpointBuilderFactory.java
@@ -472,7 +472,7 @@ public interface TwitterSearchEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -487,7 +487,7 @@ public interface TwitterSearchEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -502,7 +502,7 @@ public interface TwitterSearchEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -516,7 +516,7 @@ public interface TwitterSearchEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterTimelineEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterTimelineEndpointBuilderFactory.java
index 4467726..635e432 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterTimelineEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/TwitterTimelineEndpointBuilderFactory.java
@@ -486,7 +486,7 @@ public interface TwitterTimelineEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -501,7 +501,7 @@ public interface TwitterTimelineEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -517,7 +517,7 @@ public interface TwitterTimelineEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -531,7 +531,7 @@ public interface TwitterTimelineEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WeatherEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WeatherEndpointBuilderFactory.java
index 8681ddb..e2eeae0 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WeatherEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/WeatherEndpointBuilderFactory.java
@@ -466,7 +466,7 @@ public interface WeatherEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -481,7 +481,7 @@ public interface WeatherEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -496,7 +496,7 @@ public interface WeatherEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -510,7 +510,7 @@ public interface WeatherEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XQueryEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XQueryEndpointBuilderFactory.java
index 23d54f2..9c9f95e 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XQueryEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/XQueryEndpointBuilderFactory.java
@@ -467,7 +467,7 @@ public interface XQueryEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -482,7 +482,7 @@ public interface XQueryEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -497,7 +497,7 @@ public interface XQueryEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -511,7 +511,7 @@ public interface XQueryEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/YammerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/YammerEndpointBuilderFactory.java
index c8257fb..b2ebe54 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/YammerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/YammerEndpointBuilderFactory.java
@@ -463,7 +463,7 @@ public interface YammerEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option is a:
@@ -478,7 +478,7 @@ public interface YammerEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a cron scheduler from either camel-spring or camel-quartz2
+         * To use a cron scheduler from either camel-spring or camel-quartz
          * component.
          * 
          * The option will be converted to a
@@ -493,7 +493,7 @@ public interface YammerEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
@@ -507,7 +507,7 @@ public interface YammerEndpointBuilderFactory {
         }
         /**
          * To configure additional properties when using a custom scheduler or
-         * any of the Quartz2, Spring based scheduler.
+         * any of the Quartz, Spring based scheduler.
          * 
          * The option will be converted to a
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc
index da5e605..807cdff 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -272,7 +272,7 @@
 * xref:protobuf-dataformat.adoc[Protobuf DataFormat]
 * xref:pubnub-component.adoc[PubNub Component]
 * xref:pulsar-component.adoc[Apache Pulsar Component]
-* xref:quartz2-component.adoc[Quartz2 Component]
+* xref:quartz-component.adoc[Quartz Component]
 * xref:quickfix-component.adoc[QuickFix Component]
 * xref:rabbitmq-component.adoc[RabbitMQ Component]
 * xref:reactive-executor-vertx.adoc[ReactiveExecutor VertX]
diff --git a/docs/components/modules/ROOT/pages/apns-component.adoc b/docs/components/modules/ROOT/pages/apns-component.adoc
index 64f4a17..7cbc06d 100644
--- a/docs/components/modules/ROOT/pages/apns-component.adoc
+++ b/docs/components/modules/ROOT/pages/apns-component.adoc
@@ -110,8 +110,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/atom-component.adoc b/docs/components/modules/ROOT/pages/atom-component.adoc
index 0dac79b..c525493 100644
--- a/docs/components/modules/ROOT/pages/atom-component.adoc
+++ b/docs/components/modules/ROOT/pages/atom-component.adoc
@@ -97,8 +97,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/aws-ddbstream-component.adoc b/docs/components/modules/ROOT/pages/aws-ddbstream-component.adoc
index 1c522fe..a0d5f43 100644
--- a/docs/components/modules/ROOT/pages/aws-ddbstream-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-ddbstream-component.adoc
@@ -95,8 +95,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/aws-kinesis-component.adoc b/docs/components/modules/ROOT/pages/aws-kinesis-component.adoc
index ee13b46..c1cb1f3 100644
--- a/docs/components/modules/ROOT/pages/aws-kinesis-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-kinesis-component.adoc
@@ -99,8 +99,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/aws-s3-component.adoc b/docs/components/modules/ROOT/pages/aws-s3-component.adoc
index 2882a2e..e742444 100644
--- a/docs/components/modules/ROOT/pages/aws-s3-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-s3-component.adoc
@@ -135,8 +135,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/aws-sqs-component.adoc b/docs/components/modules/ROOT/pages/aws-sqs-component.adoc
index 9d62f5e..8393c61 100644
--- a/docs/components/modules/ROOT/pages/aws-sqs-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-sqs-component.adoc
@@ -116,8 +116,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/beanstalk-component.adoc b/docs/components/modules/ROOT/pages/beanstalk-component.adoc
index 9ea222e..4eeb521 100644
--- a/docs/components/modules/ROOT/pages/beanstalk-component.adoc
+++ b/docs/components/modules/ROOT/pages/beanstalk-component.adoc
@@ -121,8 +121,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/couchbase-component.adoc b/docs/components/modules/ROOT/pages/couchbase-component.adoc
index 8fd9e28..7fc8ab9 100644
--- a/docs/components/modules/ROOT/pages/couchbase-component.adoc
+++ b/docs/components/modules/ROOT/pages/couchbase-component.adoc
@@ -111,8 +111,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/cql-component.adoc b/docs/components/modules/ROOT/pages/cql-component.adoc
index 7f26053..8b72cc3 100644
--- a/docs/components/modules/ROOT/pages/cql-component.adoc
+++ b/docs/components/modules/ROOT/pages/cql-component.adoc
@@ -123,8 +123,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/elsql-component.adoc b/docs/components/modules/ROOT/pages/elsql-component.adoc
index 5197a1b..ab1ba1a 100644
--- a/docs/components/modules/ROOT/pages/elsql-component.adoc
+++ b/docs/components/modules/ROOT/pages/elsql-component.adoc
@@ -138,8 +138,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/etcd-component.adoc b/docs/components/modules/ROOT/pages/etcd-component.adoc
index cce49ea..33b2aa3 100644
--- a/docs/components/modules/ROOT/pages/etcd-component.adoc
+++ b/docs/components/modules/ROOT/pages/etcd-component.adoc
@@ -82,8 +82,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/file-component.adoc b/docs/components/modules/ROOT/pages/file-component.adoc
index daa2125..09d8074 100644
--- a/docs/components/modules/ROOT/pages/file-component.adoc
+++ b/docs/components/modules/ROOT/pages/file-component.adoc
@@ -173,8 +173,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/flatpack-component.adoc b/docs/components/modules/ROOT/pages/flatpack-component.adoc
index 1614fb1..2571184 100644
--- a/docs/components/modules/ROOT/pages/flatpack-component.adoc
+++ b/docs/components/modules/ROOT/pages/flatpack-component.adoc
@@ -102,8 +102,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/ftp-component.adoc b/docs/components/modules/ROOT/pages/ftp-component.adoc
index 44ce54d..abd50c9 100644
--- a/docs/components/modules/ROOT/pages/ftp-component.adoc
+++ b/docs/components/modules/ROOT/pages/ftp-component.adoc
@@ -207,8 +207,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/ftps-component.adoc b/docs/components/modules/ROOT/pages/ftps-component.adoc
index 4722341..64fb74b 100644
--- a/docs/components/modules/ROOT/pages/ftps-component.adoc
+++ b/docs/components/modules/ROOT/pages/ftps-component.adoc
@@ -170,8 +170,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc b/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc
index 74b68ff..864ddcc 100644
--- a/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc
@@ -112,8 +112,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc b/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc
index 86c648a..4cbd6b0 100644
--- a/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc
@@ -108,8 +108,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/google-sheets-stream-component.adoc b/docs/components/modules/ROOT/pages/google-sheets-stream-component.adoc
index bf3eb89..0607955 100644
--- a/docs/components/modules/ROOT/pages/google-sheets-stream-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-sheets-stream-component.adoc
@@ -114,8 +114,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/hdfs-component.adoc b/docs/components/modules/ROOT/pages/hdfs-component.adoc
index d6c1721..d2a5d8d 100644
--- a/docs/components/modules/ROOT/pages/hdfs-component.adoc
+++ b/docs/components/modules/ROOT/pages/hdfs-component.adoc
@@ -134,8 +134,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/hipchat-component.adoc b/docs/components/modules/ROOT/pages/hipchat-component.adoc
index 6e37236..d94d65f 100644
--- a/docs/components/modules/ROOT/pages/hipchat-component.adoc
+++ b/docs/components/modules/ROOT/pages/hipchat-component.adoc
@@ -90,8 +90,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/ironmq-component.adoc b/docs/components/modules/ROOT/pages/ironmq-component.adoc
index a90a236..bd3b19a 100644
--- a/docs/components/modules/ROOT/pages/ironmq-component.adoc
+++ b/docs/components/modules/ROOT/pages/ironmq-component.adoc
@@ -92,8 +92,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/jdbc-component.adoc b/docs/components/modules/ROOT/pages/jdbc-component.adoc
index b676437..5fdc08a 100644
--- a/docs/components/modules/ROOT/pages/jdbc-component.adoc
+++ b/docs/components/modules/ROOT/pages/jdbc-component.adoc
@@ -242,7 +242,7 @@ from("direct:hello")
 
 If we want to poll a database using the JDBC component, we need to
 combine it with a polling scheduler such as the xref:timer-component.adoc[Timer]
-or xref:quartz2-component.adoc[Quartz] etc. In the following example, we retrieve
+or xref:quartz-component.adoc[Quartz] etc. In the following example, we retrieve
 data from the database every 60 seconds:
 
 [source,java]
diff --git a/docs/components/modules/ROOT/pages/jooq-component.adoc b/docs/components/modules/ROOT/pages/jooq-component.adoc
index ccb88bb..61c72e0 100644
--- a/docs/components/modules/ROOT/pages/jooq-component.adoc
+++ b/docs/components/modules/ROOT/pages/jooq-component.adoc
@@ -98,8 +98,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/jpa-component.adoc b/docs/components/modules/ROOT/pages/jpa-component.adoc
index 4613901..09ac587 100644
--- a/docs/components/modules/ROOT/pages/jpa-component.adoc
+++ b/docs/components/modules/ROOT/pages/jpa-component.adoc
@@ -182,8 +182,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/jt400-component.adoc b/docs/components/modules/ROOT/pages/jt400-component.adoc
index ff1fe01..a1dd862 100644
--- a/docs/components/modules/ROOT/pages/jt400-component.adoc
+++ b/docs/components/modules/ROOT/pages/jt400-component.adoc
@@ -107,8 +107,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/mail-component.adoc b/docs/components/modules/ROOT/pages/mail-component.adoc
index af7d773..1fe6255 100644
--- a/docs/components/modules/ROOT/pages/mail-component.adoc
+++ b/docs/components/modules/ROOT/pages/mail-component.adoc
@@ -190,8 +190,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/mybatis-component.adoc b/docs/components/modules/ROOT/pages/mybatis-component.adoc
index e0bab9e..55e0656 100644
--- a/docs/components/modules/ROOT/pages/mybatis-component.adoc
+++ b/docs/components/modules/ROOT/pages/mybatis-component.adoc
@@ -108,8 +108,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/pg-replication-slot-component.adoc b/docs/components/modules/ROOT/pages/pg-replication-slot-component.adoc
index e4cca32..c60a921 100644
--- a/docs/components/modules/ROOT/pages/pg-replication-slot-component.adoc
+++ b/docs/components/modules/ROOT/pages/pg-replication-slot-component.adoc
@@ -99,8 +99,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/quartz2-component.adoc b/docs/components/modules/ROOT/pages/quartz-component.adoc
similarity index 80%
rename from docs/components/modules/ROOT/pages/quartz2-component.adoc
rename to docs/components/modules/ROOT/pages/quartz-component.adoc
index ed9cf19..bcda1ba 100644
--- a/docs/components/modules/ROOT/pages/quartz2-component.adoc
+++ b/docs/components/modules/ROOT/pages/quartz-component.adoc
@@ -1,9 +1,9 @@
-[[quartz2-component]]
-= Quartz2 Component
+[[quartz-component]]
+= Quartz Component
 
 *Available as of Camel version 2.12*
 
-The Quartz2 component provides a scheduled delivery of messages using
+The Quartz component provides a scheduled delivery of messages using
 the http://www.quartz-scheduler.org/[Quartz Scheduler 2.x].  +
  Each endpoint represents a different timer (in Quartz terms, a Trigger
 and JobDetail).
@@ -15,7 +15,7 @@ for this component:
 ------------------------------------------------------------
 <dependency>
     <groupId>org.apache.camel</groupId>
-    <artifactId>camel-quartz2</artifactId>
+    <artifactId>camel-quartz</artifactId>
     <version>x.x.x</version>
     <!-- use the same version as your Camel core version -->
 </dependency>
@@ -25,10 +25,10 @@ for this component:
 == URI format
 
 ----
-quartz2://timerName?options
-quartz2://groupName/timerName?options
-quartz2://groupName/timerName?cron=expression
-quartz2://timerName?cron=expression
+quartz://timerName?options
+quartz://groupName/timerName?options
+quartz://groupName/timerName?cron=expression
+quartz://timerName?cron=expression
 ----
 
 The component uses either a `CronTrigger` or a `SimpleTrigger`. If no
@@ -44,7 +44,7 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The Quartz2 component supports 12 options, which are listed below.
+The Quartz component supports 12 options, which are listed below.
 
 
 
@@ -70,10 +70,10 @@ The Quartz2 component supports 12 options, which are listed below.
 
 
 // endpoint options: START
-The Quartz2 endpoint is configured using URI syntax:
+The Quartz endpoint is configured using URI syntax:
 
 ----
-quartz2:groupName/triggerName
+quartz:groupName/triggerName
 ----
 
 with the following path and query parameters:
@@ -126,7 +126,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 <dependency>
   <groupId>org.apache.camel</groupId>
-  <artifactId>camel-quartz2-starter</artifactId>
+  <artifactId>camel-quartz-starter</artifactId>
   <version>x.x.x</version>
   <!-- use the same version as your Camel core version -->
 </dependency>
@@ -140,19 +140,19 @@ The component supports 13 options, which are listed below.
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *camel.component.quartz2.auto-start-scheduler* | Whether or not the scheduler should be auto started. This options is default true | true | Boolean
-| *camel.component.quartz2.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
-| *camel.component.quartz2.enable-jmx* | Whether to enable Quartz JMX which allows to manage the Quartz scheduler from JMX. This options is default true | true | Boolean
-| *camel.component.quartz2.enabled* | Enable quartz2 component | true | Boolean
-| *camel.component.quartz2.interrupt-jobs-on-shutdown* | Whether to interrupt jobs on shutdown which forces the scheduler to shutdown quicker and attempt to interrupt any running jobs. If this is enabled then any running jobs can fail due to being interrupted. | false | Boolean
-| *camel.component.quartz2.prefix-instance-name* | Whether to prefix the Quartz Scheduler instance name with the CamelContext name. This is enabled by default, to let each CamelContext use its own Quartz scheduler instance by default. You can set this option to false to reuse Quartz scheduler instances between multiple CamelContext's. | true | Boolean
-| *camel.component.quartz2.prefix-job-name-with-endpoint-id* | Whether to prefix the quartz job with the endpoint id. This option is default false. | false | Boolean
-| *camel.component.quartz2.properties* | Properties to configure the Quartz scheduler. The option is a java.util.Properties type. |  | String
-| *camel.component.quartz2.properties-file* | File name of the properties to load from the classpath |  | String
-| *camel.component.quartz2.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
-| *camel.component.quartz2.scheduler* | To use the custom configured Quartz scheduler, instead of creating a new Scheduler. The option is a org.quartz.Scheduler type. |  | String
-| *camel.component.quartz2.scheduler-factory* | To use the custom SchedulerFactory which is used to create the Scheduler. The option is a org.quartz.SchedulerFactory type. |  | String
-| *camel.component.quartz2.start-delayed-seconds* | Seconds to wait before starting the quartz scheduler. |  | Integer
+| *camel.component.quartz.auto-start-scheduler* | Whether or not the scheduler should be auto started. This options is default true | true | Boolean
+| *camel.component.quartz.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
+| *camel.component.quartz.enable-jmx* | Whether to enable Quartz JMX which allows to manage the Quartz scheduler from JMX. This options is default true | true | Boolean
+| *camel.component.quartz.enabled* | Whether to enable auto configuration of the quartz component. This is enabled by default. |  | Boolean
+| *camel.component.quartz.interrupt-jobs-on-shutdown* | Whether to interrupt jobs on shutdown which forces the scheduler to shutdown quicker and attempt to interrupt any running jobs. If this is enabled then any running jobs can fail due to being interrupted. | false | Boolean
+| *camel.component.quartz.prefix-instance-name* | Whether to prefix the Quartz Scheduler instance name with the CamelContext name. This is enabled by default, to let each CamelContext use its own Quartz scheduler instance by default. You can set this option to false to reuse Quartz scheduler instances between multiple CamelContext's. | true | Boolean
+| *camel.component.quartz.prefix-job-name-with-endpoint-id* | Whether to prefix the quartz job with the endpoint id. This option is default false. | false | Boolean
+| *camel.component.quartz.properties* | Properties to configure the Quartz scheduler. The option is a java.util.Properties type. |  | String
+| *camel.component.quartz.properties-file* | File name of the properties to load from the classpath |  | String
+| *camel.component.quartz.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
+| *camel.component.quartz.scheduler* | To use the custom configured Quartz scheduler, instead of creating a new Scheduler. The option is a org.quartz.Scheduler type. |  | String
+| *camel.component.quartz.scheduler-factory* | To use the custom SchedulerFactory which is used to create the Scheduler. The option is a org.quartz.SchedulerFactory type. |  | String
+| *camel.component.quartz.start-delayed-seconds* | Seconds to wait before starting the quartz scheduler. |  | Integer
 |===
 // spring-boot-auto-configure options: END
 
@@ -163,7 +163,7 @@ the `mock:results` endpoint:
 
 [source,java]
 ----
-from("quartz2://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute")
+from("quartz://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute")
     .to("mock:result");
 ----
 
@@ -178,7 +178,7 @@ for the next execution.
 
 If you run in OSGi such as Apache ServiceMix, or Apache Karaf, and have
 multiple bundles with Camel routes that start from
-xref:quartz2-component.adoc[Quartz2] endpoints, then make sure if you assign an `id` 
+xref:quartz-component.adoc[Quartz] endpoints, then make sure if you assign an `id` 
 to the `<camelContext>` that this id is unique, as this is
 required by the `QuartzScheduler` in the OSGi container. If you do not
 set any `id` on `<camelContext>` then a unique id is auto assigned, and there is no problem.
@@ -191,7 +191,7 @@ By default Quartz will look for a `quartz.properties` file in the
 deployments this means just drop the quartz.properties in
 `WEB-INF/classes/org/quartz`.
 
-However the Camel xref:quartz2-component.adoc[Quartz2] component also allows you
+However the Camel xref:quartz-component.adoc[Quartz] component also allows you
 to configure properties:
 
 [width="100%",cols="10%,10%,10%,70%",options="header",]
@@ -223,7 +223,7 @@ This option is set to true by default, unless explicitly disabled.
 
 == Starting the Quartz scheduler
 
-The xref:quartz2-component.adoc[Quartz2] component offers an option to let the
+The xref:quartz-component.adoc[Quartz] component offers an option to let the
 Quartz scheduler be started delayed, or not auto started at all.
 
 This is an example:
@@ -238,7 +238,7 @@ This is an example:
 == Clustering
 
 If you use Quartz in clustered mode, e.g. the `JobStore` is clustered.
-Then the xref:quartz2-component.adoc[Quartz2] component will *not* pause/remove
+Then the xref:quartz-component.adoc[Quartz] component will *not* pause/remove
 triggers when a node is being stopped/shutdown. This allows the trigger
 to keep running on the other nodes in the cluster.
 
@@ -270,7 +270,7 @@ starting at 12pm (noon) to 6pm on weekdays:
 
 [source,java]
 ----
-from("quartz2://myGroup/myTimerName?cron=0+0/5+12-18+?+*+MON-FRI")
+from("quartz://myGroup/myTimerName?cron=0+0/5+12-18+?+*+MON-FRI")
     .to("activemq:Totally.Rocks");
 ----
 
@@ -296,7 +296,7 @@ The Quartz Scheduler allows you to configure time zone per trigger. For
 example to use a timezone of your country, then you can do as follows:
 
 ----
-quartz2://groupName/timerName?cron=0+0/5+12-18+?+*+MON-FRI&trigger.timeZone=Europe/Stockholm
+quartz://groupName/timerName?cron=0+0/5+12-18+?+*+MON-FRI&trigger.timeZone=Europe/Stockholm
 ----
 
 The timeZone value is the values accepted by `java.util.TimeZone`.
@@ -311,12 +311,12 @@ constants that may be set as this property's value.
 For example to configure the simple trigger to use misfire instruction 4:
 
 ----
-quartz2://myGroup/myTimerName?trigger.repeatInterval=2000&trigger.misfireInstruction=4
+quartz://myGroup/myTimerName?trigger.repeatInterval=2000&trigger.misfireInstruction=4
 ----
 
 And likewise you can configure the cron trigger with one of its misfire instructions as well:
 ----
-quartz2://myGroup/myTimerName?cron=0/2+*+*+*+*+?trigger.misfireInstruction=2
+quartz://myGroup/myTimerName?cron=0/2+*+*+*+*+?trigger.misfireInstruction=2
 ----
 
 The simple and cron triggers has the following misfire instructions representative:
@@ -403,7 +403,7 @@ but it does not want to be fired now.
 
 == Using QuartzScheduledPollConsumerScheduler
 
-The xref:quartz2-component.adoc[Quartz2] component provides a
+The xref:quartz-component.adoc[Quartz] component provides a
 Polling Consumer scheduler which allows to
 use cron based scheduling for xref:manual::polling-consumer.adoc[Polling
 Consumer] such as the File and FTP
@@ -414,13 +414,13 @@ second, then a Camel route can be define simply as:
 
 [source,java]
 ----
-    from("file:inbox?scheduler=quartz2&scheduler.cron=0/2+*+*+*+*+?")
+    from("file:inbox?scheduler=quartz&scheduler.cron=0/2+*+*+*+*+?")
        .to("bean:process");
 ----
 
-Notice we define the `scheduler=quartz2` to instruct Camel to use the
-xref:quartz2-component.adoc[Quartz2] based scheduler. Then we use `scheduler.xxx`
-options to configure the scheduler. The xref:quartz2-component.adoc[Quartz2]
+Notice we define the `scheduler=quartz` to instruct Camel to use the
+xref:quartz-component.adoc[Quartz] based scheduler. Then we use `scheduler.xxx`
+options to configure the scheduler. The xref:quartz-component.adoc[Quartz]
 scheduler requires the cron option to be set.
 
 The following options is supported:
@@ -430,7 +430,7 @@ The following options is supported:
 |Parameter |Default |Type |Description
 
 |`quartzScheduler` |`null` |`org.quartz.Scheduler` |To use a custom Quartz scheduler. If none configure then the shared
-scheduler from the xref:quartz2-component.adoc[Quartz2] component is used.
+scheduler from the xref:quartz-component.adoc[Quartz] component is used.
 
 |`cron` |`null` |`String` |*Mandatory*: To define the cron expression for triggering the polls.
 
@@ -448,7 +448,7 @@ For example to configure the trigger id and group:
 
 [source,java]
 ----
-    from("file:inbox?scheduler=quartz2&scheduler.cron=0/2+*+*+*+*+?&scheduler.triggerId=myId&scheduler.triggerGroup=myGroup")
+    from("file:inbox?scheduler=quartz&scheduler.cron=0/2+*+*+*+*+?&scheduler.triggerId=myId&scheduler.triggerGroup=myGroup")
        .to("bean:process");
 ----
 
diff --git a/docs/components/modules/ROOT/pages/rss-component.adoc b/docs/components/modules/ROOT/pages/rss-component.adoc
index c9ed102..51f91be 100644
--- a/docs/components/modules/ROOT/pages/rss-component.adoc
+++ b/docs/components/modules/ROOT/pages/rss-component.adoc
@@ -105,8 +105,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/scheduler-component.adoc b/docs/components/modules/ROOT/pages/scheduler-component.adoc
index d0496dd..b085407 100644
--- a/docs/components/modules/ROOT/pages/scheduler-component.adoc
+++ b/docs/components/modules/ROOT/pages/scheduler-component.adoc
@@ -87,8 +87,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
@@ -193,4 +193,4 @@ exchange.
 == See Also
 
 * xref:timer-component.adoc[Timer]
-* xref:quartz2-component.adoc[Quartz]
+* xref:quartz-component.adoc[Quartz]
diff --git a/docs/components/modules/ROOT/pages/sftp-component.adoc b/docs/components/modules/ROOT/pages/sftp-component.adoc
index 444520d..4c3efd7 100644
--- a/docs/components/modules/ROOT/pages/sftp-component.adoc
+++ b/docs/components/modules/ROOT/pages/sftp-component.adoc
@@ -162,8 +162,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/slack-component.adoc b/docs/components/modules/ROOT/pages/slack-component.adoc
index f7adcd9..054e794 100644
--- a/docs/components/modules/ROOT/pages/slack-component.adoc
+++ b/docs/components/modules/ROOT/pages/slack-component.adoc
@@ -107,8 +107,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/snmp-component.adoc b/docs/components/modules/ROOT/pages/snmp-component.adoc
index aabb12a..ca7dd87 100644
--- a/docs/components/modules/ROOT/pages/snmp-component.adoc
+++ b/docs/components/modules/ROOT/pages/snmp-component.adoc
@@ -108,8 +108,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/splunk-component.adoc b/docs/components/modules/ROOT/pages/splunk-component.adoc
index a6d6145..c5ff212 100644
--- a/docs/components/modules/ROOT/pages/splunk-component.adoc
+++ b/docs/components/modules/ROOT/pages/splunk-component.adoc
@@ -163,8 +163,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/sql-component.adoc b/docs/components/modules/ROOT/pages/sql-component.adoc
index 47882b6..9bd2788 100644
--- a/docs/components/modules/ROOT/pages/sql-component.adoc
+++ b/docs/components/modules/ROOT/pages/sql-component.adoc
@@ -189,8 +189,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/ssh-component.adoc b/docs/components/modules/ROOT/pages/ssh-component.adoc
index f808e7d..1e955cb 100644
--- a/docs/components/modules/ROOT/pages/ssh-component.adoc
+++ b/docs/components/modules/ROOT/pages/ssh-component.adoc
@@ -109,8 +109,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/telegram-component.adoc b/docs/components/modules/ROOT/pages/telegram-component.adoc
index 2b54dd8..506d31f 100644
--- a/docs/components/modules/ROOT/pages/telegram-component.adoc
+++ b/docs/components/modules/ROOT/pages/telegram-component.adoc
@@ -104,8 +104,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/timer-component.adoc b/docs/components/modules/ROOT/pages/timer-component.adoc
index b0b751c..e83b32c 100644
--- a/docs/components/modules/ROOT/pages/timer-component.adoc
+++ b/docs/components/modules/ROOT/pages/timer-component.adoc
@@ -24,7 +24,7 @@ You can append query options to the URI in the following format,
 `exchange.getIn().getBody()` returns `null`.
 
 TIP:*Advanced Scheduler*
-See also the xref:quartz2-component.adoc[Quartz] component that supports much more
+See also the xref:quartz-component.adoc[Quartz] component that supports much more
 advanced scheduling.
 
 TIP:*Specify time in human friendly format*
@@ -206,4 +206,4 @@ starting the route. To do that you use the repeatCount option as shown:
 == See Also
 
 * xref:scheduler-component.adoc[Scheduler]
-* xref:quartz2-component.adoc[Quartz]
+* xref:quartz-component.adoc[Quartz]
diff --git a/docs/components/modules/ROOT/pages/twitter-directmessage-component.adoc b/docs/components/modules/ROOT/pages/twitter-directmessage-component.adoc
index dd5a394..f19ef61 100644
--- a/docs/components/modules/ROOT/pages/twitter-directmessage-component.adoc
+++ b/docs/components/modules/ROOT/pages/twitter-directmessage-component.adoc
@@ -86,8 +86,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/twitter-search-component.adoc b/docs/components/modules/ROOT/pages/twitter-search-component.adoc
index 6577881..7419209 100644
--- a/docs/components/modules/ROOT/pages/twitter-search-component.adoc
+++ b/docs/components/modules/ROOT/pages/twitter-search-component.adoc
@@ -95,8 +95,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/twitter-streaming-component.adoc b/docs/components/modules/ROOT/pages/twitter-streaming-component.adoc
index eca8253..99852d4 100644
--- a/docs/components/modules/ROOT/pages/twitter-streaming-component.adoc
+++ b/docs/components/modules/ROOT/pages/twitter-streaming-component.adoc
@@ -86,8 +86,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/twitter-timeline-component.adoc b/docs/components/modules/ROOT/pages/twitter-timeline-component.adoc
index 89cb3d1..4d9ca89 100644
--- a/docs/components/modules/ROOT/pages/twitter-timeline-component.adoc
+++ b/docs/components/modules/ROOT/pages/twitter-timeline-component.adoc
@@ -87,8 +87,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/weather-component.adoc b/docs/components/modules/ROOT/pages/weather-component.adoc
index ab9bd6a..d30db75 100644
--- a/docs/components/modules/ROOT/pages/weather-component.adoc
+++ b/docs/components/modules/ROOT/pages/weather-component.adoc
@@ -113,8 +113,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/xquery-component.adoc b/docs/components/modules/ROOT/pages/xquery-component.adoc
index 97d683d..008d0c2 100644
--- a/docs/components/modules/ROOT/pages/xquery-component.adoc
+++ b/docs/components/modules/ROOT/pages/xquery-component.adoc
@@ -87,8 +87,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/yammer-component.adoc b/docs/components/modules/ROOT/pages/yammer-component.adoc
index 76322e5..6e35cda 100644
--- a/docs/components/modules/ROOT/pages/yammer-component.adoc
+++ b/docs/components/modules/ROOT/pages/yammer-component.adoc
@@ -114,8 +114,8 @@ with the following path and query parameters:
 | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
diff --git a/docs/user-manual/modules/ROOT/pages/cronscheduledroutepolicy.adoc b/docs/user-manual/modules/ROOT/pages/cronscheduledroutepolicy.adoc
index f99a94f..a5c0eaa 100644
--- a/docs/user-manual/modules/ROOT/pages/cronscheduledroutepolicy.adoc
+++ b/docs/user-manual/modules/ROOT/pages/cronscheduledroutepolicy.adoc
@@ -3,7 +3,7 @@
 CronScheduledRoutePolicy is a
 xref:scheduledroutepolicy.adoc[ScheduledRoutePolicy] that facilitates
 route activation, de-activation, suspension and resumption of routes
-based on a xref:components::quartz2-component.adoc[Quartz] `CronTrigger`.
+based on a xref:components::quartz-component.adoc[Quartz] `CronTrigger`.
 
 Maven users will need to add a camel-quartz dependency to their
 `pom.xml` to avail this capability.
@@ -28,10 +28,10 @@ common and consistent way.
 
 ====
 
-**Relationship to the [Quartz2] component**
+**Relationship to the [Quartz] component**
 
 From Camel 2.12.2 onwards you can also make use of the
-xref:components::quartz2-component.adoc[Quartz2] based implementation of this route policy.
+xref:components::quartz-component.adoc[Quartz] based implementation of this route policy.
 
 [source,xml]
 ----
@@ -136,4 +136,4 @@ xref:scheduledroutepolicy.adoc[ScheduledRoutePolicy] - for information
 on policy based scheduling capability for camel routes +
 xref:route-policy.adoc[RoutePolicy] - for information on route policies
 in general +
-xref:components::quartz2-component.adoc[Quartz] -for more information on the quartz component
+xref:components::quartz-component.adoc[Quartz] -for more information on the quartz component
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-do-the-timer-and-quartz-endpoints-compare.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-do-the-timer-and-quartz-endpoints-compare.adoc
index e05a0ef..10cc178 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-do-the-timer-and-quartz-endpoints-compare.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-the-timer-and-quartz-endpoints-compare.adoc
@@ -4,5 +4,5 @@
 xref:components::timer-component.adoc[Timer] is a simple, non persistence timer using the
 JDK's in built timer mechanism.
 
-xref:components::quartz2-component.adoc[Quartz] uses the Quartz library which uses a database
+xref:components::quartz-component.adoc[Quartz] uses the Quartz library which uses a database
 to store timer events and supports distributed timers and cron notation.
diff --git a/docs/user-manual/modules/ROOT/pages/index.adoc b/docs/user-manual/modules/ROOT/pages/index.adoc
index 6bffa59..647a9da 100644
--- a/docs/user-manual/modules/ROOT/pages/index.adoc
+++ b/docs/user-manual/modules/ROOT/pages/index.adoc
@@ -366,7 +366,7 @@ camel routes without them knowing
 ** xref:components::pgevent-component.adoc[PostgresSQL Event]
 ** xref:components::lpr-component.adoc[Printer]
 ** xref:components::pubnub-component.adoc[PubNub]
-** xref:components::quartz2-component.adoc[Quartz2]
+** xref:components::quartz-component.adoc[Quartz]
 ** xref:components::quickfix-component.adoc[QuickFix]
 ** xref:components::rabbitmq-component.adoc[RabbitMQ]
 ** xref:components::reactive-streams-component.adoc[Reactive Streams]
diff --git a/docs/user-manual/modules/ROOT/pages/polling-consumer.adoc b/docs/user-manual/modules/ROOT/pages/polling-consumer.adoc
index 290afdf..804529c 100644
--- a/docs/user-manual/modules/ROOT/pages/polling-consumer.adoc
+++ b/docs/user-manual/modules/ROOT/pages/polling-consumer.adoc
@@ -162,7 +162,7 @@ then fire message exchanges.
 Since this a such a common pattern, polling components can extend the
 https://github.com/apache/camel/blob/master/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java[ScheduledPollConsumer]
 base class which makes it simpler to implement this pattern. There is
-also the xref:components::quartz2-component.adoc[Quartz Component] which provides scheduled
+also the xref:components::quartz-component.adoc[Quartz Component] which provides scheduled
 delivery of messages using the Quartz enterprise scheduler.
 
 For more details see:
@@ -179,7 +179,7 @@ For more details see:
 ** xref:components::jpa-component.adoc[JPA]
 ** xref:components::mail-component.adoc[Mail]
 ** xref:components::mybatis-component.adoc[MyBatis]
-** xref:components::quartz2-component.adoc[Quartz]
+** xref:components::quartz-component.adoc[Quartz]
 ** xref:components::snmp-component.adoc[SNMP]
 ** xref:components::aws-s3-component.adoc[AWS-S3]
 ** xref:components::aws-sqs-component.adoc[AWS-SQS]
@@ -243,20 +243,20 @@ option allows you to share a thread pool among multiple consumers.
 *`org.apache.camel.spi.ScheduledPollConsumerScheduler`* to use as the
 scheduler for firing when the polling consumer runs. The default
 implementation uses the *`ScheduledExecutorService`* and there is a
-xref:components::quartz2-component.adoc[Quartz2], and xref:spring.adoc[Spring] based which
+xref:components::quartz-component.adoc[Quartz], and xref:spring.adoc[Spring] based which
 supports CRON expressions. *Notice:* If using a custom scheduler then
 the options for *`initialDelay`, `useFixedDelay`*, *`timeUnit`* and
-*`scheduledExecutorService`* may not be in use. Use the text *`quartz2`*
-to refer to use the xref:components::quartz2-component.adoc[Quartz2] scheduler; and use the
+*`scheduledExecutorService`* may not be in use. Use the text *`quartz`*
+to refer to use the xref:components::quartz-component.adoc[Quartz] scheduler; and use the
 text `spring` to use the xref:spring.adoc[Spring] based; and use the
 text *`#myScheduler`* to refer to a custom scheduler by its id in the
 xref:registry.adoc[Registry].
 
-See xref:components::quartz2-component.adoc[Quartz2] page for an example.
+See xref:components::quartz-component.adoc[Quartz] page for an example.
 
 |`scheduler.xxx` |`null` |*Camel 2.12:* To configure additional
 properties when using a custom *`scheduler`* or any of the
-xref:components::quartz2-component.adoc[Quartz2], xref:spring.adoc[Spring] based scheduler.
+xref:components::quartz-component.adoc[Quartz], xref:spring.adoc[Spring] based scheduler.
 
 |`sendEmptyMessageWhenIdle` |`false` |*Camel 2.9:* If the polling
 consumer did not poll any files, you can enable this option to send an
@@ -340,7 +340,7 @@ implement a custom scheduler to control when the
 xref:polling-consumer.adoc[Polling Consumer] runs. The default
 implementation is based on the JDKs *`ScheduledExecutorService`* with a
 single thread in the thread pool. There is a CRON based implementation
-in the xref:components::quartz2-component.adoc[Quartz2], and xref:spring.adoc[Spring]
+in the xref:components::quartz-component.adoc[Quartz], and xref:spring.adoc[Spring]
 components.
 
 For an example of developing and using a custom scheduler, see the unit
diff --git a/docs/user-manual/modules/ROOT/pages/simplescheduledroutepolicy.adoc b/docs/user-manual/modules/ROOT/pages/simplescheduledroutepolicy.adoc
index defb332..f4d89ab 100644
--- a/docs/user-manual/modules/ROOT/pages/simplescheduledroutepolicy.adoc
+++ b/docs/user-manual/modules/ROOT/pages/simplescheduledroutepolicy.adoc
@@ -4,7 +4,7 @@
 SimpleScheduledRoutePolicy is a
 xref:scheduledroutepolicy.adoc[ScheduledRoutePolicy] that facilitates
 route activation, de-activation, suspension and resumption of routes
-based on a xref:components::quartz2-component.adoc[Quartz] SimpleTrigger.
+based on a xref:components::quartz-component.adoc[Quartz] SimpleTrigger.
 
 Maven users will need to add a `camel-quartz` dependency to their
 `pom.xml` to avail this capability.
@@ -25,10 +25,10 @@ All Scheduled route policies share the scheduler created by the Quartz
 component. In this way, scheduler, jobs and triggers can be managed in a
 common and consistent way.
 
-**Relationship to the [Quartz2] component**
+**Relationship to the [Quartz] component**
 
 From Camel 2.12.2 onwards you can also make use of the
-xref:components::quartz2-component.adoc[Quartz2] based implementation of this route policy.
+xref:components::quartz-component.adoc[Quartz] based implementation of this route policy.
 
 == How it works
 
@@ -150,4 +150,4 @@ xref:scheduledroutepolicy.adoc[ScheduledRoutePolicy] - for information
 on policy based scheduling capability for camel routes +
 xref:route-policy.adoc[RoutePolicy] - for information on route policies
 in general
-xref:components::quartz2-component.adoc[Quartz] -for more information on the quartz component
+xref:components::quartz-component.adoc[Quartz] -for more information on the quartz component

[camel] 17/20: CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed camel-zookeeper-master test

Posted by ac...@apache.org.

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

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

commit 8e4438b96560444f7d406981269a841a44387eb5
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 11:38:45 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed camel-zookeeper-master test
---
 .../component/zookeepermaster/MasterQuartz2EndpointTest-context.xml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/camel-zookeeper-master/src/test/resources/org/apache/camel/component/zookeepermaster/MasterQuartz2EndpointTest-context.xml b/components/camel-zookeeper-master/src/test/resources/org/apache/camel/component/zookeepermaster/MasterQuartz2EndpointTest-context.xml
index 76a7c24..ec6358e 100644
--- a/components/camel-zookeeper-master/src/test/resources/org/apache/camel/component/zookeepermaster/MasterQuartz2EndpointTest-context.xml
+++ b/components/camel-zookeeper-master/src/test/resources/org/apache/camel/component/zookeepermaster/MasterQuartz2EndpointTest-context.xml
@@ -35,7 +35,7 @@
   <camelContext xmlns="http://camel.apache.org/schema/spring" depends-on="curator">
 
     <route>
-      <from uri="zookeeper-master:master-000:quartz2://masterTest?cron=0/2+0/1+*+1/1+*+?+*"/>
+      <from uri="zookeeper-master:master-000:quartz://masterTest?cron=0/2+0/1+*+1/1+*+?+*"/>
 
       <to uri="mock:results"/>
     </route>
@@ -44,4 +44,4 @@
 
   <!-- some other stuff here... -->
 
-</beans>
\ No newline at end of file
+</beans>

[camel] 16/20: CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed camel-mail test

Posted by ac...@apache.org.

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

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

commit ed5f13ceed3ff17d6864e45d741f7e5416ba9b9f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 11:36:03 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed camel-mail test
---
 .../test/java/org/apache/camel/component/mail/MailComponentTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
index 9fc2a80..bbf8e95 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
@@ -312,7 +312,7 @@ public class MailComponentTest extends CamelTestSupport {
         assertSame(config, comp.getConfiguration());
         assertNull(comp.getContentTypeResolver());
 
-        MailEndpoint endpoint = (MailEndpoint)comp.createEndpoint("imap://myhost?scheduler=quartz2&scheduler.cron=0%2F5+*+0-23+%3F+*+*+*&scheduler.timeZone=Europe%2FBerlin");
+        MailEndpoint endpoint = (MailEndpoint)comp.createEndpoint("imap://myhost?scheduler=quartz&scheduler.cron=0%2F5+*+0-23+%3F+*+*+*&scheduler.timeZone=Europe%2FBerlin");
         assertEquals("james", endpoint.getConfiguration().getUsername());
         assertEquals("secret", endpoint.getConfiguration().getPassword());
         assertEquals("myhost", endpoint.getConfiguration().getHost());

[camel] 01/20: CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz

Posted by ac...@apache.org.

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

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

commit 2450fd9fabbc4ba3800039f098dfbf2381e17bbb
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 09:43:45 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz
---
 components/{camel-quartz2 => camel-quartz}/pom.xml |  6 +++---
 .../src/main/docs/quartz2-component.adoc           |  0
 .../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
 .../endpoint/dsl/QuartzEndpointBuilderFactory.java | 12 +++++------
 .../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 +-
 .../additional-spring-configuration-metadata.json  | 10 ---------
 platforms/spring-boot/components-starter/pom.xml   |  1 +
 114 files changed, 135 insertions(+), 143 deletions(-)

diff --git a/components/camel-quartz2/pom.xml b/components/camel-quartz/pom.xml
similarity index 96%
rename from components/camel-quartz2/pom.xml
rename to components/camel-quartz/pom.xml
index 20a6aac..2a83c12 100644
--- a/components/camel-quartz2/pom.xml
+++ b/components/camel-quartz/pom.xml
@@ -27,10 +27,10 @@
         <version>3.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>camel-quartz2</artifactId>
+    <artifactId>camel-quartz</artifactId>
     <packaging>jar</packaging>
-    <name>Camel :: Quartz2</name>
-    <description>Camel Quartz2 support</description>
+    <name>Camel :: Quartz</name>
+    <description>Camel Quartz support</description>
 
     <dependencies>
         <dependency>
diff --git a/components/camel-quartz2/src/main/docs/quartz2-component.adoc b/components/camel-quartz/src/main/docs/quartz2-component.adoc
similarity index 100%
rename from components/camel-quartz2/src/main/docs/quartz2-component.adoc
rename to components/camel-quartz/src/main/docs/quartz2-component.adoc
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/CamelJob.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/CamelJob.java
similarity index 100%
rename from components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/CamelJob.java
rename to components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/CamelJob.java
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java
similarity index 99%
rename from components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java
rename to components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java
index f0fe409..83a0efd 100644
--- a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java
@@ -50,7 +50,7 @@ import org.quartz.impl.StdSchedulerFactory;
  * of the code, but mostly has been re-written in attempt to be more easier to maintain, and use Quartz more
  * fully.</p>
  */
-@Component("quartz,quartz2")
+@Component("quartz")
 public class QuartzComponent extends DefaultComponent implements ExtendedStartupListener {
 
     @Metadata(label = "advanced")
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzConstants.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzConstants.java
similarity index 100%
rename from components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzConstants.java
rename to components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzConstants.java
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzConsumer.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzConsumer.java
similarity index 100%
rename from components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzConsumer.java
rename to components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzConsumer.java
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
similarity index 99%
rename from components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
rename to components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
index 407d11f..0a878ff 100644
--- a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzEndpoint.java
@@ -53,7 +53,7 @@ import static org.quartz.SimpleScheduleBuilder.simpleSchedule;
 /**
  * Provides a scheduled delivery of messages using the Quartz 2.x scheduler.
  */
-@UriEndpoint(firstVersion = "2.12.0", scheme = "quartz2", title = "Quartz2", syntax = "quartz2:groupName/triggerName", consumerOnly = true, label = "scheduling")
+@UriEndpoint(firstVersion = "2.12.0", scheme = "quartz", title = "Quartz", syntax = "quartz:groupName/triggerName", consumerOnly = true, label = "scheduling")
 public class QuartzEndpoint extends DefaultEndpoint {
 
     private TriggerKey triggerKey;
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzHelper.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzHelper.java
similarity index 100%
rename from components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzHelper.java
rename to components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzHelper.java
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzMessage.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzMessage.java
similarity index 100%
rename from components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzMessage.java
rename to components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/QuartzMessage.java
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/StatefulCamelJob.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/StatefulCamelJob.java
similarity index 100%
rename from components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/StatefulCamelJob.java
rename to components/camel-quartz/src/main/java/org/apache/camel/component/quartz2/StatefulCamelJob.java
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java b/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
similarity index 100%
rename from components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
rename to components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerJob.java
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java b/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java
similarity index 99%
rename from components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java
rename to components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java
index 2ff32ec..bf0156d 100644
--- a/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java
@@ -168,7 +168,7 @@ public class QuartzScheduledPollConsumerScheduler extends ServiceSupport impleme
 
         if (quartzScheduler == null) {
             // get the scheduler form the quartz component
-            QuartzComponent quartz = getCamelContext().getComponent("quartz2", QuartzComponent.class);
+            QuartzComponent quartz = getCamelContext().getComponent("quartz", QuartzComponent.class);
             setQuartzScheduler(quartz.getScheduler());
         }
 
@@ -237,7 +237,7 @@ public class QuartzScheduledPollConsumerScheduler extends ServiceSupport impleme
                     quartzScheduler.scheduleJob(job, trigger);
                 } catch (ObjectAlreadyExistsException ex) {
                     // some other VM might may have stored the job & trigger in DB in clustered mode, in the mean time
-                    QuartzComponent quartz = getCamelContext().getComponent("quartz2", QuartzComponent.class);
+                    QuartzComponent quartz = getCamelContext().getComponent("quartz", QuartzComponent.class);
                     if (!(quartz.isClustered())) {
                         throw ex;
                     } else {
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicy.java b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicy.java
similarity index 99%
rename from components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicy.java
rename to components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicy.java
index 5d8eb2b..abfbd9a 100644
--- a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicy.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicy.java
@@ -45,7 +45,7 @@ public class CronScheduledRoutePolicy extends ScheduledRoutePolicy implements Sc
     }
 
     protected void doOnInit(Route route) throws Exception {
-        QuartzComponent quartz = route.getCamelContext().getComponent("quartz2", QuartzComponent.class);
+        QuartzComponent quartz = route.getCamelContext().getComponent("quartz", QuartzComponent.class);
         setScheduler(quartz.getScheduler());
 
         // Important: do not start scheduler as QuartzComponent does that automatic
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJob.java b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJob.java
similarity index 100%
rename from components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJob.java
rename to components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJob.java
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJobState.java b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJobState.java
similarity index 100%
rename from components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJobState.java
rename to components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledJobState.java
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRouteDetails.java b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRouteDetails.java
similarity index 100%
rename from components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRouteDetails.java
rename to components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRouteDetails.java
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicy.java b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicy.java
similarity index 99%
rename from components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicy.java
rename to components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicy.java
index 7b4833d..7ebf60c 100644
--- a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicy.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicy.java
@@ -110,7 +110,7 @@ public abstract class ScheduledRoutePolicy extends RoutePolicySupport implements
         
         loadCallbackDataIntoSchedulerContext(jobDetail, action, route);
 
-        boolean isClustered = route.getCamelContext().getComponent("quartz2", QuartzComponent.class).isClustered();
+        boolean isClustered = route.getCamelContext().getComponent("quartz", QuartzComponent.class).isClustered();
         if (isClustered) {
             // check to see if the same job has already been setup through another node of the cluster
             JobDetail existingJobDetail = getScheduler().getJobDetail(jobDetail.getKey());
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicyConstants.java b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicyConstants.java
similarity index 100%
rename from components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicyConstants.java
rename to components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicyConstants.java
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicy.java b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicy.java
similarity index 99%
rename from components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicy.java
rename to components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicy.java
index f79d6d8..88eb174 100644
--- a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicy.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicy.java
@@ -51,7 +51,7 @@ public class SimpleScheduledRoutePolicy extends ScheduledRoutePolicy {
     }
 
     protected void doOnInit(Route route) throws Exception {
-        QuartzComponent quartz = route.getCamelContext().getComponent("quartz2", QuartzComponent.class);
+        QuartzComponent quartz = route.getCamelContext().getComponent("quartz", QuartzComponent.class);
         setScheduler(quartz.getScheduler());
 
         // Important: do not start scheduler as QuartzComponent does that automatic
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/BaseQuartzTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/BaseQuartzTest.java
similarity index 93%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/BaseQuartzTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/BaseQuartzTest.java
index 917d1ba..0493c4c 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/BaseQuartzTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/BaseQuartzTest.java
@@ -30,7 +30,7 @@ public class BaseQuartzTest extends CamelTestSupport {
     protected CamelContext createCamelContext() throws Exception {
         CamelContext context = super.createCamelContext();
 
-        QuartzComponent quartz = context.getComponent("quartz2", QuartzComponent.class);
+        QuartzComponent quartz = context.getComponent("quartz", QuartzComponent.class);
         quartz.setEnableJmx(useJmx());
 
         return context;
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/DelegateEndpointQuartzTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/DelegateEndpointQuartzTest.java
similarity index 97%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/DelegateEndpointQuartzTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/DelegateEndpointQuartzTest.java
index 9814a81..e8e25ef 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/DelegateEndpointQuartzTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/DelegateEndpointQuartzTest.java
@@ -53,7 +53,7 @@ public class DelegateEndpointQuartzTest extends CamelTestSupport {
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                from("my:quartz2://myGroup/myTimerName?cron=0/2+*+*+*+*+?").to("mock:result");
+                from("my:quartz://myGroup/myTimerName?cron=0/2+*+*+*+*+?").to("mock:result");
             }
         };
     }
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartUnderscoreTimerNameTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartUnderscoreTimerNameTest.java
similarity index 94%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartUnderscoreTimerNameTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartUnderscoreTimerNameTest.java
index c9cf6c5..1d00eec 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartUnderscoreTimerNameTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartUnderscoreTimerNameTest.java
@@ -34,7 +34,7 @@ public class QuartUnderscoreTimerNameTest extends BaseQuartzTest {
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                from("quartz2://my_group?cron=0/1+*+*+*+*+?").to("mock:result");
+                from("quartz://my_group?cron=0/1+*+*+*+*+?").to("mock:result");
             }
         };
     }
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzAddDynamicRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAddDynamicRouteTest.java
similarity index 94%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzAddDynamicRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAddDynamicRouteTest.java
index d23de7f..bd7ac1d 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzAddDynamicRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAddDynamicRouteTest.java
@@ -39,7 +39,7 @@ public class QuartzAddDynamicRouteTest extends BaseQuartzTest {
         context.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute")
+                from("quartz://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute")
                     .to("direct:foo");
             }
         });
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzAddRoutesAfterCamelContextStartedTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAddRoutesAfterCamelContextStartedTest.java
similarity index 92%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzAddRoutesAfterCamelContextStartedTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAddRoutesAfterCamelContextStartedTest.java
index 6994067..7bab767 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzAddRoutesAfterCamelContextStartedTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAddRoutesAfterCamelContextStartedTest.java
@@ -34,7 +34,7 @@ public class QuartzAddRoutesAfterCamelContextStartedTest extends BaseQuartzTest
         context.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myGroup/myTimerName?trigger.repeatInterval=1000&trigger.repeatCount=1").to("mock:result");
+                from("quartz://myGroup/myTimerName?trigger.repeatInterval=1000&trigger.repeatCount=1").to("mock:result");
             }
         });
 
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzAutoStartTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAutoStartTest.java
similarity index 89%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzAutoStartTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAutoStartTest.java
index fc654f5..63bae6c 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzAutoStartTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzAutoStartTest.java
@@ -27,7 +27,7 @@ public class QuartzAutoStartTest extends BaseQuartzTest {
         MockEndpoint mock = getMockEndpoint("mock:one");
         mock.expectedMessageCount(0);
 
-        QuartzComponent quartz = context.getComponent("quartz2", QuartzComponent.class);
+        QuartzComponent quartz = context.getComponent("quartz", QuartzComponent.class);
         assertFalse("Should not have started scheduler", quartz.getScheduler().isStarted());
 
         Thread.sleep(2000);
@@ -50,7 +50,7 @@ public class QuartzAutoStartTest extends BaseQuartzTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?&autoStartScheduler=false").to("mock:one");
+                from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?&autoStartScheduler=false").to("mock:one");
             }
         };
     }
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSchedulerIsolationTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSchedulerIsolationTest.java
similarity index 97%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSchedulerIsolationTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSchedulerIsolationTest.java
index d303a9f..8ee0be9 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSchedulerIsolationTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSchedulerIsolationTest.java
@@ -68,7 +68,7 @@ public class QuartzComponentCamelContextSchedulerIsolationTest {
      * Get the quartz component for the provided camel context.
      */
     private QuartzComponent getQuartzComponent(CamelContext context) {
-        return context.getComponent("quartz2", QuartzComponent.class);
+        return context.getComponent("quartz", QuartzComponent.class);
     }
 
     /**
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSharedSchedulerTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSharedSchedulerTest.java
similarity index 90%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSharedSchedulerTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSharedSchedulerTest.java
index 56754c2..2a7d514 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSharedSchedulerTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentCamelContextSharedSchedulerTest.java
@@ -39,7 +39,7 @@ public class QuartzComponentCamelContextSharedSchedulerTest {
         camel1.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myGroup/myTimerName?cron=0/2+*+*+*+*+?").to("mock:one");
+                from("quartz://myGroup/myTimerName?cron=0/2+*+*+*+*+?").to("mock:one");
             }
         });
         camel1.start();
@@ -47,14 +47,14 @@ public class QuartzComponentCamelContextSharedSchedulerTest {
         camel2 = new DefaultCamelContext();
         camel2.setName("camel-2");
 
-        Scheduler camel1Scheduler = camel1.getComponent("quartz2", QuartzComponent.class).getScheduler();
-        QuartzComponent camel2QuartzComponent = camel2.getComponent("quartz2", QuartzComponent.class);
+        Scheduler camel1Scheduler = camel1.getComponent("quartz", QuartzComponent.class).getScheduler();
+        QuartzComponent camel2QuartzComponent = camel2.getComponent("quartz", QuartzComponent.class);
         camel2QuartzComponent.setScheduler(camel1Scheduler);
 
         camel2.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?").to("mock:two");
+                from("quartz://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?").to("mock:two");
             }
         });       
         
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzComponentTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentTest.java
similarity index 100%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzComponentTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzComponentTest.java
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteDurableJobTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteDurableJobTest.java
similarity index 91%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteDurableJobTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteDurableJobTest.java
index 4b86b9f..94f39ed 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteDurableJobTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteDurableJobTest.java
@@ -29,7 +29,7 @@ public class QuartzCronRouteDurableJobTest extends QuartzCronRouteTest {
             public void configure() {
                 // triggers every 1th second at precise 00,01,02,03..59
                 // notice we must use + as space when configured using URI parameter
-                from("quartz2://myGroup/myTimerName?durableJob=true&recoverableJob=true&cron=0/1+*+*+*+*+?").to("mock:result");
+                from("quartz://myGroup/myTimerName?durableJob=true&recoverableJob=true&cron=0/1+*+*+*+*+?").to("mock:result");
             }
         };
     }
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteTest.java
similarity index 96%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteTest.java
index 5f90637..eb32cd4 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteTest.java
@@ -52,7 +52,7 @@ public class QuartzCronRouteTest extends BaseQuartzTest {
         return new RouteBuilder() {
             public void configure() {
                 // triggers every 1th second at precise 00,01,02,03..59
-                from("quartz2://myGroup/myTimerName?cron=0/1 * * * * ?").to("mock:result");
+                from("quartz://myGroup/myTimerName?cron=0/1 * * * * ?").to("mock:result");
             }
         };
     }
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteWithSmallCacheTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteWithSmallCacheTest.java
similarity index 96%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteWithSmallCacheTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteWithSmallCacheTest.java
index 86ac3db..db1080f 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteWithSmallCacheTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronRouteWithSmallCacheTest.java
@@ -55,7 +55,7 @@ public class QuartzCronRouteWithSmallCacheTest extends BaseQuartzTest {
             public void configure() {
                 from("direct:foo").to("log:foo");
 
-                from("quartz2://myGroup/myTimerName?cron=0/2+*+*+*+*+?").process(new Processor() {
+                from("quartz://myGroup/myTimerName?cron=0/2+*+*+*+*+?").process(new Processor() {
                     @Override
                     public void process(Exchange exchange) throws Exception {
                         latch.countDown();
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronTriggerRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronTriggerRouteTest.java
similarity index 94%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronTriggerRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronTriggerRouteTest.java
index e3d35ca..e37630c 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCronTriggerRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCronTriggerRouteTest.java
@@ -43,7 +43,7 @@ public class QuartzCronTriggerRouteTest extends CamelTestSupport {
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                from("quartz2://myGroup/myTimerName?cron=0/2+*+*+*+*+?&trigger.timeZone=UTC").to("mock:result");
+                from("quartz://myGroup/myTimerName?cron=0/2+*+*+*+*+?&trigger.timeZone=UTC").to("mock:result");
             }
         };
     }
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
similarity index 95%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
index b305cc1..550cfc8 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarFireTest.java
@@ -36,7 +36,7 @@ public class QuartzCustomCalendarFireTest extends BaseQuartzTest {
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMinimumMessageCount(0);
 
-        QuartzComponent component = context.getComponent("quartz2", QuartzComponent.class);
+        QuartzComponent component = context.getComponent("quartz", QuartzComponent.class);
         Scheduler scheduler = component.getScheduler();
 
         Calendar c = scheduler.getCalendar(QuartzConstants.QUARTZ_CAMEL_CUSTOM_CALENDAR);
@@ -65,7 +65,7 @@ public class QuartzCustomCalendarFireTest extends BaseQuartzTest {
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                from("quartz2://MyTimer?customCalendar=#calendar&cron=05+00+00+*+*+?").to("mock:result");
+                from("quartz://MyTimer?customCalendar=#calendar&cron=05+00+00+*+*+?").to("mock:result");
             }
         };
     }
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
similarity index 94%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
index ae71728..48a26dd 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzCustomCalendarNoFireTest.java
@@ -36,7 +36,7 @@ public class QuartzCustomCalendarNoFireTest extends BaseQuartzTest {
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMinimumMessageCount(0);
 
-        QuartzComponent component = context.getComponent("quartz2", QuartzComponent.class);
+        QuartzComponent component = context.getComponent("quartz", QuartzComponent.class);
         Scheduler scheduler = component.getScheduler();
 
         Calendar c = scheduler.getCalendar(QuartzConstants.QUARTZ_CAMEL_CUSTOM_CALENDAR);
@@ -62,7 +62,7 @@ public class QuartzCustomCalendarNoFireTest extends BaseQuartzTest {
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                from("quartz2://MyTimer?customCalendar=#calendar&cron=05+00+00+*+*+?").to("mock:result");
+                from("quartz://MyTimer?customCalendar=#calendar&cron=05+00+00+*+*+?").to("mock:result");
             }
         };
     }
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzEndpointConfigureTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzEndpointConfigureTest.java
similarity index 93%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzEndpointConfigureTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzEndpointConfigureTest.java
index d6d4665..124e907 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzEndpointConfigureTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzEndpointConfigureTest.java
@@ -30,7 +30,7 @@ public class QuartzEndpointConfigureTest extends BaseQuartzTest {
 
     @Test
     public void testConfigureGroupAndName() throws Exception {
-        QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz2://myGroup/myName?trigger.repeatCount=3&trigger.repeatInterval=1000");
+        QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz://myGroup/myName?trigger.repeatCount=3&trigger.repeatInterval=1000");
 
         Scheduler scheduler = endpoint.getComponent().getScheduler();
         TriggerKey triggerKey = endpoint.getTriggerKey();
@@ -48,7 +48,7 @@ public class QuartzEndpointConfigureTest extends BaseQuartzTest {
 
     @Test
     public void testConfigureName() throws Exception {
-        QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz2://myName");
+        QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz://myName");
 
         Scheduler scheduler = endpoint.getComponent().getScheduler();
         TriggerKey triggerKey = endpoint.getTriggerKey();
@@ -62,7 +62,7 @@ public class QuartzEndpointConfigureTest extends BaseQuartzTest {
 
     @Test
     public void testConfigureCronExpression() throws Exception {
-        QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz2://myGroup/myTimerName?cron=0+0/5+12-18+?+*+MON-FRI");
+        QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz://myGroup/myTimerName?cron=0+0/5+12-18+?+*+MON-FRI");
 
         Scheduler scheduler = endpoint.getComponent().getScheduler();
         TriggerKey triggerKey = endpoint.getTriggerKey();
@@ -81,7 +81,7 @@ public class QuartzEndpointConfigureTest extends BaseQuartzTest {
 
     @Test
     public void testConfigureAnotherCronExpression() throws Exception {
-        QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz2://myGroup/myTimerName?cron=0+0+*+*+*+?");
+        QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz://myGroup/myTimerName?cron=0+0+*+*+*+?");
 
         Scheduler scheduler = endpoint.getComponent().getScheduler();
         TriggerKey triggerKey = endpoint.getTriggerKey();
@@ -100,7 +100,7 @@ public class QuartzEndpointConfigureTest extends BaseQuartzTest {
 
     @Test
     public void testConfigureJobName() throws Exception {
-        QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz2://myGroup/myTimerName?job.name=hadrian&cron=0+0+*+*+*+?");
+        QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz://myGroup/myTimerName?job.name=hadrian&cron=0+0+*+*+*+?");
 
         Scheduler scheduler = endpoint.getComponent().getScheduler();
         TriggerKey triggerKey = endpoint.getTriggerKey();
@@ -117,7 +117,7 @@ public class QuartzEndpointConfigureTest extends BaseQuartzTest {
 
     @Test
     public void testConfigureNoDoubleSlashNoCron() throws Exception {
-        QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz2:myGroup/myTimerName");
+        QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz:myGroup/myTimerName");
 
         TriggerKey triggerKey = endpoint.getTriggerKey();
         assertEquals("getName()", "myTimerName", triggerKey.getName());
@@ -126,7 +126,7 @@ public class QuartzEndpointConfigureTest extends BaseQuartzTest {
 
     @Test
     public void testConfigureNoDoubleSlashQuestionCron() throws Exception {
-        QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz2:myGroup/myTimerName?cron=0+0+*+*+*+?");
+        QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz:myGroup/myTimerName?cron=0+0+*+*+*+?");
 
         Scheduler scheduler = endpoint.getComponent().getScheduler();
         TriggerKey triggerKey = endpoint.getTriggerKey();
@@ -145,11 +145,11 @@ public class QuartzEndpointConfigureTest extends BaseQuartzTest {
 
     @Test
     public void testConfigureDeleteJob() throws Exception {
-        QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz2:myGroup/myTimerName?cron=0+0+*+*+*+?");
+        QuartzEndpoint endpoint = resolveMandatoryEndpoint("quartz:myGroup/myTimerName?cron=0+0+*+*+*+?");
         assertEquals("cron expression", "0 0 * * * ?", endpoint.getCron());
         assertEquals("deleteJob", true, endpoint.isDeleteJob());
 
-        endpoint = resolveMandatoryEndpoint("quartz2:myGroup/myTimerName2?cron=1+0+*+*+*+?&deleteJob=false");
+        endpoint = resolveMandatoryEndpoint("quartz:myGroup/myTimerName2?cron=1+0+*+*+*+?&deleteJob=false");
         assertEquals("cron expression", "1 0 * * * ?", endpoint.getCron());
         assertEquals("deleteJob", false, endpoint.isDeleteJob());
     }
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzInterruptTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzInterruptTest.java
similarity index 86%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzInterruptTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzInterruptTest.java
index e446655..cb3bd30 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzInterruptTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzInterruptTest.java
@@ -31,7 +31,7 @@ public class QuartzInterruptTest extends BaseQuartzTest {
         // lets test the receive worked
         resultEndpoint.assertIsSatisfied();
 
-        QuartzComponent quartz = context.getComponent("quartz2", QuartzComponent.class);
+        QuartzComponent quartz = context.getComponent("quartz", QuartzComponent.class);
         quartz.stop();
     }
 
@@ -39,10 +39,10 @@ public class QuartzInterruptTest extends BaseQuartzTest {
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                QuartzComponent quartz = context.getComponent("quartz2", QuartzComponent.class);
+                QuartzComponent quartz = context.getComponent("quartz", QuartzComponent.class);
                 quartz.setInterruptJobsOnShutdown(true);
 
-                from("quartz2://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=100").routeId("myRoute").to("mock:result");
+                from("quartz://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=100").routeId("myRoute").to("mock:result");
             }
         };
     }
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzJobRouteUnderscoreTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzJobRouteUnderscoreTest.java
similarity index 94%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzJobRouteUnderscoreTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzJobRouteUnderscoreTest.java
index bc336f8..7adec60 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzJobRouteUnderscoreTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzJobRouteUnderscoreTest.java
@@ -41,7 +41,7 @@ public class QuartzJobRouteUnderscoreTest extends BaseQuartzTest {
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                from("quartz2://my_group/my_timer?trigger.repeatInterval=2&trigger.repeatCount=1&job.name=my_job")
+                from("quartz://my_group/my_timer?trigger.repeatInterval=2&trigger.repeatCount=1&job.name=my_job")
                         .to("mock:result");
             }
         };
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzManagementTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzManagementTest.java
similarity index 93%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzManagementTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzManagementTest.java
index 99388df..60b7818 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzManagementTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzManagementTest.java
@@ -55,7 +55,7 @@ public class QuartzManagementTest extends BaseQuartzTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute").to("mock:result");
+                from("quartz://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute").to("mock:result");
             }
         };
     }
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzManuallyTriggerJobTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzManuallyTriggerJobTest.java
similarity index 95%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzManuallyTriggerJobTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzManuallyTriggerJobTest.java
index 8cbd598..2ecbe6f 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzManuallyTriggerJobTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzManuallyTriggerJobTest.java
@@ -36,7 +36,7 @@ public class QuartzManuallyTriggerJobTest extends BaseQuartzTest {
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMinimumMessageCount(1);
 
-        QuartzComponent component = context.getComponent("quartz2", QuartzComponent.class);
+        QuartzComponent component = context.getComponent("quartz", QuartzComponent.class);
         Scheduler scheduler = component.getScheduler();
         
         // collect all jobKeys of this route (ideally only one).
@@ -58,7 +58,7 @@ public class QuartzManuallyTriggerJobTest extends BaseQuartzTest {
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                from("quartz2://MyTimer?cron=05+00+00+*+*+?").to("mock:result");
+                from("quartz://MyTimer?cron=05+00+00+*+*+?").to("mock:result");
             }
         };
     }
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzNameCollisionTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzNameCollisionTest.java
similarity index 85%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzNameCollisionTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzNameCollisionTest.java
index fc31f3a..dfcbfdf 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzNameCollisionTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzNameCollisionTest.java
@@ -40,7 +40,7 @@ public class QuartzNameCollisionTest {
         camel1.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("log:one", "mock:one");
+                from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("log:one", "mock:one");
             }
         });
         camel1.start();
@@ -49,7 +49,7 @@ public class QuartzNameCollisionTest {
             camel1.addRoutes(new RouteBuilder() {
                 @Override
                 public void configure() throws Exception {
-                    from("quartz2://myGroup/myTimerName?cron=0/2+*+*+*+*+?").to("log:two", "mock:two");
+                    from("quartz://myGroup/myTimerName?cron=0/2+*+*+*+*+?").to("log:two", "mock:two");
                 }
             });
             Assert.fail("Should have thrown an exception");
@@ -66,7 +66,7 @@ public class QuartzNameCollisionTest {
         camel1.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("log:one", "mock:one");
+                from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("log:one", "mock:one");
             }
         });
         camel1.start();
@@ -76,7 +76,7 @@ public class QuartzNameCollisionTest {
         camel2.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myGroup/myTimerName=0/2+*+*+*+*+?").to("log:two", "mock:two");
+                from("quartz://myGroup/myTimerName=0/2+*+*+*+*+?").to("log:two", "mock:two");
             }
         });
         camel2.start();
@@ -92,7 +92,7 @@ public class QuartzNameCollisionTest {
         camel1.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myGroup/myTimerName?stateful=true&cron=0/1+*+*+*+*+?").to("log:one", "mock:one");
+                from("quartz://myGroup/myTimerName?stateful=true&cron=0/1+*+*+*+*+?").to("log:one", "mock:one");
             }
         });
         camel1.start();
@@ -102,7 +102,7 @@ public class QuartzNameCollisionTest {
         camel2.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myGroup/myTimerName?stateful=true").to("log:two", "mock:two");
+                from("quartz://myGroup/myTimerName?stateful=true").to("log:two", "mock:two");
             }
         });
         camel2.start();
@@ -119,7 +119,7 @@ public class QuartzNameCollisionTest {
         camel.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("log:one", "mock:one");
+                from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("log:one", "mock:one");
             }
         });
 
@@ -148,20 +148,20 @@ public class QuartzNameCollisionTest {
         camel1.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?").id("route-1").to("log:one", "mock:one");
+                from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?").id("route-1").to("log:one", "mock:one");
             }
         });
 
         camel1.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myGroup2/myTimerName?cron=0/1+*+*+*+*+?").id("route-2").to("log:one", "mock:one");
+                from("quartz://myGroup2/myTimerName?cron=0/1+*+*+*+*+?").id("route-2").to("log:one", "mock:one");
             }
         });
 
         camel1.start();
 
-        QuartzComponent component = (QuartzComponent) camel1.getComponent("quartz2");
+        QuartzComponent component = (QuartzComponent) camel1.getComponent("quartz");
         Scheduler scheduler = component.getScheduler();
         TriggerKey triggerKey = TriggerKey.triggerKey("myTimerName", "myGroup");
         Trigger trigger = scheduler.getTrigger(triggerKey);
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextRestartTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextRestartTest.java
similarity index 95%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextRestartTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextRestartTest.java
index 9d6671c..2184206 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextRestartTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextRestartTest.java
@@ -34,7 +34,7 @@ public class QuartzOneCamelContextRestartTest {
         camel1.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("log:one", "mock:one");
+                from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("log:one", "mock:one");
             }
         });
         camel1.start();
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextSuspendResumeTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextSuspendResumeTest.java
similarity index 95%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextSuspendResumeTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextSuspendResumeTest.java
index e179227..1800bd2 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextSuspendResumeTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzOneCamelContextSuspendResumeTest.java
@@ -34,7 +34,7 @@ public class QuartzOneCamelContextSuspendResumeTest {
         camel1.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("mock:one");
+                from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("mock:one");
             }
         });
         camel1.start();
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzPropertiesTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzPropertiesTest.java
similarity index 92%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzPropertiesTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzPropertiesTest.java
index c16b882..cc35c99 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzPropertiesTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzPropertiesTest.java
@@ -40,7 +40,7 @@ public class QuartzPropertiesTest extends BaseQuartzTest {
 
     @Test
     public void testQuartzPropertiesFile() throws Exception {
-        quartz = context.getComponent("quartz2", QuartzComponent.class);
+        quartz = context.getComponent("quartz", QuartzComponent.class);
 
         quartz.setPropertiesFile("org/apache/camel/component/quartz2/myquartz.properties");
 
@@ -52,7 +52,7 @@ public class QuartzPropertiesTest extends BaseQuartzTest {
 
     @Test
     public void testQuartzPropertiesFileNotFound() throws Exception {
-        quartz = context.getComponent("quartz2", QuartzComponent.class);
+        quartz = context.getComponent("quartz", QuartzComponent.class);
 
         quartz.setPropertiesFile("doesnotexist.properties");
 
@@ -66,7 +66,7 @@ public class QuartzPropertiesTest extends BaseQuartzTest {
 
     @Test
     public void testQuartzProperties() throws Exception {
-        quartz = context.getComponent("quartz2", QuartzComponent.class);
+        quartz = context.getComponent("quartz", QuartzComponent.class);
 
         Properties prop = new Properties();
         InputStream is = context.getClassResolver().loadResourceAsStream("org/apache/camel/component/quartz2/myquartz.properties");
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRepeatIntervalTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRepeatIntervalTest.java
similarity index 94%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRepeatIntervalTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRepeatIntervalTest.java
index 1369398..39344d8 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRepeatIntervalTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRepeatIntervalTest.java
@@ -36,7 +36,7 @@ public class QuartzRepeatIntervalTest extends BaseQuartzTest {
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                from("quartz2://myGroup/myTimerName?trigger.repeatInterval=50").routeId("myRoute")
+                from("quartz://myGroup/myTimerName?trigger.repeatInterval=50").routeId("myRoute")
                         .to("log:result")
                         .to("mock:result");
             }
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowOnlyOnceTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowOnlyOnceTest.java
similarity index 93%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowOnlyOnceTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowOnlyOnceTest.java
index 286d92e..400564d 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowOnlyOnceTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowOnlyOnceTest.java
@@ -40,7 +40,7 @@ public class QuartzRouteFireNowOnlyOnceTest extends BaseQuartzTest {
         return new RouteBuilder() {
             public void configure() {
                 // START SNIPPET: example
-                from("quartz2://myGroup/myTimerName?fireNow=true&trigger.repeatInterval=2000&trigger.repeatCount=0")
+                from("quartz://myGroup/myTimerName?fireNow=true&trigger.repeatInterval=2000&trigger.repeatCount=0")
                         .to("log:quartz")
                         .to("mock:result");
                 // END SNIPPET: example
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowTest.java
similarity index 93%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowTest.java
index 78ed2ce..dff0be3 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteFireNowTest.java
@@ -40,7 +40,7 @@ public class QuartzRouteFireNowTest extends BaseQuartzTest {
         return new RouteBuilder() {
             public void configure() {
                 // START SNIPPET: example
-                from("quartz2://myGroup/myTimerName?fireNow=true&trigger.repeatInterval=2000&trigger.repeatCount=2")
+                from("quartz://myGroup/myTimerName?fireNow=true&trigger.repeatInterval=2000&trigger.repeatCount=2")
                         .to("log:quartz")
                         .to("mock:result");
                 // END SNIPPET: example
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteRestartTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteRestartTest.java
similarity index 95%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteRestartTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteRestartTest.java
index 1670614..2f8685d 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteRestartTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteRestartTest.java
@@ -52,7 +52,7 @@ public class QuartzRouteRestartTest extends BaseQuartzTest {
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                from("quartz2://groupName/timerName?cron=0/1+*+*+*+*+?").routeId("trigger")
+                from("quartz://groupName/timerName?cron=0/1+*+*+*+*+?").routeId("trigger")
                     .to("mock:result");
             }
         };
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteTest.java
similarity index 92%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteTest.java
index f3380e6..63e300c 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzRouteTest.java
@@ -39,7 +39,7 @@ public class QuartzRouteTest extends BaseQuartzTest {
         return new RouteBuilder() {
             public void configure() {
                 // START SNIPPET: example
-                from("quartz2://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute").to("mock:result");
+                from("quartz://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute").to("mock:result");
                 // END SNIPPET: example
             }
         };
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzSimpleRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzSimpleRouteTest.java
similarity index 95%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzSimpleRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzSimpleRouteTest.java
index 856f5e1..69b951c 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzSimpleRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzSimpleRouteTest.java
@@ -51,7 +51,7 @@ public class QuartzSimpleRouteTest extends BaseQuartzTest {
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                from("quartz2://myGroup/myTimerName?trigger.repeatInterval=2000&trigger.repeatCount=-1").to("mock:result");
+                from("quartz://myGroup/myTimerName?trigger.repeatInterval=2000&trigger.repeatCount=-1").to("mock:result");
             }
         };
     }
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedOptionTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedOptionTest.java
similarity index 91%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedOptionTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedOptionTest.java
index b8366a4..2058d36 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedOptionTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedOptionTest.java
@@ -37,7 +37,7 @@ public class QuartzStartDelayedOptionTest extends BaseQuartzTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myGroup/myTimerName?startDelayedSeconds=2&trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute")
+                from("quartz://myGroup/myTimerName?startDelayedSeconds=2&trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute")
                     .to("mock:result");
             }
         };
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedTest.java
similarity index 90%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedTest.java
index 925bc8a..8097771 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedTest.java
@@ -37,10 +37,10 @@ public class QuartzStartDelayedTest extends BaseQuartzTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                QuartzComponent quartz = context.getComponent("quartz2", QuartzComponent.class);
+                QuartzComponent quartz = context.getComponent("quartz", QuartzComponent.class);
                 quartz.setStartDelayedSeconds(2);
 
-                from("quartz2://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute").to("mock:result");
+                from("quartz://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute").to("mock:result");
             }
         };
     }
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
similarity index 89%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
index 251878f..79fd62b 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStartDelayedWithReferenceTest.java
@@ -32,10 +32,10 @@ public class QuartzStartDelayedWithReferenceTest extends QuartzStartDelayedTest
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                QuartzComponent quartz = context.getComponent("quartz2", QuartzComponent.class);
+                QuartzComponent quartz = context.getComponent("quartz", QuartzComponent.class);
                 quartz.setStartDelayedSeconds(2);
 
-                from("quartz2://myGroup/myTimerName?trigger.repeatInterval=#interval&trigger.repeatCount=#count").routeId("myRoute").to("mock:result");
+                from("quartz://myGroup/myTimerName?trigger.repeatInterval=#interval&trigger.repeatCount=#count").routeId("myRoute").to("mock:result");
             }
         };
     }
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStatefulJobRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStatefulJobRouteTest.java
similarity index 95%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStatefulJobRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStatefulJobRouteTest.java
index 99c4e13..6e6cefa 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStatefulJobRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStatefulJobRouteTest.java
@@ -50,7 +50,7 @@ public class QuartzStatefulJobRouteTest extends BaseQuartzTest {
             public void configure() {
                 // triggers every 2th second at precise 00,02,04,06..58
                 // notice we must use + as space when configured using URI parameter
-                from("quartz2://myGroup/myTimerName?cron=0/2+*+*+*+*+?&stateful=true").to("mock:result");
+                from("quartz://myGroup/myTimerName?cron=0/2+*+*+*+*+?&stateful=true").to("mock:result");
             }
         };
     }
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStopRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStopRouteTest.java
similarity index 96%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStopRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStopRouteTest.java
index 008ce5c..cd16c35 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzStopRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzStopRouteTest.java
@@ -55,7 +55,7 @@ public class QuartzStopRouteTest extends BaseQuartzTest {
                 // START SNIPPET: e1
                 // triggers every second at precise 00,01,02,03..59
                 // notice we must use + as space when configured using URI parameter
-                from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?")
+                from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?")
                         .routeId("foo")
                         .to("log:result", "mock:result");
                 // END SNIPPET: e1
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzSuspendRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzSuspendRouteTest.java
similarity index 96%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzSuspendRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzSuspendRouteTest.java
index 44e4001..423cf4a 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzSuspendRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzSuspendRouteTest.java
@@ -55,7 +55,7 @@ public class QuartzSuspendRouteTest extends BaseQuartzTest {
                 // START SNIPPET: e1
                 // triggers every second at precise 00,01,02,03..59
                 // notice we must use + as space when configured using URI parameter
-                from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?")
+                from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?")
                         .routeId("foo")
                         .to("log:result", "mock:result");
                 // END SNIPPET: e1
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextRestartTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextRestartTest.java
similarity index 92%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextRestartTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextRestartTest.java
index 0fe5c88..2e64299 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextRestartTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextRestartTest.java
@@ -35,7 +35,7 @@ public class QuartzTwoCamelContextRestartTest {
         camel1.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("log:one", "mock:one");
+                from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("log:one", "mock:one");
             }
         });
         camel1.start();
@@ -45,7 +45,7 @@ public class QuartzTwoCamelContextRestartTest {
         camel2.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?").to("log:two", "mock:two");
+                from("quartz://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?").to("log:two", "mock:two");
             }
         });
         camel2.start();
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSameNameClashTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSameNameClashTest.java
similarity index 94%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSameNameClashTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSameNameClashTest.java
index 99fc066..ca4ee72 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSameNameClashTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSameNameClashTest.java
@@ -36,7 +36,7 @@ public class QuartzTwoCamelContextSameNameClashTest extends Assert {
         camel1.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?")
+                from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?")
                     .log("Fired one")
                     .to("mock:one");
             }
@@ -48,7 +48,7 @@ public class QuartzTwoCamelContextSameNameClashTest extends Assert {
         camel2.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?")
+                from("quartz://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?")
                     .log("Fired two")
                     .to("mock:two");
             }
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSuspendResumeTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSuspendResumeTest.java
similarity index 93%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSuspendResumeTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSuspendResumeTest.java
index af4b1cd..1a73ab7 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSuspendResumeTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextSuspendResumeTest.java
@@ -35,7 +35,7 @@ public class QuartzTwoCamelContextSuspendResumeTest {
         camel1.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("mock:one");
+                from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("mock:one");
             }
         });
         camel1.start();
@@ -45,7 +45,7 @@ public class QuartzTwoCamelContextSuspendResumeTest {
         camel2.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?").to("mock:two");
+                from("quartz://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?").to("mock:two");
             }
         });
         camel2.start();
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextTest.java
similarity index 91%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextTest.java
index 6db308d..b956937 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/QuartzTwoCamelContextTest.java
@@ -36,7 +36,7 @@ public class QuartzTwoCamelContextTest extends Assert {
         camel1.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("mock:one");
+                from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("mock:one");
             }
         });
         camel1.start();
@@ -46,7 +46,7 @@ public class QuartzTwoCamelContextTest extends Assert {
         camel2.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?").to("mock:two");
+                from("quartz://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?").to("mock:two");
             }
         });
         camel2.start();
@@ -85,7 +85,7 @@ public class QuartzTwoCamelContextTest extends Assert {
         camel3.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("quartz2://myThirdGroup/myThirdTimerName?cron=0/1+*+*+*+*+?").to("mock:three");
+                from("quartz://myThirdGroup/myThirdTimerName?cron=0/1+*+*+*+*+?").to("mock:three");
             }
         });
         camel3.start();
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java
similarity index 100%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java
similarity index 100%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.java
similarity index 100%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.java
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java
similarity index 100%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest.java
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppTest.java
similarity index 100%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppTest.java
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartRouteTest.java
similarity index 100%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartRouteTest.java
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.java
similarity index 100%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.java
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/StatefulQuartzRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/StatefulQuartzRouteTest.java
similarity index 94%
rename from components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/StatefulQuartzRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/StatefulQuartzRouteTest.java
index 8f76dc4..ca39142 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/StatefulQuartzRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz2/StatefulQuartzRouteTest.java
@@ -51,7 +51,7 @@ public class StatefulQuartzRouteTest extends BaseQuartzTest {
             @Override
             public void configure() {
                 // START SNIPPET: example
-                from("quartz2://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1&stateful=true").to("mock:result");
+                from("quartz://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1&stateful=true").to("mock:result");
                 // END SNIPPET: example
             }
         };
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerRestartTest.java b/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerRestartTest.java
similarity index 100%
rename from components/camel-quartz2/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerRestartTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerRestartTest.java
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerTest.java b/components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerTest.java
similarity index 100%
rename from components/camel-quartz2/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerTest.java
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java
similarity index 90%
rename from components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java
index fcd2649..6bc7cac 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/CronScheduledRoutePolicyTest.java
@@ -46,7 +46,7 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport {
         success2.expectedMessageCount(1);
 
         context.getComponent("direct", DirectComponent.class).setBlock(false);
-        context.getComponent("quartz2", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+        context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
 
         context.addRoutes(new RouteBuilder() {
             public void configure() {
@@ -81,7 +81,7 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport {
     @Test
     public void testScheduledStopRoutePolicyWithTwoRoutes() throws Exception {
         context.getComponent("direct", DirectComponent.class).setBlock(false);
-        context.getComponent("quartz2", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+        context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
         context.addRoutes(new RouteBuilder() {
             public void configure() {
                 CronScheduledRoutePolicy policy = new CronScheduledRoutePolicy();
@@ -114,7 +114,7 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport {
         success.expectedMessageCount(1);
 
         context.getComponent("direct", DirectComponent.class).setBlock(false);
-        context.getComponent("quartz2", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+        context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
 
         context.addRoutes(new RouteBuilder() {
             public void configure() {    
@@ -134,14 +134,14 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport {
         assertTrue(context.getRouteController().getRouteStatus("test") == ServiceStatus.Started);
         template.sendBody("direct:start", "Ready or not, Here, I come");
 
-        context.getComponent("quartz2", QuartzComponent.class).stop();
+        context.getComponent("quartz", QuartzComponent.class).stop();
         success.assertIsSatisfied();
     }
 
     @Test
     public void testScheduledStopRoutePolicy() throws Exception {
         context.getComponent("direct", DirectComponent.class).setBlock(false);
-        context.getComponent("quartz2", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+        context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
         context.addRoutes(new RouteBuilder() {
             public void configure() {
                 CronScheduledRoutePolicy policy = new CronScheduledRoutePolicy();
@@ -170,7 +170,7 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport {
         final CountDownLatch stoppedLatch = new CountDownLatch(1);
 
         context.getComponent("direct", DirectComponent.class).setBlock(false);
-        context.getComponent("quartz2", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+        context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
         context.addRoutes(new RouteBuilder() {
             public void configure() {
                 CronScheduledRoutePolicy policy = new CronScheduledRoutePolicy() {
@@ -221,7 +221,7 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport {
         final MyRoutePolicy myPolicy = new MyRoutePolicy();
 
         context.getComponent("direct", DirectComponent.class).setBlock(false);
-        context.getComponent("quartz2", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+        context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
         context.addRoutes(new RouteBuilder() {
             public void configure() {
                 CronScheduledRoutePolicy policy = new CronScheduledRoutePolicy();
@@ -247,7 +247,7 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport {
     @Test
     public void testScheduledSuspendRoutePolicy() throws Exception {
         context.getComponent("direct", DirectComponent.class).setBlock(false);
-        context.getComponent("quartz2", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+        context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
         context.addRoutes(new RouteBuilder() {
             public void configure() {
                 CronScheduledRoutePolicy policy = new CronScheduledRoutePolicy();
@@ -276,7 +276,7 @@ public class CronScheduledRoutePolicyTest extends CamelTestSupport {
         success.expectedMessageCount(1);
 
         context.getComponent("direct", DirectComponent.class).setBlock(false);
-        context.getComponent("quartz2", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+        context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
         context.addRoutes(new RouteBuilder() {
             public void configure() {
                 CronScheduledRoutePolicy policy = new CronScheduledRoutePolicy();
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/DateFactory.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/DateFactory.java
similarity index 100%
rename from components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/DateFactory.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/DateFactory.java
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/MultiplePoliciesOnRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/MultiplePoliciesOnRouteTest.java
similarity index 93%
rename from components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/MultiplePoliciesOnRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/MultiplePoliciesOnRouteTest.java
index e7a84a0..dcdaa8b 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/MultiplePoliciesOnRouteTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/MultiplePoliciesOnRouteTest.java
@@ -64,7 +64,7 @@ public class MultiplePoliciesOnRouteTest extends CamelTestSupport {
         MockEndpoint success = context.getEndpoint("mock:success", MockEndpoint.class);        
         success.expectedMinimumMessageCount(size - 10);
         
-        context.getComponent("quartz2", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+        context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
         context.addRoutes(new RouteBuilder() {
             public void configure() {   
                 from(url)
@@ -82,7 +82,7 @@ public class MultiplePoliciesOnRouteTest extends CamelTestSupport {
             Thread.sleep(3);
         }
 
-        context.getComponent("quartz2", QuartzComponent.class).stop();
+        context.getComponent("quartz", QuartzComponent.class).stop();
         success.assertIsSatisfied();
     }
 
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/MyRoutePolicy.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/MyRoutePolicy.java
similarity index 100%
rename from components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/MyRoutePolicy.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/MyRoutePolicy.java
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/RouteAutoStopFalseCronScheduledPolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/RouteAutoStopFalseCronScheduledPolicyTest.java
similarity index 100%
rename from components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/RouteAutoStopFalseCronScheduledPolicyTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/RouteAutoStopFalseCronScheduledPolicyTest.java
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledCombinedRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledCombinedRoutePolicyTest.java
similarity index 93%
rename from components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledCombinedRoutePolicyTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledCombinedRoutePolicyTest.java
index 1ceda59..9a98301 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledCombinedRoutePolicyTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledCombinedRoutePolicyTest.java
@@ -39,7 +39,7 @@ public class SimpleScheduledCombinedRoutePolicyTest extends CamelTestSupport {
         success.expectedMessageCount(1);
 
         context.getComponent("direct", DirectComponent.class).setBlock(false);
-        context.getComponent("quartz2", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+        context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
         context.addRoutes(new RouteBuilder() {
             public void configure() {   
                 SimpleScheduledRoutePolicy policy = new SimpleScheduledRoutePolicy();
@@ -66,7 +66,7 @@ public class SimpleScheduledCombinedRoutePolicyTest extends CamelTestSupport {
         Thread.sleep(5000);
         assertTrue(context.getRouteController().getRouteStatus("test") == ServiceStatus.Stopped);
         
-        context.getComponent("quartz2", QuartzComponent.class).stop();
+        context.getComponent("quartz", QuartzComponent.class).stop();
         success.assertIsSatisfied();
     }
 
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java
similarity index 88%
rename from components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java
index 19dbd18..3e0d536 100644
--- a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java
+++ b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SimpleScheduledRoutePolicyTest.java
@@ -45,7 +45,7 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
         success.expectedMessageCount(1);
 
         context.getComponent("direct", DirectComponent.class).setBlock(false);
-        context.getComponent("quartz2", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+        context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
         context.addRoutes(new RouteBuilder() {
             public void configure() {   
                 SimpleScheduledRoutePolicy policy = new SimpleScheduledRoutePolicy();
@@ -67,14 +67,14 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
         assertTrue(context.getRouteController().getRouteStatus("test") == ServiceStatus.Started);
         template.sendBody("direct:start", "Ready or not, Here, I come");
 
-        context.getComponent("quartz2", QuartzComponent.class).stop();
+        context.getComponent("quartz", QuartzComponent.class).stop();
         success.assertIsSatisfied();
     }
 
     @Test
     public void testScheduledStopRoutePolicy() throws Exception {
         context.getComponent("direct", DirectComponent.class).setBlock(false);
-        context.getComponent("quartz2", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+        context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
         context.addRoutes(new RouteBuilder() {
             public void configure() {
                 SimpleScheduledRoutePolicy policy = new SimpleScheduledRoutePolicy();
@@ -102,13 +102,13 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
             consumerStopped = true;
         }    
         assertTrue(consumerStopped);
-        context.getComponent("quartz2", QuartzComponent.class).stop();
+        context.getComponent("quartz", QuartzComponent.class).stop();
     } 
     
     @Test
     public void testScheduledSuspendRoutePolicy() throws Exception {
         context.getComponent("direct", DirectComponent.class).setBlock(false);
-        context.getComponent("quartz2", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+        context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
         context.addRoutes(new RouteBuilder() {
             public void configure() {
                 SimpleScheduledRoutePolicy policy = new SimpleScheduledRoutePolicy();
@@ -134,7 +134,7 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
             consumerSuspended = true;
         }        
         assertTrue(consumerSuspended);
-        context.getComponent("quartz2", QuartzComponent.class).stop();
+        context.getComponent("quartz", QuartzComponent.class).stop();
     }    
     
     @Test
@@ -143,7 +143,7 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
         success.expectedMessageCount(1);
 
         context.getComponent("direct", DirectComponent.class).setBlock(false);
-        context.getComponent("quartz2", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+        context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
         context.addRoutes(new RouteBuilder() {
             public void configure() {
                 SimpleScheduledRoutePolicy policy = new SimpleScheduledRoutePolicy();
@@ -171,7 +171,7 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
         Thread.sleep(4000);
         template.sendBody("direct:start", "Ready or not, Here, I come");
         
-        context.getComponent("quartz2", QuartzComponent.class).stop();
+        context.getComponent("quartz", QuartzComponent.class).stop();
         success.assertIsSatisfied();
     }
     
@@ -181,7 +181,7 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
         success.expectedMessageCount(1);
 
         context.getComponent("direct", DirectComponent.class).setBlock(false);
-        context.getComponent("quartz2", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+        context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
         context.addRoutes(new RouteBuilder() {
             public void configure() {
                 SimpleScheduledRoutePolicy policy = new SimpleScheduledRoutePolicy();
@@ -213,7 +213,7 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
         Thread.sleep(4000);
         template.sendBody("direct:start", "Ready or not, Here, I come");
         
-        context.getComponent("quartz2", QuartzComponent.class).stop();
+        context.getComponent("quartz", QuartzComponent.class).stop();
         success.assertIsSatisfied();
     }
     
@@ -223,7 +223,7 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
         success.expectedMessageCount(1);
 
         context.getComponent("direct", DirectComponent.class).setBlock(false);
-        context.getComponent("quartz2", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
+        context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz2/myquartz.properties");
         context.addRoutes(new RouteBuilder() {
             public void configure() {
                 SimpleScheduledRoutePolicy policy = new SimpleScheduledRoutePolicy();
@@ -254,7 +254,7 @@ public class SimpleScheduledRoutePolicyTest extends CamelTestSupport {
         Thread.sleep(4000);
         template.sendBody("direct:start", "Ready or not, Here, I come");
         
-        context.getComponent("quartz2", QuartzComponent.class).stop();
+        context.getComponent("quartz", QuartzComponent.class).stop();
         success.assertIsSatisfied();
     }
     
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringCronScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringCronScheduledRoutePolicyTest.java
similarity index 100%
rename from components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringCronScheduledRoutePolicyTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringCronScheduledRoutePolicyTest.java
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringMultiplePoliciesOnRouteTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringMultiplePoliciesOnRouteTest.java
similarity index 100%
rename from components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringMultiplePoliciesOnRouteTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringMultiplePoliciesOnRouteTest.java
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringQuartzTwoAppsClusteredFailoverTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringQuartzTwoAppsClusteredFailoverTest.java
similarity index 100%
rename from components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringQuartzTwoAppsClusteredFailoverTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringQuartzTwoAppsClusteredFailoverTest.java
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java
similarity index 100%
rename from components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringScheduledRoutePolicyTest.java
diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringSimpleScheduledRoutePolicyTest.java b/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringSimpleScheduledRoutePolicyTest.java
similarity index 100%
rename from components/camel-quartz2/src/test/java/org/apache/camel/routepolicy/quartz2/SpringSimpleScheduledRoutePolicyTest.java
rename to components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz2/SpringSimpleScheduledRoutePolicyTest.java
diff --git a/components/camel-quartz2/src/test/resources/log4j2.properties b/components/camel-quartz/src/test/resources/log4j2.properties
similarity index 96%
rename from components/camel-quartz2/src/test/resources/log4j2.properties
rename to components/camel-quartz/src/test/resources/log4j2.properties
index 6c6f71b..f696bf1 100644
--- a/components/camel-quartz2/src/test/resources/log4j2.properties
+++ b/components/camel-quartz/src/test/resources/log4j2.properties
@@ -17,7 +17,7 @@
 
 appender.file.type = File
 appender.file.name = file
-appender.file.fileName = target/camel-quartz2-test.log
+appender.file.fileName = target/camel-quartz-test.log
 appender.file.layout.type = PatternLayout
 appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
 appender.out.type = Console
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppDatabase.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppDatabase.xml
similarity index 100%
rename from components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppDatabase.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppDatabase.xml
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml
similarity index 100%
rename from components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppOne.xml
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml
similarity index 100%
rename from components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerClusteredAppTwo.xml
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml
similarity index 95%
rename from components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml
index a313a40..3693d73 100644
--- a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppOne.xml
@@ -66,7 +66,7 @@
   <camelContext id="camelContext" shutdownEager="false" xmlns="http://camel.apache.org/schema/spring">
     <template id="template" />
     <route id="myRoute">
-      <from uri="quartz2://app/test?trigger.repeatInterval=1000&amp;trigger.repeatCount=2&amp;durableJob=true&amp;stateful=true&amp;recoverableJob=true" />
+      <from uri="quartz://app/test?trigger.repeatInterval=1000&amp;trigger.repeatCount=2&amp;durableJob=true&amp;stateful=true&amp;recoverableJob=true" />
       <transform>
         <simple>clustering PINGS!</simple>
       </transform>
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml
similarity index 95%
rename from components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml
index 42e16a8..000fadf 100644
--- a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzConsumerRecoveryClusteredAppTwo.xml
@@ -62,7 +62,7 @@
   <camelContext id="camelContext2" shutdownEager="true" xmlns="http://camel.apache.org/schema/spring">
     <template id="template" />
     <route id="myRoute">
-      <from uri="quartz2://app/test?trigger.repeatInterval=1000&amp;trigger.repeatCount=2&amp;durableJob=true&amp;stateful=true&amp;recoverableJob=true" />
+      <from uri="quartz://app/test?trigger.repeatInterval=1000&amp;trigger.repeatCount=2&amp;durableJob=true&amp;stateful=true&amp;recoverableJob=true" />
       <transform>
         <simple>clustering PONGS!</simple>
       </transform>
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.xml
similarity index 95%
rename from components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.xml
index 7e2e650..197690a 100644
--- a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzCronRouteTest.xml
@@ -27,7 +27,7 @@
     <!-- START SNIPPET: e1 -->
     <camelContext xmlns="http://camel.apache.org/schema/spring">
         <route>
-            <from uri="quartz2://myGroup/myTimerName?cron=0/2+*+*+*+*+?"/>
+            <from uri="quartz://myGroup/myTimerName?cron=0/2+*+*+*+*+?"/>
             <to uri="mock:result"/>
         </route>
     </camelContext>
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
similarity index 100%
rename from components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest1.xml
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
similarity index 100%
rename from components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest2.xml
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
similarity index 100%
rename from components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeCronExpressionTest3.xml
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
similarity index 100%
rename from components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest1.xml
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
similarity index 100%
rename from components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartAppChangeOptionsTest2.xml
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml
similarity index 96%
rename from components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml
index 4a933a5..b47c19d 100644
--- a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreRestartTest.xml
@@ -60,7 +60,7 @@
 
   <camelContext id="camelContext" managementNamePattern="#name#" xmlns="http://camel.apache.org/schema/spring">
     <route>
-      <from uri="quartz2://app/test?trigger.repeatInterval=1000&amp;trigger.repeatCount=-1&amp;stateful=true"/>
+      <from uri="quartz://app/test?trigger.repeatInterval=1000&amp;trigger.repeatCount=-1&amp;stateful=true"/>
       <to uri="log:trigger"/>
       <to uri="mock:result"/>
     </route>
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml
similarity index 96%
rename from components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml
index c109132..aecd77c 100644
--- a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml
+++ b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/SpringQuartzPersistentStoreTest.xml
@@ -60,7 +60,7 @@
 
   <camelContext id="camelContext" managementNamePattern="#name#" xmlns="http://camel.apache.org/schema/spring">
     <route id="myRoute">
-      <from uri="quartz2://app/test?trigger.repeatInterval=1000&amp;trigger.repeatCount=-1&amp;stateful=true"/>
+      <from uri="quartz://app/test?trigger.repeatInterval=1000&amp;trigger.repeatCount=-1&amp;stateful=true"/>
       <to uri="log:trigger"/>
       <to uri="mock:result"/>
     </route>
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/myquartz.properties b/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/myquartz.properties
similarity index 100%
rename from components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/myquartz.properties
rename to components/camel-quartz/src/test/resources/org/apache/camel/component/quartz2/myquartz.properties
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/CronPolicies.xml b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/CronPolicies.xml
similarity index 100%
rename from components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/CronPolicies.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/CronPolicies.xml
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/MultiplePolicies.xml b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/MultiplePolicies.xml
similarity index 100%
rename from components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/MultiplePolicies.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/MultiplePolicies.xml
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SimplePolicies.xml b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SimplePolicies.xml
similarity index 100%
rename from components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SimplePolicies.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SimplePolicies.xml
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppDatabase.xml b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppDatabase.xml
similarity index 100%
rename from components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppDatabase.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppDatabase.xml
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml
similarity index 100%
rename from components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppOne.xml
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml
similarity index 100%
rename from components/camel-quartz2/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml
rename to components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/SpringQuartzClusteredAppTwo.xml
diff --git a/components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/myquartz.properties b/components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/myquartz.properties
similarity index 100%
rename from components/camel-quartz2/src/test/resources/org/apache/camel/component/quartz2/myquartz.properties
rename to components/camel-quartz/src/test/resources/org/apache/camel/routepolicy/quartz2/myquartz.properties
diff --git a/components/camel-quartz2/src/test/resources/tables_derby.sql b/components/camel-quartz/src/test/resources/tables_derby.sql
similarity index 100%
rename from components/camel-quartz2/src/test/resources/tables_derby.sql
rename to components/camel-quartz/src/test/resources/tables_derby.sql
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
index e46536a..9e4e237 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
@@ -32,7 +32,7 @@ public interface QuartzEndpointBuilderFactory {
 
 
     /**
-     * Builder for endpoint for the Quartz2 component.
+     * Builder for endpoint for the Quartz component.
      */
     public interface QuartzEndpointBuilder extends EndpointConsumerBuilder {
         default AdvancedQuartzEndpointBuilder advanced() {
@@ -282,7 +282,7 @@ public interface QuartzEndpointBuilderFactory {
     }
 
     /**
-     * Advanced builder for endpoint for the Quartz2 component.
+     * Advanced builder for endpoint for the Quartz component.
      */
     public interface AdvancedQuartzEndpointBuilder
             extends
@@ -474,14 +474,14 @@ public interface QuartzEndpointBuilderFactory {
         }
     }
     /**
-     * Quartz2 (camel-quartz2)
+     * Quartz (camel-quartz)
      * Provides a scheduled delivery of messages using the Quartz 2.x scheduler.
      * 
      * Category: scheduling
      * Available as of version: 2.12
-     * Maven coordinates: org.apache.camel:camel-quartz2
+     * Maven coordinates: org.apache.camel:camel-quartz
      * 
-     * Syntax: <code>quartz2:groupName/triggerName</code>
+     * Syntax: <code>quartz:groupName/triggerName</code>
      * 
      * Path parameter: groupName
      * The quartz group name to use. The combination of group name and timer
@@ -495,7 +495,7 @@ public interface QuartzEndpointBuilderFactory {
     default QuartzEndpointBuilder quartz(String path) {
         class QuartzEndpointBuilderImpl extends AbstractEndpointBuilder implements QuartzEndpointBuilder, AdvancedQuartzEndpointBuilder {
             public QuartzEndpointBuilderImpl(String path) {
-                super("quartz2", path);
+                super("quartz", path);
             }
         }
         return new QuartzEndpointBuilderImpl(path);
diff --git a/platforms/spring-boot/components-starter/camel-quartz2-starter/pom.xml b/platforms/spring-boot/components-starter/camel-quartz-starter/pom.xml
similarity index 89%
rename from platforms/spring-boot/components-starter/camel-quartz2-starter/pom.xml
rename to platforms/spring-boot/components-starter/camel-quartz-starter/pom.xml
index bc0c012..d4199a6 100644
--- a/platforms/spring-boot/components-starter/camel-quartz2-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-quartz-starter/pom.xml
@@ -24,10 +24,10 @@
     <artifactId>components-starter</artifactId>
     <version>3.0.0-SNAPSHOT</version>
   </parent>
-  <artifactId>camel-quartz2-starter</artifactId>
+  <artifactId>camel-quartz-starter</artifactId>
   <packaging>jar</packaging>
-  <name>Spring-Boot Starter :: Camel :: Quartz2</name>
-  <description>Spring-Boot Starter for Camel Quartz2 support</description>
+  <name>Spring-Boot Starter :: Camel :: Quartz</name>
+  <description>Spring-Boot Starter for Camel Quartz support</description>
   <dependencies>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -36,7 +36,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-quartz2</artifactId>
+      <artifactId>camel-quartz</artifactId>
       <version>${project.version}</version>
     </dependency>
     <!--START OF GENERATED CODE-->
diff --git a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentAutoConfiguration.java
similarity index 96%
rename from platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentAutoConfiguration.java
rename to platforms/spring-boot/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentAutoConfiguration.java
index 8c9f48f..9d60448 100644
--- a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentAutoConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentAutoConfiguration.java
@@ -70,12 +70,12 @@ public class QuartzComponentAutoConfiguration {
 
     static class GroupConditions extends GroupCondition {
         public GroupConditions() {
-            super("camel.component", "camel.component.quartz2");
+            super("camel.component", "camel.component.quartz");
         }
     }
 
     @Lazy
-    @Bean(name = "quartz2-component")
+    @Bean(name = "quartz-component")
     @ConditionalOnMissingBean(QuartzComponent.class)
     public QuartzComponent configureQuartzComponent() throws Exception {
         QuartzComponent component = new QuartzComponent();
@@ -110,12 +110,12 @@ public class QuartzComponentAutoConfiguration {
                         ? HierarchicalPropertiesEvaluator.evaluate(
                                 applicationContext.getEnvironment(),
                                 "camel.component.customizer",
-                                "camel.component.quartz2.customizer",
+                                "camel.component.quartz.customizer",
                                 ((HasId) customizer).getId())
                         : HierarchicalPropertiesEvaluator.evaluate(
                                 applicationContext.getEnvironment(),
                                 "camel.component.customizer",
-                                "camel.component.quartz2.customizer");
+                                "camel.component.quartz.customizer");
                 if (useCustomizer) {
                     LOGGER.debug("Configure component {}, with customizer {}",
                             component, customizer);
diff --git a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentConfiguration.java
similarity index 97%
rename from platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentConfiguration.java
rename to platforms/spring-boot/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentConfiguration.java
index f286e95..3793200 100644
--- a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentConfiguration.java
@@ -26,13 +26,13 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.component.quartz2")
+@ConfigurationProperties(prefix = "camel.component.quartz")
 public class QuartzComponentConfiguration
         extends
             ComponentConfigurationPropertiesCommon {
 
     /**
-     * Whether to enable auto configuration of the quartz2 component. This is
+     * Whether to enable auto configuration of the quartz component. This is
      * enabled by default.
      */
     private Boolean enabled;
diff --git a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/LICENSE.txt b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/LICENSE.txt
rename to platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/LICENSE.txt
diff --git a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/NOTICE.txt b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/NOTICE.txt
rename to platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/NOTICE.txt
diff --git a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/spring.factories
similarity index 99%
rename from platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/spring.factories
rename to platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/spring.factories
index 0d49d0a..23dc2bb 100644
--- a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/spring.factories
@@ -14,5 +14,6 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
+
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.apache.camel.component.quartz2.springboot.QuartzComponentAutoConfiguration
diff --git a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/spring.provides b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/spring.provides
similarity index 97%
rename from platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/spring.provides
rename to platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/spring.provides
index 4dee0bb9..2af2772 100644
--- a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/spring.provides
+++ b/platforms/spring-boot/components-starter/camel-quartz-starter/src/main/resources/META-INF/spring.provides
@@ -14,4 +14,4 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
-provides: camel-quartz2
+provides: camel-quartz
diff --git a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
deleted file mode 100644
index cd6b5fe..0000000
--- a/platforms/spring-boot/components-starter/camel-quartz2-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "properties": [
-    {
-      "defaultValue": true,
-      "name": "camel.component.quartz2.enabled",
-      "description": "Enable quartz2 component",
-      "type": "java.lang.Boolean"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml
index 350a6cc..2f7a8d3 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -299,6 +299,7 @@
     <module>camel-protobuf-starter</module>
     <module>camel-pubnub-starter</module>
     <module>camel-pulsar-starter</module>
+    <module>camel-quartz-starter</module>
     <module>camel-quartz2-starter</module>
     <module>camel-quickfix-starter</module>
     <module>camel-rabbitmq-starter</module>

[camel] 10/20: CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - SB integration test updated

Posted by ac...@apache.org.

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

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

commit 362a4f5e23c079c79574672e422d1b3662979a30
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 10:45:31 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - SB integration test updated
---
 .../itest/springboot/{CamelQuartz2Test.java => CamelQuartzTest.java}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelQuartz2Test.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelQuartzTest.java
similarity index 92%
rename from tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelQuartz2Test.java
rename to tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelQuartzTest.java
index fff63cb..afa9a4d 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelQuartz2Test.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelQuartzTest.java
@@ -25,7 +25,7 @@ import org.junit.runner.RunWith;
 
 
 @RunWith(Arquillian.class)
-public class CamelQuartz2Test extends AbstractSpringBootTestSupport {
+public class CamelQuartzTest extends AbstractSpringBootTestSupport {
 
     @Deployment
     public static Archive<?> createSpringBootPackage() throws Exception {
@@ -34,7 +34,7 @@ public class CamelQuartz2Test extends AbstractSpringBootTestSupport {
 
     public static ITestConfig createTestConfig() {
         return new ITestConfigBuilder()
-                .module(inferModuleName(CamelQuartz2Test.class))
+                .module(inferModuleName(CamelQuartzTest.class))
                 .unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|BaseQuartzTest$|QuartzTwoCamelContextSameNameClashTest$)") // unrelated test
                 .build();
     }

[camel] 09/20: CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Karaf integration test added back test

Posted by ac...@apache.org.

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

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

commit 7130ca7f3cc6b8c20fb7ed8372ae52f263ecf4ee
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 10:43:27 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Karaf integration test added back test
---
 .../apache/camel/itest/karaf/CamelQuartzTest.java  | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartzTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartzTest.java
new file mode 100644
index 0000000..65f54ba
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartzTest.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.itest.karaf;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+public class CamelQuartzTest extends BaseKarafTest {
+
+    public static final String COMPONENT = extractName(CamelQuartzTest.class);
+
+    @Test
+    public void test() throws Exception {
+        testComponent(COMPONENT);
+    }
+
+
+}

[camel] 13/20: CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed references camel-blueprint

Posted by ac...@apache.org.

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

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

commit c2794a6987925fb8237594ed1c06c193618ccbda
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 10:57:11 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed references camel-blueprint
---
 .../org/apache/camel/blueprint/handler/CamelNamespaceHandler.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
index b0e6469..4a6e4c6 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
@@ -1220,11 +1220,11 @@ public class CamelNamespaceHandler implements NamespaceHandler {
                         value = parameters.get("consumer.scheduler");
                     }
                     if (value != null) {
-                        // the scheduler can be quartz2 or spring based, so add reference to camel component
+                        // the scheduler can be quartz or spring based, so add reference to camel component
                         // from these components os blueprint knows about the requirement
                         String name = value.toString();
-                        if ("quartz2".equals(name)) {
-                            components.add("quartz2");
+                        if ("quartz".equals(name)) {
+                            components.add("quartz");
                         } else if ("spring".equals(name)) {
                             components.add("spring-event");
                         }

[camel] 12/20: CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed references in Javadoc

Posted by ac...@apache.org.

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

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

commit 838edc697df087c8ee307a4f041c017c93458686
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 10:56:00 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed references in Javadoc
---
 .../main/java/org/apache/camel/spi/ScheduledPollConsumerScheduler.java  | 2 +-
 .../src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/ScheduledPollConsumerScheduler.java b/core/camel-api/src/main/java/org/apache/camel/spi/ScheduledPollConsumerScheduler.java
index 46e40ad..068fbd9 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/ScheduledPollConsumerScheduler.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/ScheduledPollConsumerScheduler.java
@@ -26,7 +26,7 @@ import org.apache.camel.ShutdownableService;
  * The default implementation {@link org.apache.camel.support.DefaultScheduledPollConsumerScheduler} is
  * using the {@link java.util.concurrent.ScheduledExecutorService} from the JDK to schedule and run the poll task.
  * <p/>
- * An alternative implementation is in <tt>camel-quartz2</tt> component that allows to use CRON expression
+ * An alternative implementation is in <tt>camel-quartz</tt> component that allows to use CRON expression
  * to define when the scheduler should run.
  */
 public interface ScheduledPollConsumerScheduler extends ShutdownableService, CamelContextAware {
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java
index 0e68f92..c3e0c0c 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java
@@ -129,7 +129,7 @@ public abstract class ScheduledPollEndpoint extends DefaultEndpoint {
                     Class<? extends ScheduledPollConsumerScheduler> clazz = getCamelContext().getClassResolver().resolveMandatoryClass(QUARTZ_2_SCHEDULER, ScheduledPollConsumerScheduler.class);
                     setScheduler(getCamelContext().getInjector().newInstance(clazz));
                 } catch (ClassNotFoundException e) {
-                    throw new IllegalArgumentException("Cannot load " + QUARTZ_2_SCHEDULER + " from classpath. Make sure camel-quartz2.jar is on the classpath.", e);
+                    throw new IllegalArgumentException("Cannot load " + QUARTZ_2_SCHEDULER + " from classpath. Make sure camel-quartz.jar is on the classpath.", e);
                 }
             } else {
                 // must refer to a custom scheduler by the given name

[camel] 19/20: CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed camel-example-main

Posted by ac...@apache.org.

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

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

commit 087ab494faac7131b6afe0d5ee8b61cd6d8bf9f3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 11:46:10 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed camel-example-main
---
 .../src/main/java/org/apache/camel/example/MyRouteBuilder.java          | 2 +-
 examples/camel-example-main/src/main/resources/application.properties   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/camel-example-main/src/main/java/org/apache/camel/example/MyRouteBuilder.java b/examples/camel-example-main/src/main/java/org/apache/camel/example/MyRouteBuilder.java
index d98ae5f..c2a1983 100644
--- a/examples/camel-example-main/src/main/java/org/apache/camel/example/MyRouteBuilder.java
+++ b/examples/camel-example-main/src/main/java/org/apache/camel/example/MyRouteBuilder.java
@@ -22,7 +22,7 @@ public class MyRouteBuilder extends RouteBuilder {
 
     @Override
     public void configure() throws Exception {
-        from("quartz2:foo?cron={{myCron}}")
+        from("quartz:foo?cron={{myCron}}")
             .bean("myBean", "hello")
             .log("${body}")
             .bean("myBean", "bye")
diff --git a/examples/camel-example-main/src/main/resources/application.properties b/examples/camel-example-main/src/main/resources/application.properties
index 9d61440..b0cb4a5 100644
--- a/examples/camel-example-main/src/main/resources/application.properties
+++ b/examples/camel-example-main/src/main/resources/application.properties
@@ -35,7 +35,7 @@ camel.main.file-configurations=src/main/data/*.properties
 
 # to configure the camel quartz component
 # here we can configure the options on the component level (and we can use dash-naming-style)
-camel.component.quartz2.start-delayed-seconds = 3
+camel.component.quartz.start-delayed-seconds = 3
 
 # to configure Hystrix EIP (global and you need to add camel-hystrix to the classpath)
 ### camel.hystrix.group-key=myGroup

[camel] 11/20: CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed references in itest OSGI

Posted by ac...@apache.org.

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

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

commit c047566dd28c5348404aaff1cb472f356945f0a1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 10:55:10 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed references in itest OSGI
---
 platforms/spring-boot/components-starter/README.adoc         |  1 -
 ...artz2JmxUpdateTest.java => CamelQuartzJmxUpdateTest.java} | 12 ++++++------
 .../org/apache/camel/itest/CamelQuartz2JmxUpdateTest.xml     |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/platforms/spring-boot/components-starter/README.adoc b/platforms/spring-boot/components-starter/README.adoc
index f8db999..d0ee29b 100644
--- a/platforms/spring-boot/components-starter/README.adoc
+++ b/platforms/spring-boot/components-starter/README.adoc
@@ -20,7 +20,6 @@ The following components do not have a starter because of compatibility issues:
 * **camel-eventadmin** (intended for OSGi only)
 * **camel-ibatis** (`camel-mybatis-starter` is included)
 * **camel-paxlogging** (intended for OSGi only)
-* **camel-quartz** (`camel-quartz2-starter` is included)
 * **camel-scala**
 * **camel-scr** (intended for OSGi only)
 * **camel-spark-rest**
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelQuartz2JmxUpdateTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelQuartzJmxUpdateTest.java
similarity index 95%
rename from tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelQuartz2JmxUpdateTest.java
rename to tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelQuartzJmxUpdateTest.java
index 0a308c0..b4a9389 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelQuartz2JmxUpdateTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/CamelQuartzJmxUpdateTest.java
@@ -48,19 +48,19 @@ import static org.junit.Assert.assertNotEquals;
  * CAMEL-11471: Unable to update the cron details from Quartz scheduler MBean
  */
 @RunWith(PaxExam.class)
-public class CamelQuartz2JmxUpdateTest extends AbstractFeatureTest {
+public class CamelQuartzJmxUpdateTest extends AbstractFeatureTest {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CamelQuartz2JmxUpdateTest.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CamelQuartzJmxUpdateTest.class);
 
     @Test
     public void testUpdateCronDetails() throws Exception {
-        // install camel-quartz2 here as 'wrap:' is not available at boot time
-        installCamelFeature("camel-quartz2");
+        // install camel-quartz here as 'wrap:' is not available at boot time
+        installCamelFeature("camel-quartz");
 
         // install the camel blueprint xml file we use in this test
         URL url = ObjectHelper.loadResourceAsURL("org/apache/camel/itest/CamelQuartz2JmxUpdateTest.xml",
-            CamelQuartz2JmxUpdateTest.class.getClassLoader());
-        installBlueprintAsBundle("CamelQuartz2JmxUpdateTest", url, true);
+            CamelQuartzJmxUpdateTest.class.getClassLoader());
+        installBlueprintAsBundle("CamelQuartzJmxUpdateTest", url, true);
 
         // lookup Camel from OSGi
         CamelContext camel = getOsgiService(bundleContext, CamelContext.class);
diff --git a/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/CamelQuartz2JmxUpdateTest.xml b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/CamelQuartz2JmxUpdateTest.xml
index 920b2cc..6eb956e 100644
--- a/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/CamelQuartz2JmxUpdateTest.xml
+++ b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/CamelQuartz2JmxUpdateTest.xml
@@ -24,7 +24,7 @@
 
   <camelContext id="myCamel" xmlns="http://camel.apache.org/schema/blueprint">
     <route>
-      <from uri="quartz2://myGroup/myTimer?cron=0/1 * * * * ?" />
+      <from uri="quartz://myGroup/myTimer?cron=0/1 * * * * ?" />
       <transform>
         <constant>Hello World</constant>
       </transform>

[camel] 15/20: CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed more references

Posted by ac...@apache.org.

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

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

commit 6b8eb754ff049b9749902e772d0f9dc5a7b8743a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 11:34:03 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed more references
---
 .../camel-main-maven-plugin/src/main/docs/camel-main-maven-plugin.adoc  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catalog/camel-main-maven-plugin/src/main/docs/camel-main-maven-plugin.adoc b/catalog/camel-main-maven-plugin/src/main/docs/camel-main-maven-plugin.adoc
index b904168..7481400 100644
--- a/catalog/camel-main-maven-plugin/src/main/docs/camel-main-maven-plugin.adoc
+++ b/catalog/camel-main-maven-plugin/src/main/docs/camel-main-maven-plugin.adoc
@@ -78,7 +78,7 @@ and 1 mapping was created in the `autowire.properties` file
 [INFO] --- camel-main-maven-plugin:3.0.0-SNAPSHOT:generate (generate) @ camel-example-main-artemis ---
 [INFO] Detected Camel version used in project: 3.0.0-SNAPSHOT
 [INFO] Pre-scanning using Camel version: 3.0.0-SNAPSHOT
-[INFO] Discovered 29 Camel components from classpath: [bean, browse, class, controlbus, dataformat, dataset, dataset-test, direct, direct-vm, file, jms, language, log, mock, properties, quartz, quartz2, ref, rest, rest-api, saga, scheduler, seda, spring-event, stub, timer, validator, vm, xslt]
+[INFO] Discovered 29 Camel components from classpath: [bean, browse, class, controlbus, dataformat, dataset, dataset-test, direct, direct-vm, file, jms, language, log, mock, properties, quartz, ref, rest, rest-api, saga, scheduler, seda, spring-event, stub, timer, validator, vm, xslt]
 [INFO] Created file: /Users/davsclaus/workspace/camel/examples/camel-example-main-artemis/target/classes/META-INF/services/org/apache/camel/autowire.properties (autowire by classpath: 1)
 ----

[camel] 04/20: CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Update references, take 2

Posted by ac...@apache.org.

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

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

commit 784b970778f1850a4c654f0a030c26ee3dd7b126
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 09:58:38 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Update references, take 2
---
 .../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index c6a83b6..37fbfe8 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -2440,12 +2440,12 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-quartz2</artifactId>
+        <artifactId>camel-quartz</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-quartz2-starter</artifactId>
+        <artifactId>camel-quartz-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>

[camel] 20/20: CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Added note in MIGRATION guide

Posted by ac...@apache.org.

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

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

commit b5ef5da7bd45758964bfe6d273cdd717d08e3191
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 11:48:06 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Added note in MIGRATION guide
---
 MIGRATION.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/MIGRATION.md b/MIGRATION.md
index b75be7f..62ced89 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -126,6 +126,8 @@ The `mina2` component has been renamed to `mina`. The supported scheme is now `m
 
 The `mongodb3` component has been renamed to `mongodb`. The supported scheme is now `mongodb`.
 
+The `quartz2` component has been renamed to `quartz`. The supported scheme is now `quartz`.
+
 The `rxjava2` component has been renamed to `rxjava`.
 
 We have also renamed `camel-jetty9` to `camel-jetty`.

[camel] 18/20: CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed camel-example-main-tiny

Posted by ac...@apache.org.

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

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

commit 6ff31d2284d1e9f96385105d8f1708e299bdbe83
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 11:43:42 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed camel-example-main-tiny
---
 .../src/main/java/org/apache/camel/example/MyRouteBuilder.java        | 2 +-
 .../src/main/resources/META-INF/spring-configuration-metadata.json    | 4 ++--
 .../camel-example-main-tiny/src/main/resources/application.properties | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/camel-example-main-tiny/src/main/java/org/apache/camel/example/MyRouteBuilder.java b/examples/camel-example-main-tiny/src/main/java/org/apache/camel/example/MyRouteBuilder.java
index d98ae5f..c2a1983 100644
--- a/examples/camel-example-main-tiny/src/main/java/org/apache/camel/example/MyRouteBuilder.java
+++ b/examples/camel-example-main-tiny/src/main/java/org/apache/camel/example/MyRouteBuilder.java
@@ -22,7 +22,7 @@ public class MyRouteBuilder extends RouteBuilder {
 
     @Override
     public void configure() throws Exception {
-        from("quartz2:foo?cron={{myCron}}")
+        from("quartz:foo?cron={{myCron}}")
             .bean("myBean", "hello")
             .log("${body}")
             .bean("myBean", "bye")
diff --git a/examples/camel-example-main-tiny/src/main/resources/META-INF/spring-configuration-metadata.json b/examples/camel-example-main-tiny/src/main/resources/META-INF/spring-configuration-metadata.json
index db38795..d1fcda2 100644
--- a/examples/camel-example-main-tiny/src/main/resources/META-INF/spring-configuration-metadata.json
+++ b/examples/camel-example-main-tiny/src/main/resources/META-INF/spring-configuration-metadata.json
@@ -893,7 +893,7 @@
 			"defaultValue":"true"
 		},
 		{
-			"name":"camel.component.quartz2.start-delayed-seconds",
+			"name":"camel.component.quartz.start-delayed-seconds",
 			"type":"java.lang.Integer",
 			"sourceType":"org.apache.camel.component.quartz2.QuartzComponent",
 			"description":"Seconds to wait before starting the quartz scheduler."
@@ -965,4 +965,4 @@
 			"defaultValue":"false"
 		}
 	]
-}
\ No newline at end of file
+}
diff --git a/examples/camel-example-main-tiny/src/main/resources/application.properties b/examples/camel-example-main-tiny/src/main/resources/application.properties
index 3f19af4..ca8f08c 100644
--- a/examples/camel-example-main-tiny/src/main/resources/application.properties
+++ b/examples/camel-example-main-tiny/src/main/resources/application.properties
@@ -31,7 +31,7 @@ camel.main.file-configurations=src/main/data/*.properties
 
 # to configure the camel quartz component
 # here we can configure the options on the component level (and we can use dash-naming-style)
-camel.component.quartz2.start-delayed-seconds = 3
+camel.component.quartz.start-delayed-seconds = 3
 
 # to configure Hystrix EIP (global and you need to add camel-hystrix to the classpath)
 ### camel.hystrix.group-key=myGroup

[camel] 05/20: CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Update references, take 3

Posted by ac...@apache.org.

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

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

commit 1370c7ca15baf6a931418c274797f342ca807b0f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 09:59:36 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Update references, take 3
---
 platforms/spring-boot/components-starter/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml
index 2f7a8d3..9401240 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -300,7 +300,6 @@
     <module>camel-pubnub-starter</module>
     <module>camel-pulsar-starter</module>
     <module>camel-quartz-starter</module>
-    <module>camel-quartz2-starter</module>
     <module>camel-quickfix-starter</module>
     <module>camel-rabbitmq-starter</module>
     <module>camel-reactive-executor-vertx-starter</module>

[camel] 14/20: CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed references camel-catalog

Posted by ac...@apache.org.

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

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

commit 51ac552f3b261473c7e29c78ae0323a641c4982f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 11:00:03 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Fixed references camel-catalog
---
 catalog/camel-catalog/src/test/resources/sample-pretty.json | 2 +-
 catalog/camel-catalog/src/test/resources/sample.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/catalog/camel-catalog/src/test/resources/sample-pretty.json b/catalog/camel-catalog/src/test/resources/sample-pretty.json
index 80ced29..96791ae 100644
--- a/catalog/camel-catalog/src/test/resources/sample-pretty.json
+++ b/catalog/camel-catalog/src/test/resources/sample-pretty.json
@@ -623,7 +623,7 @@
       "javaType": "org.apache.camel.spi.ScheduledPollConsumerScheduler",
       "enum": [
         "spring",
-        "quartz2"
+        "quartz"
       ],
       "deprecated": "false"
     },
diff --git a/catalog/camel-catalog/src/test/resources/sample.json b/catalog/camel-catalog/src/test/resources/sample.json
index 26396ea..025e12e 100644
--- a/catalog/camel-catalog/src/test/resources/sample.json
+++ b/catalog/camel-catalog/src/test/resources/sample.json
@@ -79,7 +79,7 @@
     "runLoggingLevel": { "kind": "parameter", "label": "consumer", "type": "string", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "DEBUG", "ERROR", "INFO", "TRACE", "WARN", "OFF" ], "deprecated": "false", "defaultValue": "TRACE" },
     "sendEmptyMessageWhenIdle": { "kind": "parameter", "label": "consumer", "type": "boolean", "javaType": "boolean", "deprecated": "false" },
     "greedy": { "kind": "parameter", "label": "consumer", "type": "boolean", "javaType": "boolean", "deprecated": "false" },
-    "scheduler": { "kind": "parameter", "label": "consumer", "type": "string", "javaType": "org.apache.camel.spi.ScheduledPollConsumerScheduler", "enum": [ "spring", "quartz2" ], "deprecated": "false" },
+    "scheduler": { "kind": "parameter", "label": "consumer", "type": "string", "javaType": "org.apache.camel.spi.ScheduledPollConsumerScheduler", "enum": [ "spring", "quartz" ], "deprecated": "false" },
     "schedulerProperties": { "kind": "parameter", "label": "consumer", "type": "object", "javaType": "java.util.Map<java.lang.String,java.lang.Object>", "deprecated": "false" },
     "scheduledExecutorService": { "kind": "parameter", "label": "consumer", "type": "object", "javaType": "java.util.concurrent.ScheduledExecutorService", "deprecated": "false" },
     "backoffMultiplier": { "kind": "parameter", "label": "consumer", "type": "integer", "javaType": "int", "deprecated": "false" },

[camel] 02/20: CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Update references

Posted by ac...@apache.org.

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

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

commit 2bd1cdfe968a74231684da1b5970faf9c87b06e9
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 09:52:10 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Update references
---
 apache-camel/pom.xml                             | 4 ++--
 apache-camel/src/main/descriptors/common-bin.xml | 4 ++--
 bom/camel-bom/pom.xml                            | 4 ++--
 components/camel-mail/pom.xml                    | 2 +-
 components/camel-zookeeper-master/pom.xml        | 2 +-
 components/pom.xml                               | 2 +-
 examples/camel-example-main-artemis/pom.xml      | 2 +-
 examples/camel-example-main-tiny/pom.xml         | 2 +-
 examples/camel-example-main/pom.xml              | 2 +-
 parent/pom.xml                                   | 4 ++--
 tests/camel-itest/pom.xml                        | 2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 158609f..8ceec78 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -1149,7 +1149,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-quartz2</artifactId>
+      <artifactId>camel-quartz</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
@@ -2638,7 +2638,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-quartz2-starter</artifactId>
+      <artifactId>camel-quartz-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 077c358..37992cb 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -250,7 +250,7 @@
         <include>org.apache.camel:camel-protobuf</include>
         <include>org.apache.camel:camel-pubnub</include>
         <include>org.apache.camel:camel-pulsar</include>
-        <include>org.apache.camel:camel-quartz2</include>
+        <include>org.apache.camel:camel-quartz</include>
         <include>org.apache.camel:camel-quickfix</include>
         <include>org.apache.camel:camel-rabbitmq</include>
         <include>org.apache.camel:camel-reactive-executor-vertx</include>
@@ -587,7 +587,7 @@
         <include>org.apache.camel:camel-protobuf-starter</include>
         <include>org.apache.camel:camel-pubnub-starter</include>
         <include>org.apache.camel:camel-pulsar-starter</include>
-        <include>org.apache.camel:camel-quartz2-starter</include>
+        <include>org.apache.camel:camel-quartz-starter</include>
         <include>org.apache.camel:camel-quickfix-starter</include>
         <include>org.apache.camel:camel-rabbitmq-starter</include>
         <include>org.apache.camel:camel-reactive-executor-vertx-starter</include>
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index d3874c3..1bf35f8 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -2215,12 +2215,12 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-quartz2</artifactId>
+        <artifactId>camel-quartz</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-quartz2-starter</artifactId>
+        <artifactId>camel-quartz-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml
index 152c288..ac4353c 100644
--- a/components/camel-mail/pom.xml
+++ b/components/camel-mail/pom.xml
@@ -110,7 +110,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-quartz2</artifactId>
+            <artifactId>camel-quartz</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/components/camel-zookeeper-master/pom.xml b/components/camel-zookeeper-master/pom.xml
index 115f72e..7d61b85 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -117,7 +117,7 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-quartz2</artifactId>
+            <artifactId>camel-quartz</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/components/pom.xml b/components/pom.xml
index 82aae97..eb3529f 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -264,7 +264,7 @@
         <module>camel-protobuf</module>
         <module>camel-pubnub</module>
         <module>camel-pulsar</module>
-        <module>camel-quartz2</module>
+        <module>camel-quartz</module>
         <module>camel-quickfix</module>
         <module>camel-rabbitmq</module>
         <module>camel-reactive-executor-vertx</module>
diff --git a/examples/camel-example-main-artemis/pom.xml b/examples/camel-example-main-artemis/pom.xml
index f1ea8df..87d4571 100644
--- a/examples/camel-example-main-artemis/pom.xml
+++ b/examples/camel-example-main-artemis/pom.xml
@@ -57,7 +57,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-quartz2</artifactId>
+            <artifactId>camel-quartz</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
diff --git a/examples/camel-example-main-tiny/pom.xml b/examples/camel-example-main-tiny/pom.xml
index 96d1d08..f3aa11a 100644
--- a/examples/camel-example-main-tiny/pom.xml
+++ b/examples/camel-example-main-tiny/pom.xml
@@ -70,7 +70,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-quartz2</artifactId>
+            <artifactId>camel-quartz</artifactId>
         </dependency>
 
         <!-- we dont need XML DSL or JAXB -->
diff --git a/examples/camel-example-main/pom.xml b/examples/camel-example-main/pom.xml
index 73f6388..750fb23 100644
--- a/examples/camel-example-main/pom.xml
+++ b/examples/camel-example-main/pom.xml
@@ -49,7 +49,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-quartz2</artifactId>
+            <artifactId>camel-quartz</artifactId>
         </dependency>
 
         <!-- logging -->
diff --git a/parent/pom.xml b/parent/pom.xml
index 9eefcb1..d48deb5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1874,7 +1874,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-quartz2</artifactId>
+        <artifactId>camel-quartz</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -3383,7 +3383,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-quartz2-starter</artifactId>
+        <artifactId>camel-quartz-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml
index b27980b..6c70a47 100644
--- a/tests/camel-itest/pom.xml
+++ b/tests/camel-itest/pom.xml
@@ -96,7 +96,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-quartz2</artifactId>
+            <artifactId>camel-quartz</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

[camel] 08/20: CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Karaf integration test and feature updated

Posted by ac...@apache.org.

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

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

commit 740d4522e96bcd180958f96b9fcd23a6b8f13b81
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 10:42:40 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Karaf integration test and feature updated
---
 .../karaf/features/src/main/resources/features.xml |  4 +--
 .../apache/camel/itest/karaf/CamelQuartz2Test.java | 34 ----------------------
 2 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index ccf2ef8..536d795 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2052,12 +2052,12 @@
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.pulsar-client-admin/${pulsar-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-pulsar/${project.version}</bundle>
   </feature>
-  <feature name='camel-quartz2' version='${project.version}' start-level='50'>
+  <feature name='camel-quartz' version='${project.version}' start-level='50'>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.c3p0/${c3p0-bundle-version}</bundle>
     <bundle dependency='true'>mvn:com.zaxxer/HikariCP-java7/${hikaricp-version}</bundle>
     <bundle dependency='true'>wrap:mvn:org.quartz-scheduler/quartz/${quartz2-version}$overwrite=merge&amp;DynamicImport-Package=org.apache.camel.component.quartz2</bundle>
     <feature version='${project.version}'>camel-core</feature>
-    <bundle>mvn:org.apache.camel/camel-quartz2/${project.version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-quartz/${project.version}</bundle>
   </feature>
   <feature name='camel-quickfix' version='${project.version}' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartz2Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartz2Test.java
deleted file mode 100644
index 2b2f86e..0000000
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelQuartz2Test.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.itest.karaf;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.PaxExam;
-
-@RunWith(PaxExam.class)
-public class CamelQuartz2Test extends BaseKarafTest {
-
-    public static final String COMPONENT = extractName(CamelQuartz2Test.class);
-
-    @Test
-    public void test() throws Exception {
-        testComponent(COMPONENT);
-    }
-
-
-}
\ No newline at end of file

[camel] 03/20: CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Update References in scheduler

Posted by ac...@apache.org.

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

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

commit 0866b8018dd66fbe374f6a9ac18d7c7057ad7a10
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 09:56:49 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Update References in scheduler
---
 .../camel/support/ScheduledPollEndpoint.java       | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java
index d4c4d06..0e68f92 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollEndpoint.java
@@ -68,12 +68,12 @@ public abstract class ScheduledPollEndpoint extends DefaultEndpoint {
     @UriParam(optionalPrefix = "consumer.", label = "consumer,scheduler",
             description = "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages.")
     private boolean greedy;
-    @UriParam(optionalPrefix = "consumer.", enums = "none,spring,quartz2",
-            defaultValue = "none", label = "consumer,scheduler", description = "To use a cron scheduler from either camel-spring or camel-quartz2 component")
+    @UriParam(optionalPrefix = "consumer.", enums = "none,spring,quartz",
+            defaultValue = "none", label = "consumer,scheduler", description = "To use a cron scheduler from either camel-spring or camel-quartz component")
     private ScheduledPollConsumerScheduler scheduler;
     private String schedulerName = "none"; // used when configuring scheduler using a string value
     @UriParam(prefix = "scheduler.", multiValue = true, label = "consumer,scheduler",
-            description = "To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler.")
+            description = "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler.")
     private Map<String, Object> schedulerProperties;
     @UriParam(optionalPrefix = "consumer.", label = "consumer,scheduler",
             description = "Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.")
@@ -116,15 +116,15 @@ public abstract class ScheduledPollEndpoint extends DefaultEndpoint {
                 // no cron scheduler in use
                 scheduler = null;
             } else if ("spring".equals(schedulerName)) {
-                // special for scheduler if its "spring" or "quartz2"
+                // special for scheduler if its "spring" or "quartz"
                 try {
                     Class<? extends ScheduledPollConsumerScheduler> clazz = getCamelContext().getClassResolver().resolveMandatoryClass(SPRING_SCHEDULER, ScheduledPollConsumerScheduler.class);
                     setScheduler(getCamelContext().getInjector().newInstance(clazz));
                 } catch (ClassNotFoundException e) {
                     throw new IllegalArgumentException("Cannot load " + SPRING_SCHEDULER + " from classpath. Make sure camel-spring.jar is on the classpath.", e);
                 }
-            } else if ("quartz2".equals(schedulerName)) {
-                // special for scheduler if its "spring" or "quartz2"
+            } else if ("quartz".equals(schedulerName)) {
+                // special for scheduler if its "spring" or "quartz"
                 try {
                     Class<? extends ScheduledPollConsumerScheduler> clazz = getCamelContext().getClassResolver().resolveMandatoryClass(QUARTZ_2_SCHEDULER, ScheduledPollConsumerScheduler.class);
                     setScheduler(getCamelContext().getInjector().newInstance(clazz));
@@ -339,12 +339,12 @@ public abstract class ScheduledPollEndpoint extends DefaultEndpoint {
     /**
      * Allow to plugin a custom org.apache.camel.spi.ScheduledPollConsumerScheduler to use as the scheduler for
      * firing when the polling consumer runs. The default implementation uses the ScheduledExecutorService and
-     * there is a Quartz2, and Spring based which supports CRON expressions.
+     * there is a Quartz, and Spring based which supports CRON expressions.
      *
      * Notice: If using a custom scheduler then the options for initialDelay, useFixedDelay, timeUnit,
-     * and scheduledExecutorService may not be in use. Use the text quartz2 to refer to use the Quartz2 scheduler;
+     * and scheduledExecutorService may not be in use. Use the text quartz to refer to use the Quartz scheduler;
      * and use the text spring to use the Spring based; and use the text #myScheduler to refer to a custom scheduler
-     * by its id in the Registry. See Quartz2 page for an example.
+     * by its id in the Registry. See Quartz page for an example.
      */
     public void setScheduler(ScheduledPollConsumerScheduler scheduler) {
         this.scheduler = scheduler;
@@ -353,7 +353,7 @@ public abstract class ScheduledPollEndpoint extends DefaultEndpoint {
     /**
      * Allow to plugin a custom org.apache.camel.spi.ScheduledPollConsumerScheduler to use as the scheduler for
      * firing when the polling consumer runs. This option is used for referring to one of the built-in schedulers
-     * either <tt>spring</tt>, or <tt>quartz2</tt>. Using <tt>none</tt> refers to no scheduler to be used.
+     * either <tt>spring</tt>, or <tt>quartz</tt>. Using <tt>none</tt> refers to no scheduler to be used.
      */
     public void setScheduler(String schedulerName) {
         this.schedulerName = schedulerName;
@@ -364,7 +364,7 @@ public abstract class ScheduledPollEndpoint extends DefaultEndpoint {
     }
 
     /**
-     * To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler.
+     * To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler.
      */
     public void setSchedulerProperties(Map<String, Object> schedulerProperties) {
         this.schedulerProperties = schedulerProperties;

[camel] 06/20: CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Update docs

Posted by ac...@apache.org.

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

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

commit 524c3cea5a2041745a8dc67f8a53bb1d1c450ca4
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Aug 6 10:02:26 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz - Update docs
---
 ...uartz2-component.adoc => quartz-component.adoc} | 48 +++++++++++-----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/components/camel-quartz/src/main/docs/quartz2-component.adoc b/components/camel-quartz/src/main/docs/quartz-component.adoc
similarity index 92%
rename from components/camel-quartz/src/main/docs/quartz2-component.adoc
rename to components/camel-quartz/src/main/docs/quartz-component.adoc
index ed9cf19..a71bfed 100644
--- a/components/camel-quartz/src/main/docs/quartz2-component.adoc
+++ b/components/camel-quartz/src/main/docs/quartz-component.adoc
@@ -1,9 +1,9 @@
-[[quartz2-component]]
-= Quartz2 Component
+[[quartz-component]]
+= Quartz Component
 
 *Available as of Camel version 2.12*
 
-The Quartz2 component provides a scheduled delivery of messages using
+The Quartz component provides a scheduled delivery of messages using
 the http://www.quartz-scheduler.org/[Quartz Scheduler 2.x].  +
  Each endpoint represents a different timer (in Quartz terms, a Trigger
 and JobDetail).
@@ -15,7 +15,7 @@ for this component:
 ------------------------------------------------------------
 <dependency>
     <groupId>org.apache.camel</groupId>
-    <artifactId>camel-quartz2</artifactId>
+    <artifactId>camel-quartz</artifactId>
     <version>x.x.x</version>
     <!-- use the same version as your Camel core version -->
 </dependency>
@@ -25,10 +25,10 @@ for this component:
 == URI format
 
 ----
-quartz2://timerName?options
-quartz2://groupName/timerName?options
-quartz2://groupName/timerName?cron=expression
-quartz2://timerName?cron=expression
+quartz://timerName?options
+quartz://groupName/timerName?options
+quartz://groupName/timerName?cron=expression
+quartz://timerName?cron=expression
 ----
 
 The component uses either a `CronTrigger` or a `SimpleTrigger`. If no
@@ -163,7 +163,7 @@ the `mock:results` endpoint:
 
 [source,java]
 ----
-from("quartz2://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute")
+from("quartz://myGroup/myTimerName?trigger.repeatInterval=2&trigger.repeatCount=1").routeId("myRoute")
     .to("mock:result");
 ----
 
@@ -178,7 +178,7 @@ for the next execution.
 
 If you run in OSGi such as Apache ServiceMix, or Apache Karaf, and have
 multiple bundles with Camel routes that start from
-xref:quartz2-component.adoc[Quartz2] endpoints, then make sure if you assign an `id` 
+xref:quartz-component.adoc[Quartz] endpoints, then make sure if you assign an `id` 
 to the `<camelContext>` that this id is unique, as this is
 required by the `QuartzScheduler` in the OSGi container. If you do not
 set any `id` on `<camelContext>` then a unique id is auto assigned, and there is no problem.
@@ -191,7 +191,7 @@ By default Quartz will look for a `quartz.properties` file in the
 deployments this means just drop the quartz.properties in
 `WEB-INF/classes/org/quartz`.
 
-However the Camel xref:quartz2-component.adoc[Quartz2] component also allows you
+However the Camel xref:quartz-component.adoc[Quartz] component also allows you
 to configure properties:
 
 [width="100%",cols="10%,10%,10%,70%",options="header",]
@@ -223,7 +223,7 @@ This option is set to true by default, unless explicitly disabled.
 
 == Starting the Quartz scheduler
 
-The xref:quartz2-component.adoc[Quartz2] component offers an option to let the
+The xref:quartz-component.adoc[Quartz] component offers an option to let the
 Quartz scheduler be started delayed, or not auto started at all.
 
 This is an example:
@@ -238,7 +238,7 @@ This is an example:
 == Clustering
 
 If you use Quartz in clustered mode, e.g. the `JobStore` is clustered.
-Then the xref:quartz2-component.adoc[Quartz2] component will *not* pause/remove
+Then the xref:quartz-component.adoc[Quartz] component will *not* pause/remove
 triggers when a node is being stopped/shutdown. This allows the trigger
 to keep running on the other nodes in the cluster.
 
@@ -270,7 +270,7 @@ starting at 12pm (noon) to 6pm on weekdays:
 
 [source,java]
 ----
-from("quartz2://myGroup/myTimerName?cron=0+0/5+12-18+?+*+MON-FRI")
+from("quartz://myGroup/myTimerName?cron=0+0/5+12-18+?+*+MON-FRI")
     .to("activemq:Totally.Rocks");
 ----
 
@@ -296,7 +296,7 @@ The Quartz Scheduler allows you to configure time zone per trigger. For
 example to use a timezone of your country, then you can do as follows:
 
 ----
-quartz2://groupName/timerName?cron=0+0/5+12-18+?+*+MON-FRI&trigger.timeZone=Europe/Stockholm
+quartz://groupName/timerName?cron=0+0/5+12-18+?+*+MON-FRI&trigger.timeZone=Europe/Stockholm
 ----
 
 The timeZone value is the values accepted by `java.util.TimeZone`.
@@ -311,12 +311,12 @@ constants that may be set as this property's value.
 For example to configure the simple trigger to use misfire instruction 4:
 
 ----
-quartz2://myGroup/myTimerName?trigger.repeatInterval=2000&trigger.misfireInstruction=4
+quartz://myGroup/myTimerName?trigger.repeatInterval=2000&trigger.misfireInstruction=4
 ----
 
 And likewise you can configure the cron trigger with one of its misfire instructions as well:
 ----
-quartz2://myGroup/myTimerName?cron=0/2+*+*+*+*+?trigger.misfireInstruction=2
+quartz://myGroup/myTimerName?cron=0/2+*+*+*+*+?trigger.misfireInstruction=2
 ----
 
 The simple and cron triggers has the following misfire instructions representative:
@@ -403,7 +403,7 @@ but it does not want to be fired now.
 
 == Using QuartzScheduledPollConsumerScheduler
 
-The xref:quartz2-component.adoc[Quartz2] component provides a
+The xref:quartz-component.adoc[Quartz] component provides a
 Polling Consumer scheduler which allows to
 use cron based scheduling for xref:manual::polling-consumer.adoc[Polling
 Consumer] such as the File and FTP
@@ -414,13 +414,13 @@ second, then a Camel route can be define simply as:
 
 [source,java]
 ----
-    from("file:inbox?scheduler=quartz2&scheduler.cron=0/2+*+*+*+*+?")
+    from("file:inbox?scheduler=quartz&scheduler.cron=0/2+*+*+*+*+?")
        .to("bean:process");
 ----
 
-Notice we define the `scheduler=quartz2` to instruct Camel to use the
-xref:quartz2-component.adoc[Quartz2] based scheduler. Then we use `scheduler.xxx`
-options to configure the scheduler. The xref:quartz2-component.adoc[Quartz2]
+Notice we define the `scheduler=quartz` to instruct Camel to use the
+xref:quartz-component.adoc[Quartz] based scheduler. Then we use `scheduler.xxx`
+options to configure the scheduler. The xref:quartz-component.adoc[Quartz]
 scheduler requires the cron option to be set.
 
 The following options is supported:
@@ -430,7 +430,7 @@ The following options is supported:
 |Parameter |Default |Type |Description
 
 |`quartzScheduler` |`null` |`org.quartz.Scheduler` |To use a custom Quartz scheduler. If none configure then the shared
-scheduler from the xref:quartz2-component.adoc[Quartz2] component is used.
+scheduler from the xref:quartz-component.adoc[Quartz] component is used.
 
 |`cron` |`null` |`String` |*Mandatory*: To define the cron expression for triggering the polls.
 
@@ -448,7 +448,7 @@ For example to configure the trigger id and group:
 
 [source,java]
 ----
-    from("file:inbox?scheduler=quartz2&scheduler.cron=0/2+*+*+*+*+?&scheduler.triggerId=myId&scheduler.triggerGroup=myGroup")
+    from("file:inbox?scheduler=quartz&scheduler.cron=0/2+*+*+*+*+?&scheduler.triggerId=myId&scheduler.triggerGroup=myGroup")
        .to("bean:process");
 ----