You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by fm...@apache.org on 2026/04/16 14:46:56 UTC

(camel-spring-boot) branch main updated (aebe9c51199 -> 136b6c53c47)

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

fmariani pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git


    from aebe9c51199 Exclude not needed cxf-rt-ws-security test dependency to avoid Shibboleth repository issues
     new 742feb57b6f chore: regenerate auto-configuration classes with @AutoConfiguration
     new 136b6c53c47 chore: adopt @AutoConfiguration in components-starter and generator

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../ActiveMQComponentAutoConfiguration.java        | 19 +++---
 .../ActiveMQComponentAutoConfiguration.java        | 19 +++---
 .../springboot/AMQPComponentAutoConfiguration.java | 19 +++---
 .../ArangoDbComponentAutoConfiguration.java        | 19 +++---
 .../springboot/AS2ComponentAutoConfiguration.java  | 19 +++---
 .../ASN1DataFormatAutoConfiguration.java           | 19 +++---
 .../AsteriskComponentAutoConfiguration.java        | 19 +++---
 .../WebsocketComponentAutoConfiguration.java       | 19 +++---
 .../springboot/AtomComponentAutoConfiguration.java | 19 +++---
 .../springboot/AvroComponentAutoConfiguration.java | 19 +++---
 .../AvroDataFormatAutoConfiguration.java           | 19 +++---
 .../BedrockAgentComponentAutoConfiguration.java    | 19 +++---
 ...rockAgentRuntimeComponentAutoConfiguration.java | 19 +++---
 .../BedrockComponentAutoConfiguration.java         | 19 +++---
 .../CloudtrailComponentAutoConfiguration.java      | 19 +++---
 .../AWSConfigComponentAutoConfiguration.java       | 19 +++---
 .../ParameterStoreComponentAutoConfiguration.java  | 19 +++---
 .../SecretsManagerComponentAutoConfiguration.java  | 19 +++---
 .../SecurityHubComponentAutoConfiguration.java     | 19 +++---
 .../aws/xray/starter/AwsXRayAutoConfiguration.java | 16 +++--
 .../xray/starter/CamelAwsXRayTracingStrategy.java  |  2 +-
 .../Athena2ComponentAutoConfiguration.java         | 19 +++---
 .../Comprehend2ComponentAutoConfiguration.java     | 19 +++---
 .../springboot/Cw2ComponentAutoConfiguration.java  | 19 +++---
 .../springboot/Ddb2ComponentAutoConfiguration.java | 19 +++---
 .../Ddb2StreamComponentAutoConfiguration.java      | 19 +++---
 .../AWS2EC2ComponentAutoConfiguration.java         | 19 +++---
 .../springboot/ECS2ComponentAutoConfiguration.java | 19 +++---
 .../springboot/EKS2ComponentAutoConfiguration.java | 19 +++---
 .../EventbridgeComponentAutoConfiguration.java     | 19 +++---
 .../springboot/IAM2ComponentAutoConfiguration.java | 19 +++---
 ...KinesisFirehose2ComponentAutoConfiguration.java | 19 +++---
 .../Kinesis2ComponentAutoConfiguration.java        | 19 +++---
 .../springboot/KMS2ComponentAutoConfiguration.java | 19 +++---
 .../Lambda2ComponentAutoConfiguration.java         | 19 +++---
 .../springboot/MQ2ComponentAutoConfiguration.java  | 19 +++---
 .../springboot/MSK2ComponentAutoConfiguration.java | 19 +++---
 .../Polly2ComponentAutoConfiguration.java          | 19 +++---
 .../RedshiftData2ComponentAutoConfiguration.java   | 19 +++---
 .../Rekognition2ComponentAutoConfiguration.java    | 19 +++---
 .../AWS2S3ComponentAutoConfiguration.java          | 19 +++---
 .../AWS2S3VectorsComponentAutoConfiguration.java   | 19 +++---
 .../springboot/Ses2ComponentAutoConfiguration.java | 19 +++---
 .../springboot/Sns2ComponentAutoConfiguration.java | 19 +++---
 .../springboot/Sqs2ComponentAutoConfiguration.java | 19 +++---
 .../StepFunctions2ComponentAutoConfiguration.java  | 19 +++---
 .../springboot/STS2ComponentAutoConfiguration.java | 19 +++---
 .../Textract2ComponentAutoConfiguration.java       | 19 +++---
 .../Timestream2ComponentAutoConfiguration.java     | 19 +++---
 .../Transcribe2ComponentAutoConfiguration.java     | 19 +++---
 .../Translate2ComponentAutoConfiguration.java      | 19 +++---
 .../CosmosDbComponentAutoConfiguration.java        | 19 +++---
 .../EventGridComponentAutoConfiguration.java       | 19 +++---
 .../EventHubsComponentAutoConfiguration.java       | 19 +++---
 .../FilesComponentAutoConfiguration.java           | 19 +++---
 .../FunctionsComponentAutoConfiguration.java       | 19 +++---
 .../KeyVaultComponentAutoConfiguration.java        | 19 +++---
 .../ServiceBusComponentAutoConfiguration.java      | 19 +++---
 .../springboot/BlobComponentAutoConfiguration.java | 19 +++---
 .../DataLakeComponentAutoConfiguration.java        | 19 +++---
 .../QueueComponentAutoConfiguration.java           | 19 +++---
 .../BarcodeDataFormatAutoConfiguration.java        | 19 +++---
 .../Base64DataFormatAutoConfiguration.java         | 19 +++---
 .../springboot/BeanComponentAutoConfiguration.java | 19 +++---
 .../ClassComponentAutoConfiguration.java           | 19 +++---
 .../springboot/BeanLanguageAutoConfiguration.java  | 19 +++---
 .../BeanValidatorComponentAutoConfiguration.java   | 19 +++---
 .../BeanIODataFormatAutoConfiguration.java         | 19 +++---
 .../BindyCsvDataFormatAutoConfiguration.java       | 19 +++---
 ...indyFixedLengthDataFormatAutoConfiguration.java | 19 +++---
 ...ndyKeyValuePairDataFormatAutoConfiguration.java | 19 +++---
 .../BonitaComponentAutoConfiguration.java          | 19 +++---
 .../springboot/BoxComponentAutoConfiguration.java  | 19 +++---
 .../BraintreeComponentAutoConfiguration.java       | 19 +++---
 .../BrowseComponentAutoConfiguration.java          | 19 +++---
 .../CaffeineCacheComponentAutoConfiguration.java   | 19 +++---
 ...affeineLoadCacheComponentAutoConfiguration.java | 19 +++---
 .../CassandraComponentAutoConfiguration.java       | 19 +++---
 .../CBORDataFormatAutoConfiguration.java           | 19 +++---
 .../ChatScriptComponentAutoConfiguration.java      | 19 +++---
 .../ChunkComponentAutoConfiguration.java           | 19 +++---
 .../ClickUpComponentAutoConfiguration.java         | 19 +++---
 .../springboot/CMComponentAutoConfiguration.java   | 19 +++---
 .../springboot/CoAPComponentAutoConfiguration.java | 19 +++---
 .../CometdComponentAutoConfiguration.java          | 19 +++---
 .../ConsulClusterServiceAutoConfiguration.java     | 17 +++---
 .../ConsulComponentAutoConfiguration.java          | 19 +++---
 .../ControlBusComponentAutoConfiguration.java      | 19 +++---
 .../ConstantLanguageAutoConfiguration.java         | 19 +++---
 .../CSimpleLanguageAutoConfiguration.java          | 19 +++---
 .../HeaderLanguageAutoConfiguration.java           | 19 +++---
 .../ExchangePropertyLanguageAutoConfiguration.java | 19 +++---
 .../springboot/RefLanguageAutoConfiguration.java   | 19 +++---
 .../springboot/FileLanguageAutoConfiguration.java  | 19 +++---
 .../SimpleLanguageAutoConfiguration.java           | 19 +++---
 .../TokenizeLanguageAutoConfiguration.java         | 19 +++---
 .../VariableLanguageAutoConfiguration.java         | 19 +++---
 ...stConfigurationDefinitionAutoConfiguration.java | 20 +++---
 .../CouchbaseComponentAutoConfiguration.java       | 19 +++---
 .../CouchDbComponentAutoConfiguration.java         | 19 +++---
 .../springboot/CronComponentAutoConfiguration.java | 19 +++---
 .../springboot/PGPDataFormatAutoConfiguration.java | 19 +++---
 ...DigitalSignatureComponentAutoConfiguration.java | 19 +++---
 .../CryptoDataFormatAutoConfiguration.java         | 19 +++---
 .../springboot/CsvDataFormatAutoConfiguration.java | 19 +++---
 .../CxfRsComponentAutoConfiguration.java           | 19 +++---
 .../springboot/CxfComponentAutoConfiguration.java  | 19 +++---
 .../CyberArkVaultComponentAutoConfiguration.java   | 19 +++---
 .../springboot/DaprComponentAutoConfiguration.java | 19 +++---
 .../DataFormatComponentAutoConfiguration.java      | 19 +++---
 .../DataSetComponentAutoConfiguration.java         | 19 +++---
 .../DataSetTestComponentAutoConfiguration.java     | 19 +++---
 .../DatasonnetLanguageAutoConfiguration.java       | 19 +++---
 .../DebeziumDb2ComponentAutoConfiguration.java     | 19 +++---
 .../DebeziumMongodbComponentAutoConfiguration.java | 19 +++---
 .../DebeziumMySqlComponentAutoConfiguration.java   | 19 +++---
 .../DebeziumOracleComponentAutoConfiguration.java  | 19 +++---
 ...DebeziumPostgresComponentAutoConfiguration.java | 19 +++---
 ...ebeziumSqlserverComponentAutoConfiguration.java | 19 +++---
 .../boot/debug/CamelDebugAutoConfiguration.java    |  6 +-
 .../springboot/DfdlComponentAutoConfiguration.java | 19 +++---
 .../DfdlDataFormatAutoConfiguration.java           | 19 +++---
 .../Dhis2ComponentAutoConfiguration.java           | 19 +++---
 .../DigitalOceanComponentAutoConfiguration.java    | 19 +++---
 .../DirectComponentAutoConfiguration.java          | 19 +++---
 .../DisruptorComponentAutoConfiguration.java       | 19 +++---
 .../DisruptorVmComponentAutoConfiguration.java     | 19 +++---
 .../springboot/DJLComponentAutoConfiguration.java  | 19 +++---
 .../springboot/DnsComponentAutoConfiguration.java  | 19 +++---
 .../DockerComponentAutoConfiguration.java          | 19 +++---
 .../DoclingComponentAutoConfiguration.java         | 19 +++---
 .../DrillComponentAutoConfiguration.java           | 19 +++---
 .../DropboxComponentAutoConfiguration.java         | 19 +++---
 ...micRouterControlComponentAutoConfiguration.java | 19 +++---
 .../DynamicRouterComponentAutoConfiguration.java   | 19 +++---
 .../EhcacheComponentAutoConfiguration.java         | 19 +++---
 ...searchRestClientComponentAutoConfiguration.java | 19 +++---
 .../ElasticsearchComponentAutoConfiguration.java   | 19 +++---
 .../springboot/ExecComponentAutoConfiguration.java | 19 +++---
 .../FastjsonDataFormatAutoConfiguration.java       | 19 +++---
 .../springboot/FhirComponentAutoConfiguration.java | 19 +++---
 .../FhirJsonDataFormatAutoConfiguration.java       | 19 +++---
 .../FhirXmlDataFormatAutoConfiguration.java        | 19 +++---
 .../FileLockClusterServiceAutoConfiguration.java   | 18 +++---
 .../springboot/FileComponentAutoConfiguration.java | 19 +++---
 .../FileWatchComponentAutoConfiguration.java       | 19 +++---
 .../FlatpackComponentAutoConfiguration.java        | 19 +++---
 .../FlatpackDataFormatAutoConfiguration.java       | 19 +++---
 .../FlinkComponentAutoConfiguration.java           | 19 +++---
 .../FlowableComponentAutoConfiguration.java        | 19 +++---
 .../springboot/FopComponentAutoConfiguration.java  | 19 +++---
 .../ForyDataFormatAutoConfiguration.java           | 19 +++---
 .../FreemarkerComponentAutoConfiguration.java      | 19 +++---
 .../springboot/FtpComponentAutoConfiguration.java  | 19 +++---
 .../springboot/FtpsComponentAutoConfiguration.java | 19 +++---
 .../springboot/SftpComponentAutoConfiguration.java | 19 +++---
 .../GeoCoderComponentAutoConfiguration.java        | 19 +++---
 .../springboot/GitComponentAutoConfiguration.java  | 19 +++---
 .../GitHubComponentAutoConfiguration.java          | 19 +++---
 .../GitHub2ComponentAutoConfiguration.java         | 19 +++---
 .../GoogleBigQueryComponentAutoConfiguration.java  | 19 +++---
 ...oogleBigQuerySQLComponentAutoConfiguration.java | 19 +++---
 .../GoogleCalendarComponentAutoConfiguration.java  | 19 +++---
 ...leCalendarStreamComponentAutoConfiguration.java | 19 +++---
 .../GoogleDriveComponentAutoConfiguration.java     | 19 +++---
 .../GoogleFirestoreComponentAutoConfiguration.java | 19 +++---
 ...leCloudFunctionsComponentAutoConfiguration.java | 19 +++---
 .../GoogleMailComponentAutoConfiguration.java      | 19 +++---
 ...GoogleMailStreamComponentAutoConfiguration.java | 19 +++---
 .../GooglePubsubComponentAutoConfiguration.java    | 19 +++---
 ...gleSecretManagerComponentAutoConfiguration.java | 19 +++---
 .../GoogleSheetsComponentAutoConfiguration.java    | 19 +++---
 ...ogleSheetsStreamComponentAutoConfiguration.java | 19 +++---
 ...loudSpeechToTextComponentAutoConfiguration.java | 19 +++---
 ...ogleCloudStorageComponentAutoConfiguration.java | 19 +++---
 ...loudTextToSpeechComponentAutoConfiguration.java | 19 +++---
 .../GoogleVertexAIComponentAutoConfiguration.java  | 19 +++---
 ...oogleCloudVisionComponentAutoConfiguration.java | 19 +++---
 .../GrapeComponentAutoConfiguration.java           | 19 +++---
 .../GraphqlComponentAutoConfiguration.java         | 19 +++---
 .../GrokDataFormatAutoConfiguration.java           | 19 +++---
 .../GroovyJSonlDataFormatAutoConfiguration.java    | 19 +++---
 .../GroovyXmlDataFormatAutoConfiguration.java      | 19 +++---
 .../GroovyLanguageAutoConfiguration.java           | 19 +++---
 .../springboot/GrpcComponentAutoConfiguration.java | 19 +++---
 .../GsonDataFormatAutoConfiguration.java           | 19 +++---
 .../GuavaEventBusComponentAutoConfiguration.java   | 19 +++---
 .../HashicorpVaultComponentAutoConfiguration.java  | 19 +++---
 ...castAtomicnumberComponentAutoConfiguration.java | 19 +++---
 ...azelcastInstanceComponentAutoConfiguration.java | 19 +++---
 .../HazelcastListComponentAutoConfiguration.java   | 19 +++---
 .../HazelcastMapComponentAutoConfiguration.java    | 19 +++---
 ...azelcastMultimapComponentAutoConfiguration.java | 19 +++---
 ...zelcastPNCounterComponentAutoConfiguration.java | 19 +++---
 .../HazelcastQueueComponentAutoConfiguration.java  | 19 +++---
 ...astReplicatedmapComponentAutoConfiguration.java | 19 +++---
 ...elcastRingbufferComponentAutoConfiguration.java | 19 +++---
 .../HazelcastSedaComponentAutoConfiguration.java   | 19 +++---
 .../HazelcastSetComponentAutoConfiguration.java    | 19 +++---
 .../HazelcastTopicComponentAutoConfiguration.java  | 19 +++---
 .../springboot/HL7DataFormatAutoConfiguration.java | 19 +++---
 .../Hl7TerserLanguageAutoConfiguration.java        | 19 +++---
 .../springboot/HttpComponentAutoConfiguration.java | 19 +++---
 .../HttpComponentSslBundleAutoConfiguration.java   |  6 +-
 .../springboot/DMSComponentAutoConfiguration.java  | 19 +++---
 .../FaceRecognitionComponentAutoConfiguration.java | 19 +++---
 .../FunctionGraphComponentAutoConfiguration.java   | 19 +++---
 .../springboot/IAMComponentAutoConfiguration.java  | 19 +++---
 ...ImageRecognitionComponentAutoConfiguration.java | 19 +++---
 .../springboot/OBSComponentAutoConfiguration.java  | 19 +++---
 ...mpleNotificationComponentAutoConfiguration.java | 19 +++---
 .../HuggingFaceComponentAutoConfiguration.java     | 19 +++---
 .../IBMCOSComponentAutoConfiguration.java          | 19 +++---
 ...BMSecretsManagerComponentAutoConfiguration.java | 19 +++---
 .../WatsonDiscoveryComponentAutoConfiguration.java | 19 +++---
 .../WatsonLanguageComponentAutoConfiguration.java  | 19 +++---
 ...tsonSpeechToTextComponentAutoConfiguration.java | 19 +++---
 ...tsonTextToSpeechComponentAutoConfiguration.java | 19 +++---
 .../WatsonxAiComponentAutoConfiguration.java       | 19 +++---
 .../ICalDataFormatAutoConfiguration.java           | 19 +++---
 .../ClientComponentAutoConfiguration.java          | 19 +++---
 .../ServerComponentAutoConfiguration.java          | 19 +++---
 .../springboot/IggyComponentAutoConfiguration.java | 19 +++---
 .../IgniteCacheComponentAutoConfiguration.java     | 19 +++---
 .../IgniteComputeComponentAutoConfiguration.java   | 19 +++---
 .../IgniteEventsComponentAutoConfiguration.java    | 19 +++---
 .../IgniteIdGenComponentAutoConfiguration.java     | 19 +++---
 .../IgniteMessagingComponentAutoConfiguration.java | 19 +++---
 .../IgniteQueueComponentAutoConfiguration.java     | 19 +++---
 .../IgniteSetComponentAutoConfiguration.java       | 19 +++---
 ...ispanRemoteClusterServiceAutoConfiguration.java | 17 +++---
 ...finispanEmbeddedComponentAutoConfiguration.java | 19 +++---
 ...InfinispanRemoteComponentAutoConfiguration.java | 19 +++---
 .../InfluxDbComponentAutoConfiguration.java        | 19 +++---
 .../InfluxDb2ComponentAutoConfiguration.java       | 19 +++---
 .../springboot/IrcComponentAutoConfiguration.java  | 19 +++---
 .../IronMQComponentAutoConfiguration.java          | 19 +++---
 .../Iso8583DataFormatAutoConfiguration.java        | 19 +++---
 .../JacksonAvroDataFormatAutoConfiguration.java    | 19 +++---
 ...JacksonProtobufDataFormatAutoConfiguration.java | 19 +++---
 .../JacksonDataFormatAutoConfiguration.java        | 19 +++---
 .../JacksonAvroDataFormatAutoConfiguration.java    | 19 +++---
 ...JacksonProtobufDataFormatAutoConfiguration.java | 19 +++---
 .../JacksonDataFormatAutoConfiguration.java        | 19 +++---
 .../JacksonXMLDataFormatAutoConfiguration.java     | 19 +++---
 .../JacksonXMLDataFormatAutoConfiguration.java     | 19 +++---
 ...JasyptEncryptedPropertiesAutoconfiguration.java |  6 +-
 .../JavaScriptLanguageAutoConfiguration.java       | 19 +++---
 .../JaxbDataFormatAutoConfiguration.java           | 19 +++---
 .../JCacheComponentAutoConfiguration.java          | 19 +++---
 .../springboot/JcrComponentAutoConfiguration.java  | 19 +++---
 .../springboot/JdbcComponentAutoConfiguration.java | 19 +++---
 .../JettyHttpComponentAutoConfiguration12.java     | 19 +++---
 ...JGroupsRaftClusterServiceAutoConfiguration.java | 17 +++---
 .../JGroupsRaftComponentAutoConfiguration.java     | 19 +++---
 .../JGroupsComponentAutoConfiguration.java         | 19 +++---
 .../springboot/JiraComponentAutoConfiguration.java | 19 +++---
 .../springboot/JmsComponentAutoConfiguration.java  | 19 +++---
 .../springboot/JMXComponentAutoConfiguration.java  | 19 +++---
 .../JolokiaComponentAutoConfiguration.java         | 12 ++--
 .../springboot/JoltComponentAutoConfiguration.java | 19 +++---
 .../springboot/JooqComponentAutoConfiguration.java | 19 +++---
 .../springboot/JavaLanguageAutoConfiguration.java  | 19 +++---
 .../springboot/JoorLanguageAutoConfiguration.java  | 19 +++---
 .../springboot/JpaComponentAutoConfiguration.java  | 19 +++---
 .../jq/springboot/JqLanguageAutoConfiguration.java | 19 +++---
 .../springboot/ScpComponentAutoConfiguration.java  | 19 +++---
 .../springboot/JsltComponentAutoConfiguration.java | 19 +++---
 .../JsonPatchComponentAutoConfiguration.java       | 19 +++---
 .../JsonValidatorComponentAutoConfiguration.java   | 19 +++---
 .../JsonApiDataFormatAutoConfiguration.java        | 19 +++---
 .../JsonataComponentAutoConfiguration.java         | 19 +++---
 .../JsonbDataFormatAutoConfiguration.java          | 19 +++---
 .../JsonPathLanguageAutoConfiguration.java         | 19 +++---
 .../Jt400ComponentAutoConfiguration.java           | 19 +++---
 .../springboot/JteComponentAutoConfiguration.java  | 19 +++---
 .../KafkaComponentAutoConfiguration.java           | 19 +++---
 .../KameletComponentAutoConfiguration.java         | 19 +++---
 .../KeycloakComponentAutoConfiguration.java        | 19 +++---
 .../KnativeComponentAutoConfiguration.java         | 19 +++---
 .../KServeComponentAutoConfiguration.java          | 19 +++---
 .../KubernetesClusterServiceAutoConfiguration.java | 17 +++---
 ...rnetesConfigMapsComponentAutoConfiguration.java | 19 +++---
 ...ubernetesCronJobComponentAutoConfiguration.java | 19 +++---
 ...sCustomResourcesComponentAutoConfiguration.java | 19 +++---
 ...netesDeploymentsComponentAutoConfiguration.java | 19 +++---
 ...KubernetesEventsComponentAutoConfiguration.java | 19 +++---
 .../KubernetesHPAComponentAutoConfiguration.java   | 19 +++---
 .../KubernetesJobComponentAutoConfiguration.java   | 19 +++---
 ...rnetesNamespacesComponentAutoConfiguration.java | 19 +++---
 .../KubernetesNodesComponentAutoConfiguration.java | 19 +++---
 ...ersistentVolumesComponentAutoConfiguration.java | 19 +++---
 ...entVolumesClaimsComponentAutoConfiguration.java | 19 +++---
 .../KubernetesPodsComponentAutoConfiguration.java  | 19 +++---
 ...ationControllersComponentAutoConfiguration.java | 19 +++---
 ...esResourcesQuotaComponentAutoConfiguration.java | 19 +++---
 ...ubernetesSecretsComponentAutoConfiguration.java | 19 +++---
 ...sServiceAccountsComponentAutoConfiguration.java | 19 +++---
 ...bernetesServicesComponentAutoConfiguration.java | 19 +++---
 ...hiftBuildConfigsComponentAutoConfiguration.java | 19 +++---
 .../OpenshiftBuildsComponentAutoConfiguration.java | 19 +++---
 ...eploymentConfigsComponentAutoConfiguration.java | 19 +++---
 .../springboot/KuduComponentAutoConfiguration.java | 19 +++---
 ...LangChain4jAgentComponentAutoConfiguration.java | 19 +++---
 .../LangChain4jChatComponentAutoConfiguration.java | 19 +++---
 ...hain4jEmbeddingsComponentAutoConfiguration.java | 19 +++---
 ...4jEmbeddingStoreComponentAutoConfiguration.java | 19 +++---
 ...LangChain4jToolsComponentAutoConfiguration.java | 19 +++---
 ...Chain4jWebSearchComponentAutoConfiguration.java | 19 +++---
 .../LanguageComponentAutoConfiguration.java        | 19 +++---
 .../springboot/LdapComponentAutoConfiguration.java | 19 +++---
 .../springboot/LdifComponentAutoConfiguration.java | 19 +++---
 .../springboot/LogComponentAutoConfiguration.java  | 19 +++---
 .../springboot/LraServiceAutoConfiguration.java    | 14 ++---
 .../LuceneComponentAutoConfiguration.java          | 19 +++---
 .../LumberjackComponentAutoConfiguration.java      | 19 +++---
 .../springboot/LZFDataFormatAutoConfiguration.java | 19 +++---
 .../springboot/MailComponentAutoConfiguration.java | 19 +++---
 .../MimeMultipartDataFormatAutoConfiguration.java  | 19 +++---
 .../MapstructComponentAutoConfiguration.java       | 19 +++---
 .../MapstructMappingAutoConfiguration.java         |  6 +-
 .../MasterComponentAutoConfiguration.java          | 19 +++---
 .../camel/mdc/starter/MDCAutoConfiguration.java    |  4 +-
 .../MetricsComponentAutoConfiguration.java         | 19 +++---
 .../MicrometerObservabilityAutoConfiguration.java  |  7 +--
 .../MicrometerComponentAutoConfiguration.java      | 19 +++---
 .../MicrometerTagsAutoConfiguration.java           |  6 +-
 .../metrics/CamelMetricsAutoConfiguration.java     |  4 +-
 .../MiloBrowseComponentAutoConfiguration.java      | 19 +++---
 .../MiloClientComponentAutoConfiguration.java      | 19 +++---
 .../MiloServerComponentAutoConfiguration.java      | 19 +++---
 .../MilvusComponentAutoConfiguration.java          | 19 +++---
 .../MinaSftpComponentAutoConfiguration.java        | 19 +++---
 .../springboot/MinaComponentAutoConfiguration.java | 19 +++---
 .../MinioComponentAutoConfiguration.java           | 19 +++---
 .../springboot/MllpComponentAutoConfiguration.java | 19 +++---
 .../springboot/MockComponentAutoConfiguration.java | 19 +++---
 .../GridFsComponentAutoConfiguration.java          | 19 +++---
 .../MongoDbComponentAutoConfiguration.java         | 19 +++---
 .../MustacheComponentAutoConfiguration.java        | 19 +++---
 .../springboot/MvelComponentAutoConfiguration.java | 19 +++---
 .../springboot/MvelLanguageAutoConfiguration.java  | 19 +++---
 .../MyBatisBeanComponentAutoConfiguration.java     | 19 +++---
 .../MyBatisComponentAutoConfiguration.java         | 19 +++---
 .../springboot/NatsComponentAutoConfiguration.java | 19 +++---
 .../Neo4jComponentAutoConfiguration.java           | 19 +++---
 .../NettyHttpComponentAutoConfiguration.java       | 19 +++---
 .../NettyComponentAutoConfiguration.java           | 19 +++---
 .../OAIPMHComponentAutoConfiguration.java          | 19 +++---
 .../starter/ObservationAutoConfiguration.java      |  7 +--
 .../OcsfDataFormatAutoConfiguration.java           | 19 +++---
 .../springboot/OgnlLanguageAutoConfiguration.java  | 19 +++---
 .../Olingo2ComponentAutoConfiguration.java         | 19 +++---
 .../Olingo4ComponentAutoConfiguration.java         | 19 +++---
 .../springboot/OnceComponentAutoConfiguration.java | 19 +++---
 .../OpenAIComponentAutoConfiguration.java          | 19 +++---
 .../openapi/OpenApiAutoConfiguration.java          | 10 ++-
 .../OpensearchComponentAutoConfiguration.java      | 19 +++---
 .../CinderComponentAutoConfiguration.java          | 19 +++---
 .../GlanceComponentAutoConfiguration.java          | 19 +++---
 .../KeystoneComponentAutoConfiguration.java        | 19 +++---
 .../NeutronComponentAutoConfiguration.java         | 19 +++---
 .../springboot/NovaComponentAutoConfiguration.java | 19 +++---
 .../SwiftComponentAutoConfiguration.java           | 19 +++---
 .../springboot/CamelMetricsAutoConfiguration.java  |  5 +-
 .../OpenTelemetryComponentAutoConfiguration.java   | 19 +++---
 .../starter/OpenTelemetryAutoConfiguration.java    | 23 +++----
 .../starter/OpenTelemetry2AutoConfiguration.java   |  4 +-
 .../OptaPlannerComponentAutoConfiguration.java     | 19 +++---
 .../PahoMqtt5ComponentAutoConfiguration.java       | 19 +++---
 .../springboot/PahoComponentAutoConfiguration.java | 19 +++---
 .../ParquetAvroDataFormatAutoConfiguration.java    | 19 +++---
 .../springboot/PdfComponentAutoConfiguration.java  | 19 +++---
 ...gReplicationSlotComponentAutoConfiguration.java | 19 +++---
 .../PgEventComponentAutoConfiguration.java         | 19 +++---
 ...PineconeVectorDbComponentAutoConfiguration.java | 19 +++---
 .../PlatformHttpComponentAutoConfiguration.java    | 19 +++---
 .../SpringBootPlatformHttpAutoConfiguration.java   |  6 +-
 .../Plc4XComponentAutoConfiguration.java           | 19 +++---
 .../springboot/PQCDataFormatAutoConfiguration.java | 19 +++---
 .../springboot/PQCComponentAutoConfiguration.java  | 19 +++---
 .../PrinterComponentAutoConfiguration.java         | 19 +++---
 .../ProtobufDataFormatAutoConfiguration.java       | 19 +++---
 .../PubNubComponentAutoConfiguration.java          | 19 +++---
 .../PulsarComponentAutoConfiguration.java          | 19 +++---
 .../PythonLanguageAutoConfiguration.java           | 19 +++---
 .../QdrantComponentAutoConfiguration.java          | 19 +++---
 .../QuartzComponentAutoConfiguration.java          | 19 +++---
 .../QuickfixjComponentAutoConfiguration.java       | 19 +++---
 .../ReactiveStreamsComponentAutoConfiguration.java | 19 +++---
 .../ReactiveStreamsServiceAutoConfiguration.java   |  6 +-
 .../springboot/RefComponentAutoConfiguration.java  | 19 +++---
 .../Resilience4jMicrometerAutoConfiguration.java   |  4 +-
 .../springboot/ResilienceAutoConfiguration.java    | 24 ++++----
 .../RestOpenApiComponentAutoConfiguration.java     | 19 +++---
 .../RestApiComponentAutoConfiguration.java         | 19 +++---
 .../springboot/RestComponentAutoConfiguration.java | 19 +++---
 .../RobotFrameworkComponentAutoConfiguration.java  | 19 +++---
 .../RocketMQComponentAutoConfiguration.java        | 19 +++---
 .../springboot/RssComponentAutoConfiguration.java  | 19 +++---
 .../springboot/RssDataFormatAutoConfiguration.java | 19 +++---
 .../springboot/SagaComponentAutoConfiguration.java | 19 +++---
 .../SalesforceComponentAutoConfiguration.java      | 19 +++---
 .../NetWeaverComponentAutoConfiguration.java       | 19 +++---
 .../XQueryComponentAutoConfiguration.java          | 19 +++---
 .../XQueryLanguageAutoConfiguration.java           | 19 +++---
 .../SchedulerComponentAutoConfiguration.java       | 19 +++---
 .../SchematronComponentAutoConfiguration.java      | 19 +++---
 .../springboot/SedaComponentAutoConfiguration.java | 19 +++---
 .../ServiceNowComponentAutoConfiguration.java      | 19 +++---
 .../ServletComponentAutoConfiguration.java         | 19 +++---
 .../ServletMappingAutoConfiguration.java           |  6 +-
 .../springboot/SjmsComponentAutoConfiguration.java | 19 +++---
 .../Sjms2ComponentAutoConfiguration.java           | 19 +++---
 .../SlackComponentAutoConfiguration.java           | 19 +++---
 .../springboot/SmbComponentAutoConfiguration.java  | 19 +++---
 .../SmooksComponentAutoConfiguration.java          | 19 +++---
 .../SmooksDataFormatAutoConfiguration.java         | 19 +++---
 .../springboot/SmppComponentAutoConfiguration.java | 19 +++---
 .../SnakeYAMLDataFormatAutoConfiguration.java      | 19 +++---
 .../springboot/SnmpComponentAutoConfiguration.java | 19 +++---
 .../SoapDataFormatAutoConfiguration.java           | 19 +++---
 .../springboot/SolrComponentAutoConfiguration.java | 19 +++---
 .../SplunkHECComponentAutoConfiguration.java       | 19 +++---
 .../SplunkComponentAutoConfiguration.java          | 19 +++---
 .../SpringAiChatComponentAutoConfiguration.java    | 19 +++---
 ...ringAiEmbeddingsComponentAutoConfiguration.java | 19 +++---
 .../SpringAiImageComponentAutoConfiguration.java   | 19 +++---
 .../SpringAiToolsComponentAutoConfiguration.java   | 19 +++---
 ...ingAiVectorStoreComponentAutoConfiguration.java | 19 +++---
 .../SpringBatchComponentAutoConfiguration.java     | 19 +++---
 .../SpringJdbcComponentAutoConfiguration.java      | 19 +++---
 .../SpringLdapComponentAutoConfiguration.java      | 19 +++---
 .../SpringRabbitMQComponentAutoConfiguration.java  | 19 +++---
 .../RedisComponentAutoConfiguration.java           | 19 +++---
 .../EventComponentAutoConfiguration.java           | 19 +++---
 .../springboot/SpelLanguageAutoConfiguration.java  | 19 +++---
 ...SpringWebserviceComponentAutoConfiguration.java | 19 +++---
 .../springdoc/SpringdocAutoConfiguration.java      | 10 ++-
 .../springboot/SqlComponentAutoConfiguration.java  | 19 +++---
 .../SqlStoredComponentAutoConfiguration.java       | 19 +++---
 .../springboot/SshComponentAutoConfiguration.java  | 19 +++---
 .../springboot/StAXComponentAutoConfiguration.java | 19 +++---
 .../XMLTokenizeLanguageAutoConfiguration.java      | 19 +++---
 .../StitchComponentAutoConfiguration.java          | 19 +++---
 .../StompComponentAutoConfiguration.java           | 19 +++---
 .../StreamComponentAutoConfiguration.java          | 19 +++---
 .../StringTemplateComponentAutoConfiguration.java  | 19 +++---
 .../StripeComponentAutoConfiguration.java          | 19 +++---
 .../springboot/StubComponentAutoConfiguration.java | 19 +++---
 .../SwiftMtDataFormatAutoConfiguration.java        | 19 +++---
 .../SwiftMxDataFormatAutoConfiguration.java        | 19 +++---
 .../SyslogDataFormatAutoConfiguration.java         | 19 +++---
 .../TahuEdgeComponentAutoConfiguration.java        | 19 +++---
 .../TahuHostComponentAutoConfiguration.java        | 19 +++---
 .../TarFileDataFormatAutoConfiguration.java        | 19 +++---
 .../TelegramComponentAutoConfiguration.java        | 19 +++---
 .../starter/TelemetryDevAutoConfiguration.java     |  4 +-
 ...ensorFlowServingComponentAutoConfiguration.java | 19 +++---
 .../ThriftComponentAutoConfiguration.java          | 19 +++---
 .../ThriftDataFormatAutoConfiguration.java         | 19 +++---
 .../ThymeleafComponentAutoConfiguration.java       | 19 +++---
 .../springboot/TikaComponentAutoConfiguration.java | 19 +++---
 .../TimerComponentAutoConfiguration.java           | 19 +++---
 .../TwilioComponentAutoConfiguration.java          | 19 +++---
 ...terDirectMessageComponentAutoConfiguration.java | 19 +++---
 .../TwitterSearchComponentAutoConfiguration.java   | 19 +++---
 .../TwitterTimelineComponentAutoConfiguration.java | 19 +++---
 .../UndertowComponentAutoConfiguration.java        | 19 +++---
 .../UniVocityCsvDataFormatAutoConfiguration.java   | 19 +++---
 .../UniVocityFixedDataFormatAutoConfiguration.java | 19 +++---
 .../UniVocityTsvDataFormatAutoConfiguration.java   | 19 +++---
 .../ValidatorComponentAutoConfiguration.java       | 19 +++---
 .../VelocityComponentAutoConfiguration.java        | 19 +++---
 .../VertxHttpComponentAutoConfiguration.java       | 19 +++---
 .../VertxComponentAutoConfiguration.java           | 19 +++---
 .../VertxWebsocketComponentAutoConfiguration.java  | 19 +++---
 .../springboot/WasmComponentAutoConfiguration.java | 19 +++---
 .../springboot/WasmLanguageAutoConfiguration.java  | 19 +++---
 .../WeatherComponentAutoConfiguration.java         | 19 +++---
 ...WeaviateVectorDbComponentAutoConfiguration.java | 19 +++---
 .../Web3jComponentAutoConfiguration.java           | 19 +++---
 .../WebhookComponentAutoConfiguration.java         | 19 +++---
 .../WhatsAppComponentAutoConfiguration.java        | 19 +++---
 .../WordpressComponentAutoConfiguration.java       | 19 +++---
 .../WorkdayComponentAutoConfiguration.java         | 19 +++---
 .../XChangeComponentAutoConfiguration.java         | 19 +++---
 .../springboot/XJComponentAutoConfiguration.java   | 19 +++---
 .../XmlSignerComponentAutoConfiguration.java       | 19 +++---
 .../XmlVerifierComponentAutoConfiguration.java     | 19 +++---
 .../XMLSecurityDataFormatAutoConfiguration.java    | 19 +++---
 .../springboot/XmppComponentAutoConfiguration.java | 19 +++---
 .../springboot/XPathLanguageAutoConfiguration.java | 19 +++---
 .../XsltSaxonComponentAutoConfiguration.java       | 19 +++---
 .../springboot/XsltComponentAutoConfiguration.java | 19 +++---
 .../ZeebeComponentAutoConfiguration.java           | 19 +++---
 .../ZendeskComponentAutoConfiguration.java         | 19 +++---
 .../GzipDeflaterDataFormatAutoConfiguration.java   | 19 +++---
 .../ZipDeflaterDataFormatAutoConfiguration.java    | 19 +++---
 .../ZipFileDataFormatAutoConfiguration.java        | 19 +++---
 .../ZooKeeperClusterServiceAutoConfiguration.java  | 17 +++---
 .../MasterComponentAutoConfiguration.java          | 19 +++---
 .../ZooKeeperComponentAutoConfiguration.java       | 19 +++---
 .../maven/SpringBootAutoConfigurationMojo.java     | 71 +++++++++++-----------
 504 files changed, 4421 insertions(+), 4939 deletions(-)


(camel-spring-boot) 02/02: chore: adopt @AutoConfiguration in components-starter and generator

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

fmariani pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit 136b6c53c473cd9335ab502ba74b85abb350f1c1
Author: Croway <fe...@gmail.com>
AuthorDate: Wed Apr 15 11:06:01 2026 +0200

    chore: adopt @AutoConfiguration in components-starter and generator
    
    Follow-up to the core module migration in #1751. Updates the code
    generator and all hand-written auto-configuration classes in
    components-starter to use Spring Boot's @AutoConfiguration annotation.
    
    Generator (SpringBootAutoConfigurationMojo):
    - Emit @AutoConfiguration(after=...) instead of @Configuration + @AutoConfigureAfter
    - Use constructor injection for all generated fields
    
    Hand-written auto-configurations (30 files):
    - Replace @Configuration(proxyBeanMethods=false) with @AutoConfiguration
    - Replace @AutoConfigureAfter/@AutoConfigureBefore with after/before/afterName/beforeName attributes
    - Replace @Autowired field injection with constructor injection or ObjectProvider
    - Remove redundant @Scope(SCOPE_SINGLETON) from cluster service beans
    - Fix two CamelMetricsAutoConfiguration classes missing @Configuration entirely
    - Add ElementType.PARAMETER to @CamelAwsXRayTracingStrategy for ObjectProvider usage
    
    Skipped (correctly kept as @Configuration):
    - ObservationConditionalAutoConfiguration (loaded via @Import, not AutoConfiguration.imports)
    - MicrometerObservabilityConditionalAutoConfiguration (same reason)
    - All Converter classes (not auto-configurations)
---
 .../aws/xray/starter/AwsXRayAutoConfiguration.java | 16 +++--
 .../xray/starter/CamelAwsXRayTracingStrategy.java  |  2 +-
 .../ConsulClusterServiceAutoConfiguration.java     | 17 +++---
 .../boot/debug/CamelDebugAutoConfiguration.java    |  6 +-
 .../FileLockClusterServiceAutoConfiguration.java   | 18 +++---
 .../HttpComponentSslBundleAutoConfiguration.java   |  6 +-
 ...ispanRemoteClusterServiceAutoConfiguration.java | 17 +++---
 ...JasyptEncryptedPropertiesAutoconfiguration.java |  6 +-
 ...JGroupsRaftClusterServiceAutoConfiguration.java | 17 +++---
 .../JolokiaComponentAutoConfiguration.java         | 12 ++--
 .../KubernetesClusterServiceAutoConfiguration.java | 17 +++---
 .../springboot/LraServiceAutoConfiguration.java    | 14 ++---
 .../MapstructMappingAutoConfiguration.java         |  6 +-
 .../camel/mdc/starter/MDCAutoConfiguration.java    |  4 +-
 .../MicrometerObservabilityAutoConfiguration.java  |  7 +--
 .../MicrometerTagsAutoConfiguration.java           |  6 +-
 .../metrics/CamelMetricsAutoConfiguration.java     |  4 +-
 .../starter/ObservationAutoConfiguration.java      |  7 +--
 .../openapi/OpenApiAutoConfiguration.java          | 10 ++-
 .../springboot/CamelMetricsAutoConfiguration.java  |  5 +-
 .../starter/OpenTelemetryAutoConfiguration.java    | 23 +++----
 .../starter/OpenTelemetry2AutoConfiguration.java   |  4 +-
 .../SpringBootPlatformHttpAutoConfiguration.java   |  6 +-
 .../ReactiveStreamsServiceAutoConfiguration.java   |  6 +-
 .../Resilience4jMicrometerAutoConfiguration.java   |  4 +-
 .../springboot/ResilienceAutoConfiguration.java    | 24 ++++----
 .../ServletMappingAutoConfiguration.java           |  6 +-
 .../springdoc/SpringdocAutoConfiguration.java      | 10 ++-
 .../starter/TelemetryDevAutoConfiguration.java     |  4 +-
 .../ZooKeeperClusterServiceAutoConfiguration.java  | 17 +++---
 .../maven/SpringBootAutoConfigurationMojo.java     | 71 +++++++++++-----------
 31 files changed, 162 insertions(+), 210 deletions(-)

diff --git a/components-starter/camel-aws-xray-starter/src/main/java/org/apache/camel/aws/xray/starter/AwsXRayAutoConfiguration.java b/components-starter/camel-aws-xray-starter/src/main/java/org/apache/camel/aws/xray/starter/AwsXRayAutoConfiguration.java
index b03d0225484..57c2ac0c630 100644
--- a/components-starter/camel-aws-xray-starter/src/main/java/org/apache/camel/aws/xray/starter/AwsXRayAutoConfiguration.java
+++ b/components-starter/camel-aws-xray-starter/src/main/java/org/apache/camel/aws/xray/starter/AwsXRayAutoConfiguration.java
@@ -21,30 +21,28 @@ import org.apache.camel.component.aws.xray.NoopTracingStrategy;
 import org.apache.camel.component.aws.xray.TraceAnnotatedTracingStrategy;
 import org.apache.camel.component.aws.xray.XRayTracer;
 import org.apache.camel.spi.InterceptStrategy;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
 @EnableConfigurationProperties(AwsXRayConfigurationProperties.class)
 @ConditionalOnProperty(value = "camel.aws-xray.enabled", matchIfMissing = true)
 public class AwsXRayAutoConfiguration {
 
-    @Autowired(required=false)
-    @CamelAwsXRayTracingStrategy
-    private InterceptStrategy xRayStrategy;
-
     @Bean
     @ConditionalOnMissingBean(XRayTracer.class)
     XRayTracer awsTracer(CamelContext context,
-            AwsXRayConfigurationProperties config) {
+            AwsXRayConfigurationProperties config,
+            @CamelAwsXRayTracingStrategy ObjectProvider<InterceptStrategy> xRayStrategyProvider) {
         XRayTracer tracer = new XRayTracer();
         context.setTracing(true);
         tracer.setCamelContext(context);
-        if(xRayStrategy != null) {
+        InterceptStrategy xRayStrategy = xRayStrategyProvider.getIfAvailable();
+        if (xRayStrategy != null) {
             tracer.setTracingStrategy(xRayStrategy);
         } else if (config.getTracingStrategy() == AwsXRayConfigurationProperties.TracingStrategy.NOOP) {
             tracer.setTracingStrategy(new NoopTracingStrategy());
diff --git a/components-starter/camel-aws-xray-starter/src/main/java/org/apache/camel/aws/xray/starter/CamelAwsXRayTracingStrategy.java b/components-starter/camel-aws-xray-starter/src/main/java/org/apache/camel/aws/xray/starter/CamelAwsXRayTracingStrategy.java
index b275e7f8f03..f9f9e686ff1 100644
--- a/components-starter/camel-aws-xray-starter/src/main/java/org/apache/camel/aws/xray/starter/CamelAwsXRayTracingStrategy.java
+++ b/components-starter/camel-aws-xray-starter/src/main/java/org/apache/camel/aws/xray/starter/CamelAwsXRayTracingStrategy.java
@@ -28,7 +28,7 @@ import org.springframework.beans.factory.annotation.Qualifier;
  * Annotate your custom AWS XRay tracing strategy. Will be used if found. Must implement {@link org.apache.camel.spi.InterceptStrategy}.
  *
  */
-@Target({ ElementType.TYPE, ElementType.FIELD})
+@Target({ ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER})
 @Retention(RetentionPolicy.RUNTIME)
 @Qualifier
 public @interface CamelAwsXRayTracingStrategy {
diff --git a/components-starter/camel-consul-cluster-service-starter/src/main/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceAutoConfiguration.java b/components-starter/camel-consul-cluster-service-starter/src/main/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceAutoConfiguration.java
index 7e2d63d2569..5c24155a763 100644
--- a/components-starter/camel-consul-cluster-service-starter/src/main/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceAutoConfiguration.java
+++ b/components-starter/camel-consul-cluster-service-starter/src/main/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceAutoConfiguration.java
@@ -20,28 +20,25 @@ import org.apache.camel.cluster.CamelClusterService;
 import org.apache.camel.component.consul.cluster.ConsulClusterService;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
 
 import java.util.Optional;
 
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureBefore({ ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class })
+@AutoConfiguration(before = { ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class })
 @ConditionalOnProperty(prefix = "camel.cluster.consul", name = "enabled", matchIfMissing = true)
 @EnableConfigurationProperties(ConsulClusterServiceConfiguration.class)
 public class ConsulClusterServiceAutoConfiguration {
 
-    @Autowired
-    private ConsulClusterServiceConfiguration configuration;
+    private final ConsulClusterServiceConfiguration configuration;
+
+    public ConsulClusterServiceAutoConfiguration(ConsulClusterServiceConfiguration configuration) {
+        this.configuration = configuration;
+    }
 
     @Bean(name = "consul-cluster-service")
-    @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
     public CamelClusterService consulClusterService() throws Exception {
         ConsulClusterService service = new ConsulClusterService();
 
diff --git a/components-starter/camel-debug-starter/src/main/java/org/apache/camel/spring/boot/debug/CamelDebugAutoConfiguration.java b/components-starter/camel-debug-starter/src/main/java/org/apache/camel/spring/boot/debug/CamelDebugAutoConfiguration.java
index 6a1f5ba4944..73bb6ac55fc 100644
--- a/components-starter/camel-debug-starter/src/main/java/org/apache/camel/spring/boot/debug/CamelDebugAutoConfiguration.java
+++ b/components-starter/camel-debug-starter/src/main/java/org/apache/camel/spring/boot/debug/CamelDebugAutoConfiguration.java
@@ -17,16 +17,14 @@
 package org.apache.camel.spring.boot.debug;
 
 import org.apache.camel.main.DebuggerConfigurationProperties;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(beforeName = "org.apache.camel.spring.boot.CamelAutoConfiguration") // configure early to have Camel debugger during startup
 @ConditionalOnProperty(name = "camel.debug.enabled", matchIfMissing = true)
-@AutoConfigureBefore(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") // configure early to have Camel debugger during startup
 @EnableConfigurationProperties({ CamelDebugConfigurationProperties.class })
 public class CamelDebugAutoConfiguration {
 
diff --git a/components-starter/camel-file-cluster-service-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceAutoConfiguration.java b/components-starter/camel-file-cluster-service-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceAutoConfiguration.java
index c7edcb008d2..dc563483637 100644
--- a/components-starter/camel-file-cluster-service-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceAutoConfiguration.java
+++ b/components-starter/camel-file-cluster-service-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceAutoConfiguration.java
@@ -24,25 +24,23 @@ import org.apache.camel.component.file.cluster.FileLockClusterService;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration;
 import org.apache.camel.spring.boot.cluster.TimePatternConverter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
 
-@Configuration
-@AutoConfigureBefore({ ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class })
+@AutoConfiguration(before = { ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class })
 @ConditionalOnProperty(prefix = "camel.cluster.file", name = "enabled", matchIfMissing = true)
 @EnableConfigurationProperties(FileLockClusterServiceConfiguration.class)
 public class FileLockClusterServiceAutoConfiguration {
-    @Autowired
-    private FileLockClusterServiceConfiguration configuration;
+
+    private final FileLockClusterServiceConfiguration configuration;
+
+    public FileLockClusterServiceAutoConfiguration(FileLockClusterServiceConfiguration configuration) {
+        this.configuration = configuration;
+    }
 
     @Bean(name = "file-lock-cluster-service")
-    @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
     public CamelClusterService fileClusterService() throws Exception {
         FileLockClusterService service = new FileLockClusterService();
 
diff --git a/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentSslBundleAutoConfiguration.java b/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentSslBundleAutoConfiguration.java
index cbf7ed7847e..c6222a67630 100644
--- a/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentSslBundleAutoConfiguration.java
+++ b/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentSslBundleAutoConfiguration.java
@@ -28,14 +28,13 @@ import org.apache.camel.support.jsse.SSLContextParameters;
 import org.apache.hc.client5.http.io.HttpClientConnectionManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.ssl.SslBundle;
 import org.springframework.boot.ssl.SslBundles;
-import org.springframework.context.annotation.Configuration;
 
 import jakarta.annotation.PostConstruct;
 
@@ -55,12 +54,11 @@ import jakarta.annotation.PostConstruct;
  * @see HttpComponentSslBundleConfigurationProperties
  * @see org.springframework.boot.ssl.SslBundles
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, HttpComponentAutoConfiguration.class})
 @ConditionalOnClass({SslBundles.class, HttpComponent.class})
 @ConditionalOnBean({SslBundles.class, CamelContext.class})
 @ConditionalOnProperty(prefix = "camel.component.http", name = "ssl-bundle")
 @EnableConfigurationProperties(HttpComponentSslBundleConfigurationProperties.class)
-@AutoConfigureAfter({CamelAutoConfiguration.class, HttpComponentAutoConfiguration.class})
 public class HttpComponentSslBundleAutoConfiguration {
 
     private static final Logger LOG = LoggerFactory.getLogger(HttpComponentSslBundleAutoConfiguration.class);
diff --git a/components-starter/camel-infinispan-cluster-service-starter/src/main/java/org/apache/camel/component/infinispan/remote/springboot/cluster/InfinispanRemoteClusterServiceAutoConfiguration.java b/components-starter/camel-infinispan-cluster-service-starter/src/main/java/org/apache/camel/component/infinispan/remote/springboot/cluster/InfinispanRemoteClusterServiceAutoConfiguration.java
index f6d729848d6..34618b19802 100644
--- a/components-starter/camel-infinispan-cluster-service-starter/src/main/java/org/apache/camel/component/infinispan/remote/springboot/cluster/InfinispanRemoteClusterServiceAutoConfiguration.java
+++ b/components-starter/camel-infinispan-cluster-service-starter/src/main/java/org/apache/camel/component/infinispan/remote/springboot/cluster/InfinispanRemoteClusterServiceAutoConfiguration.java
@@ -20,28 +20,25 @@ import org.apache.camel.cluster.CamelClusterService;
 import org.apache.camel.component.infinispan.remote.cluster.InfinispanRemoteClusterService;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
 
 import java.util.Optional;
 
-@Configuration
-@AutoConfigureBefore({ ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class })
+@AutoConfiguration(before = { ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class })
 @ConditionalOnProperty(prefix = "camel.cluster.infinispan.remote", name = "enabled", matchIfMissing = true)
 @EnableConfigurationProperties(InfinispanRemoteClusterServiceConfiguration.class)
 public class InfinispanRemoteClusterServiceAutoConfiguration {
 
-    @Autowired
-    private InfinispanRemoteClusterServiceConfiguration configuration;
+    private final InfinispanRemoteClusterServiceConfiguration configuration;
+
+    public InfinispanRemoteClusterServiceAutoConfiguration(InfinispanRemoteClusterServiceConfiguration configuration) {
+        this.configuration = configuration;
+    }
 
     @Bean(name = "infinispan-remote-cluster-service")
-    @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
     public CamelClusterService infinispanRemoteClusterService() {
         InfinispanRemoteClusterService service = new InfinispanRemoteClusterService();
 
diff --git a/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptEncryptedPropertiesAutoconfiguration.java b/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptEncryptedPropertiesAutoconfiguration.java
index 9f59f4f7833..232897622ed 100644
--- a/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptEncryptedPropertiesAutoconfiguration.java
+++ b/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptEncryptedPropertiesAutoconfiguration.java
@@ -23,7 +23,7 @@ import org.jasypt.encryption.pbe.StandardPBEStringEncryptor;
 import org.jasypt.encryption.pbe.config.EnvironmentStringPBEConfig;
 import org.jasypt.salt.RandomSaltGenerator;
 import org.jasypt.salt.SaltGenerator;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -35,7 +35,6 @@ import org.springframework.boot.context.properties.bind.handler.IgnoreErrorsBind
 import org.springframework.boot.context.properties.source.ConfigurationPropertySource;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.env.ConfigurableEnvironment;
@@ -53,9 +52,8 @@ import static org.springframework.boot.context.properties.source.ConfigurationPr
 import static org.springframework.core.ResolvableType.forClass;
 import static org.springframework.core.annotation.AnnotationUtils.findAnnotation;
 
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(before = CamelAutoConfiguration.class)
 @ConditionalOnProperty(name = "camel.component.jasypt.enabled", matchIfMissing = true)
-@AutoConfigureBefore(CamelAutoConfiguration.class)
 public class JasyptEncryptedPropertiesAutoconfiguration {
 
     @Bean
diff --git a/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/cluster/JGroupsRaftClusterServiceAutoConfiguration.java b/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/cluster/JGroupsRaftClusterServiceAutoConfiguration.java
index 2abefa1332e..5b8f3bc7f2c 100644
--- a/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/cluster/JGroupsRaftClusterServiceAutoConfiguration.java
+++ b/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/cluster/JGroupsRaftClusterServiceAutoConfiguration.java
@@ -20,28 +20,25 @@ import org.apache.camel.cluster.CamelClusterService;
 import org.apache.camel.component.jgroups.raft.cluster.JGroupsRaftClusterService;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
 
 import java.util.Optional;
 
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureBefore({ ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class })
+@AutoConfiguration(before = { ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class })
 @ConditionalOnProperty(prefix = "camel.cluster.jgroups-raft", name = "enabled", matchIfMissing = true)
 @EnableConfigurationProperties(JGroupsRaftClusterServiceConfiguration.class)
 public class JGroupsRaftClusterServiceAutoConfiguration {
 
-    @Autowired
-    private JGroupsRaftClusterServiceConfiguration configuration;
+    private final JGroupsRaftClusterServiceConfiguration configuration;
+
+    public JGroupsRaftClusterServiceAutoConfiguration(JGroupsRaftClusterServiceConfiguration configuration) {
+        this.configuration = configuration;
+    }
 
     @Bean(name = "jgroups-raft-cluster-service")
-    @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
     public CamelClusterService jgroupsRaftClusterService() throws Exception {
         JGroupsRaftClusterService service = new JGroupsRaftClusterService();
 
diff --git a/components-starter/camel-jolokia-starter/src/main/java/org/apache/camel/component/jolokia/springboot/JolokiaComponentAutoConfiguration.java b/components-starter/camel-jolokia-starter/src/main/java/org/apache/camel/component/jolokia/springboot/JolokiaComponentAutoConfiguration.java
index 275b5611e9b..84ee8eade77 100644
--- a/components-starter/camel-jolokia-starter/src/main/java/org/apache/camel/component/jolokia/springboot/JolokiaComponentAutoConfiguration.java
+++ b/components-starter/camel-jolokia-starter/src/main/java/org/apache/camel/component/jolokia/springboot/JolokiaComponentAutoConfiguration.java
@@ -22,19 +22,18 @@ import org.jolokia.support.spring.SpringJolokiaConfigHolder;
 import org.jolokia.support.spring.SpringJolokiaLogHandlerHolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
 
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
 @ConditionalOnMissingBean(type = "org.jolokia.support.spring.SpringJolokiaAgent")
 @EnableConfigurationProperties(JolokiaComponentConfiguration.class)
 @ConditionalOnProperty(name = "camel.component.jolokia.enabled", havingValue = "true", matchIfMissing = true)
@@ -44,8 +43,11 @@ public class JolokiaComponentAutoConfiguration {
 
 	protected static final String DEFAULT_CA_ON_K8S = "/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt";
 
-	@Autowired
-	private JolokiaComponentConfiguration configuration;
+	private final JolokiaComponentConfiguration configuration;
+
+	public JolokiaComponentAutoConfiguration(JolokiaComponentConfiguration configuration) {
+		this.configuration = configuration;
+	}
 
 	@Bean
 	public SpringJolokiaAgent jolokia(final SpringJolokiaConfigHolder camelConfigHolder,
diff --git a/components-starter/camel-kubernetes-cluster-service-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceAutoConfiguration.java b/components-starter/camel-kubernetes-cluster-service-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceAutoConfiguration.java
index 131b58120fb..6d692fb3b44 100644
--- a/components-starter/camel-kubernetes-cluster-service-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceAutoConfiguration.java
+++ b/components-starter/camel-kubernetes-cluster-service-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceAutoConfiguration.java
@@ -22,26 +22,23 @@ import org.apache.camel.cluster.CamelClusterService;
 import org.apache.camel.component.kubernetes.cluster.KubernetesClusterService;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
 
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureBefore({ ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class })
+@AutoConfiguration(before = { ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class })
 @ConditionalOnProperty(prefix = "camel.cluster.kubernetes", name = "enabled", matchIfMissing = true)
 @EnableConfigurationProperties(KubernetesClusterServiceConfiguration.class)
 public class KubernetesClusterServiceAutoConfiguration {
 
-    @Autowired
-    private KubernetesClusterServiceConfiguration configuration;
+    private final KubernetesClusterServiceConfiguration configuration;
+
+    public KubernetesClusterServiceAutoConfiguration(KubernetesClusterServiceConfiguration configuration) {
+        this.configuration = configuration;
+    }
 
     @Bean(name = "kubernetes-cluster-service")
-    @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
     public CamelClusterService kubernetesClusterService() throws Exception {
         KubernetesClusterService service = new KubernetesClusterService();
 
diff --git a/components-starter/camel-lra-starter/src/main/java/org/apache/camel/service/lra/springboot/LraServiceAutoConfiguration.java b/components-starter/camel-lra-starter/src/main/java/org/apache/camel/service/lra/springboot/LraServiceAutoConfiguration.java
index 6da3be979ff..538b190bc8e 100644
--- a/components-starter/camel-lra-starter/src/main/java/org/apache/camel/service/lra/springboot/LraServiceAutoConfiguration.java
+++ b/components-starter/camel-lra-starter/src/main/java/org/apache/camel/service/lra/springboot/LraServiceAutoConfiguration.java
@@ -22,24 +22,24 @@ import org.apache.camel.service.lra.LRASagaService;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional({ ConditionalOnCamelContextAndAutoConfigurationBeans.class,
         LraServiceAutoConfiguration.GroupConditions.class })
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ LraServiceConfiguration.class })
 public class LraServiceAutoConfiguration {
 
-    @Autowired
-    private CamelContext camelContext;
+    private final CamelContext camelContext;
+
+    public LraServiceAutoConfiguration(CamelContext camelContext) {
+        this.camelContext = camelContext;
+    }
 
     static class GroupConditions extends GroupCondition {
         public GroupConditions() {
diff --git a/components-starter/camel-mapstruct-starter/src/main/java/org/apache/camel/component/mapstruct/springboot/MapstructMappingAutoConfiguration.java b/components-starter/camel-mapstruct-starter/src/main/java/org/apache/camel/component/mapstruct/springboot/MapstructMappingAutoConfiguration.java
index d2aad1404da..c06e6b431a3 100644
--- a/components-starter/camel-mapstruct-starter/src/main/java/org/apache/camel/component/mapstruct/springboot/MapstructMappingAutoConfiguration.java
+++ b/components-starter/camel-mapstruct-starter/src/main/java/org/apache/camel/component/mapstruct/springboot/MapstructMappingAutoConfiguration.java
@@ -23,19 +23,17 @@ import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = { CamelAutoConfiguration.class, MapstructComponentAutoConfiguration.class })
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ ComponentConfigurationProperties.class, MapstructComponentConfiguration.class })
 @ConditionalOnHierarchicalProperties({ "camel.component", "camel.component.mapstruct" })
 @ConditionalOnProperty(prefix = "camel.component.mapstruct", name = "enabled", havingValue = "true", matchIfMissing = true)
-@AutoConfigureAfter({ CamelAutoConfiguration.class, MapstructComponentAutoConfiguration.class })
 public class MapstructMappingAutoConfiguration {
 
     @Bean
diff --git a/components-starter/camel-mdc-starter/src/main/java/org/apache/camel/mdc/starter/MDCAutoConfiguration.java b/components-starter/camel-mdc-starter/src/main/java/org/apache/camel/mdc/starter/MDCAutoConfiguration.java
index 339e6d22f0a..4878391aa1d 100644
--- a/components-starter/camel-mdc-starter/src/main/java/org/apache/camel/mdc/starter/MDCAutoConfiguration.java
+++ b/components-starter/camel-mdc-starter/src/main/java/org/apache/camel/mdc/starter/MDCAutoConfiguration.java
@@ -18,13 +18,13 @@ package org.apache.camel.mdc.starter;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.mdc.MDCService;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
 @EnableConfigurationProperties(MDCConfigurationProperties.class)
 @ConditionalOnProperty(value = "camel.mdc.enabled", matchIfMissing = true)
 public class MDCAutoConfiguration {
diff --git a/components-starter/camel-micrometer-observability-starter/src/main/java/org/apache/camel/micrometer/observability/starter/MicrometerObservabilityAutoConfiguration.java b/components-starter/camel-micrometer-observability-starter/src/main/java/org/apache/camel/micrometer/observability/starter/MicrometerObservabilityAutoConfiguration.java
index 620b22cfada..9c68d74b744 100644
--- a/components-starter/camel-micrometer-observability-starter/src/main/java/org/apache/camel/micrometer/observability/starter/MicrometerObservabilityAutoConfiguration.java
+++ b/components-starter/camel-micrometer-observability-starter/src/main/java/org/apache/camel/micrometer/observability/starter/MicrometerObservabilityAutoConfiguration.java
@@ -24,16 +24,13 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.micrometer.observability.MicrometerObservabilityTracer;
 
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(
-        name = {
+@AutoConfiguration(afterName = {
             "org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration",
             "org.springframework.boot.actuate.autoconfigure.tracing.MicrometerTracingAutoConfiguration"
         })
diff --git a/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/MicrometerTagsAutoConfiguration.java b/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/MicrometerTagsAutoConfiguration.java
index 9d2bf264754..ecb5f3ac529 100644
--- a/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/MicrometerTagsAutoConfiguration.java
+++ b/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/MicrometerTagsAutoConfiguration.java
@@ -24,21 +24,19 @@ import org.apache.camel.http.common.CamelServlet;
 import org.apache.camel.http.common.HttpConsumer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.http.server.observation.DefaultServerRequestObservationConvention;
 import org.springframework.http.server.observation.ServerRequestObservationContext;
 import org.springframework.http.server.observation.ServerRequestObservationConvention;
 
 import java.util.Optional;
 
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional({ ConditionalOnCamelContextAndAutoConfigurationBeans.class })
 @ConditionalOnProperty(prefix = "camel.metrics", name = "uriTagEnabled", havingValue = "true")
-@AutoConfigureAfter({ CamelAutoConfiguration.class })
 public class MicrometerTagsAutoConfiguration {
 
     /**
diff --git a/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/metrics/CamelMetricsAutoConfiguration.java b/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/metrics/CamelMetricsAutoConfiguration.java
index f12fed7cbe9..76f25d11f4a 100644
--- a/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/metrics/CamelMetricsAutoConfiguration.java
+++ b/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/metrics/CamelMetricsAutoConfiguration.java
@@ -31,13 +31,13 @@ import org.apache.camel.component.micrometer.spi.InstrumentedThreadPoolFactory;
 import org.apache.camel.spi.ManagementStrategy;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Conditional;
 
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ CamelMetricsConfiguration.class })
-@AutoConfigureAfter({ CamelAutoConfiguration.class })
 public class CamelMetricsAutoConfiguration {
 
     public CamelMetricsAutoConfiguration(CamelContext camelContext, CamelMetricsConfiguration configuration,
diff --git a/components-starter/camel-observation-starter/src/main/java/org/apache/camel/observation/starter/ObservationAutoConfiguration.java b/components-starter/camel-observation-starter/src/main/java/org/apache/camel/observation/starter/ObservationAutoConfiguration.java
index 401d2b9fd26..9c02b412ab0 100644
--- a/components-starter/camel-observation-starter/src/main/java/org/apache/camel/observation/starter/ObservationAutoConfiguration.java
+++ b/components-starter/camel-observation-starter/src/main/java/org/apache/camel/observation/starter/ObservationAutoConfiguration.java
@@ -25,18 +25,15 @@ import io.micrometer.tracing.handler.TracingAwareMeterObservationHandler;
 import org.apache.camel.CamelContext;
 import org.apache.camel.observation.MicrometerObservationTracer;
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(afterName = "org.springframework.boot.micrometer.observation.autoconfigure.ObservationAutoConfiguration")
 @ConditionalOnClass(name = { "org.springframework.boot.micrometer.observation.autoconfigure.ObservationAutoConfiguration" })
-@AutoConfigureAfter(name = {
-        "org.springframework.boot.micrometer.observation.autoconfigure.ObservationAutoConfiguration" })
 @EnableConfigurationProperties(ObservationConfigurationProperties.class)
 @ConditionalOnProperty(value = "camel.observation.enabled", matchIfMissing = true)
 @Deprecated (since = "4.19.0")
diff --git a/components-starter/camel-openapi-java-starter/src/main/java/org/apache/camel/springboot/openapi/OpenApiAutoConfiguration.java b/components-starter/camel-openapi-java-starter/src/main/java/org/apache/camel/springboot/openapi/OpenApiAutoConfiguration.java
index 2de0dde3bf9..a001ab9959f 100644
--- a/components-starter/camel-openapi-java-starter/src/main/java/org/apache/camel/springboot/openapi/OpenApiAutoConfiguration.java
+++ b/components-starter/camel-openapi-java-starter/src/main/java/org/apache/camel/springboot/openapi/OpenApiAutoConfiguration.java
@@ -29,13 +29,11 @@ import org.apache.camel.spi.RestConfiguration;
 import org.apache.camel.spring.boot.CamelContextConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.GenericApplicationContext;
 
 import java.util.List;
@@ -46,12 +44,12 @@ import static org.apache.camel.openapi.OpenApiHelper.clearVendorExtensions;
 /**
  * Open API auto-configuration.
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(
+        afterName = "org.apache.camel.spring.boot.CamelAutoConfiguration",
+        beforeName = "org.springdoc.core.SpringDocConfiguration")
 @EnableConfigurationProperties({ OpenApiConfiguration.class })
 @ConditionalOnBean(type = "org.apache.camel.spring.boot.CamelAutoConfiguration")
 @ConditionalOnProperty(name = "camel.openapi.enabled", matchIfMissing = true)
-@AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration")
-@AutoConfigureBefore(name = "org.springdoc.core.SpringDocConfiguration")
 public class OpenApiAutoConfiguration {
 
     private static final Logger LOG = LoggerFactory.getLogger(OpenApiAutoConfiguration.class);
diff --git a/components-starter/camel-opentelemetry-metrics-starter/src/main/java/org/apache/camel/opentelemetry/metrics/springboot/CamelMetricsAutoConfiguration.java b/components-starter/camel-opentelemetry-metrics-starter/src/main/java/org/apache/camel/opentelemetry/metrics/springboot/CamelMetricsAutoConfiguration.java
index eb5cffdf3e2..bf16f7b405a 100644
--- a/components-starter/camel-opentelemetry-metrics-starter/src/main/java/org/apache/camel/opentelemetry/metrics/springboot/CamelMetricsAutoConfiguration.java
+++ b/components-starter/camel-opentelemetry-metrics-starter/src/main/java/org/apache/camel/opentelemetry/metrics/springboot/CamelMetricsAutoConfiguration.java
@@ -25,14 +25,13 @@ import org.apache.camel.opentelemetry.metrics.routepolicy.OpenTelemetryRoutePoli
 import org.apache.camel.spi.ManagementStrategy;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Conditional;
 
-
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ CamelMetricsConfiguration.class })
-@AutoConfigureAfter({ CamelAutoConfiguration.class })
 public class CamelMetricsAutoConfiguration {
 
     public CamelMetricsAutoConfiguration(CamelContext camelContext, CamelMetricsConfiguration configuration, Meter meter) {
diff --git a/components-starter/camel-opentelemetry-starter/src/main/java/org/apache/camel/opentelemetry/starter/OpenTelemetryAutoConfiguration.java b/components-starter/camel-opentelemetry-starter/src/main/java/org/apache/camel/opentelemetry/starter/OpenTelemetryAutoConfiguration.java
index 8631f7ab0ab..e9c9c55f694 100644
--- a/components-starter/camel-opentelemetry-starter/src/main/java/org/apache/camel/opentelemetry/starter/OpenTelemetryAutoConfiguration.java
+++ b/components-starter/camel-opentelemetry-starter/src/main/java/org/apache/camel/opentelemetry/starter/OpenTelemetryAutoConfiguration.java
@@ -21,37 +21,28 @@ import io.opentelemetry.context.propagation.ContextPropagators;
 import org.apache.camel.CamelContext;
 import org.apache.camel.opentelemetry.OpenTelemetryTracer;
 import org.apache.camel.opentelemetry.OpenTelemetryTracingStrategy;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
 @EnableConfigurationProperties(OpenTelemetryConfigurationProperties.class)
 @ConditionalOnProperty(value = "camel.opentelemetry.enabled", matchIfMissing = true)
 @Deprecated (since = "4.19.0")
 public class OpenTelemetryAutoConfiguration {
 
-    @Autowired(required = false)
-    private Tracer tracer;
-
-    @Autowired(required = false)
-    private ContextPropagators contextPropagators;
-
     @Bean(initMethod = "", destroyMethod = "")
     // Camel handles the lifecycle of this bean
     @ConditionalOnMissingBean(OpenTelemetryTracer.class)
     OpenTelemetryTracer openTelemetryEventNotifier(CamelContext camelContext,
-            OpenTelemetryConfigurationProperties config) {
+            OpenTelemetryConfigurationProperties config, ObjectProvider<Tracer> tracer,
+            ObjectProvider<ContextPropagators> contextPropagators) {
         OpenTelemetryTracer ottracer = new OpenTelemetryTracer();
-        if (tracer != null) {
-            ottracer.setTracer(tracer);
-        }
-        if (contextPropagators != null) {
-            ottracer.setContextPropagators(contextPropagators);
-        }
+        tracer.ifAvailable(ottracer::setTracer);
+        contextPropagators.ifAvailable(ottracer::setContextPropagators);
         if (config.getExcludePatterns() != null) {
             ottracer.setExcludePatterns(config.getExcludePatterns());
         }
diff --git a/components-starter/camel-opentelemetry2-starter/src/main/java/org/apache/camel/opentelemetry2/starter/OpenTelemetry2AutoConfiguration.java b/components-starter/camel-opentelemetry2-starter/src/main/java/org/apache/camel/opentelemetry2/starter/OpenTelemetry2AutoConfiguration.java
index 17f79d9de6a..a04bd50cad5 100644
--- a/components-starter/camel-opentelemetry2-starter/src/main/java/org/apache/camel/opentelemetry2/starter/OpenTelemetry2AutoConfiguration.java
+++ b/components-starter/camel-opentelemetry2-starter/src/main/java/org/apache/camel/opentelemetry2/starter/OpenTelemetry2AutoConfiguration.java
@@ -18,13 +18,13 @@ package org.apache.camel.opentelemetry2.starter;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.opentelemetry2.OpenTelemetryTracer;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
 @EnableConfigurationProperties(OpenTelemetry2ConfigurationProperties.class)
 @ConditionalOnProperty(value = "camel.opentelemetry2.enabled", matchIfMissing = true)
 public class OpenTelemetry2AutoConfiguration {
diff --git a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpAutoConfiguration.java b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpAutoConfiguration.java
index 2f3ec376d40..82a4963e806 100644
--- a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpAutoConfiguration.java
+++ b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpAutoConfiguration.java
@@ -22,12 +22,11 @@ import org.apache.camel.component.platform.http.spi.PlatformHttpEngine;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.webmvc.autoconfigure.WebMvcProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.core.env.Environment;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
@@ -36,8 +35,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import java.util.List;
 import java.util.concurrent.Executor;
 
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(name = { "org.apache.camel.component.servlet.springboot.PlatformHttpComponentAutoConfiguration",
+@AutoConfiguration(afterName = { "org.apache.camel.component.servlet.springboot.PlatformHttpComponentAutoConfiguration",
         "org.apache.camel.component.servlet.springboot.PlatformHttpComponentConverter" })
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,PlatformHttpComponentConfiguration.class, WebMvcProperties.class})
 public class SpringBootPlatformHttpAutoConfiguration {
diff --git a/components-starter/camel-reactive-streams-starter/src/main/java/org/apache/camel/component/reactive/streams/springboot/ReactiveStreamsServiceAutoConfiguration.java b/components-starter/camel-reactive-streams-starter/src/main/java/org/apache/camel/component/reactive/streams/springboot/ReactiveStreamsServiceAutoConfiguration.java
index 7a1fdf142cd..bdf36e9a235 100644
--- a/components-starter/camel-reactive-streams-starter/src/main/java/org/apache/camel/component/reactive/streams/springboot/ReactiveStreamsServiceAutoConfiguration.java
+++ b/components-starter/camel-reactive-streams-starter/src/main/java/org/apache/camel/component/reactive/streams/springboot/ReactiveStreamsServiceAutoConfiguration.java
@@ -22,18 +22,16 @@ import org.apache.camel.component.reactive.streams.api.CamelReactiveStreamsServi
 import org.apache.camel.component.reactive.streams.api.CamelReactiveStreamsServiceFactory;
 import org.apache.camel.component.reactive.streams.engine.DefaultCamelReactiveStreamsServiceFactory;
 import org.apache.camel.component.reactive.streams.engine.ReactiveStreamsEngineConfiguration;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
-@AutoConfigureAfter(ReactiveStreamsComponentAutoConfiguration.class)
+@AutoConfiguration(after = ReactiveStreamsComponentAutoConfiguration.class)
 @ConditionalOnBean(ReactiveStreamsComponentAutoConfiguration.class)
 @EnableConfigurationProperties(ReactiveStreamsComponentConfiguration.class)
-@Configuration
 public class ReactiveStreamsServiceAutoConfiguration {
 
     @Lazy
diff --git a/components-starter/camel-resilience4j-micrometer-starter/src/main/java/org/apache/camel/component/resilience4j/micrometer/Resilience4jMicrometerAutoConfiguration.java b/components-starter/camel-resilience4j-micrometer-starter/src/main/java/org/apache/camel/component/resilience4j/micrometer/Resilience4jMicrometerAutoConfiguration.java
index 88dfddce138..d07fb9ca0df 100644
--- a/components-starter/camel-resilience4j-micrometer-starter/src/main/java/org/apache/camel/component/resilience4j/micrometer/Resilience4jMicrometerAutoConfiguration.java
+++ b/components-starter/camel-resilience4j-micrometer-starter/src/main/java/org/apache/camel/component/resilience4j/micrometer/Resilience4jMicrometerAutoConfiguration.java
@@ -22,12 +22,12 @@ import io.micrometer.core.instrument.MeterRegistry;
 import org.apache.camel.CamelContext;
 import org.apache.camel.spi.Resilience4jMicrometerFactory;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
 @Conditional({ ConditionalOnCamelContextAndAutoConfigurationBeans.class })
 @ConditionalOnProperty(prefix = "camel.resilience4j", name = "micrometerEnabled", havingValue = "true", matchIfMissing = true)
 public class Resilience4jMicrometerAutoConfiguration {
diff --git a/components-starter/camel-resilience4j-starter/src/main/java/org/apache/camel/component/resilience/springboot/ResilienceAutoConfiguration.java b/components-starter/camel-resilience4j-starter/src/main/java/org/apache/camel/component/resilience/springboot/ResilienceAutoConfiguration.java
index 2ea0b6d83d7..50b821730f7 100644
--- a/components-starter/camel-resilience4j-starter/src/main/java/org/apache/camel/component/resilience/springboot/ResilienceAutoConfiguration.java
+++ b/components-starter/camel-resilience4j-starter/src/main/java/org/apache/camel/component/resilience/springboot/ResilienceAutoConfiguration.java
@@ -30,32 +30,34 @@ import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.support.PluginHelper;
 import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 /**
  * Resilience auto configuration.
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @ConditionalOnProperty(name = "camel.resilience4j.enabled", matchIfMissing = true)
 @ConditionalOnBean(value = CamelAutoConfiguration.class)
-@AutoConfigureAfter(value = CamelAutoConfiguration.class)
 @EnableConfigurationProperties(Resilience4jConfigurationDefinitionProperties.class)
 public class ResilienceAutoConfiguration {
-    @Autowired
-    private ConfigurableBeanFactory beanFactory;
-    @Autowired
-    private CamelContext camelContext;
-    @Autowired
-    private Resilience4jConfigurationDefinitionProperties config;
+
+    private final ConfigurableBeanFactory beanFactory;
+    private final CamelContext camelContext;
+    private final Resilience4jConfigurationDefinitionProperties config;
+
+    public ResilienceAutoConfiguration(ConfigurableBeanFactory beanFactory, CamelContext camelContext,
+            Resilience4jConfigurationDefinitionProperties config) {
+        this.beanFactory = beanFactory;
+        this.camelContext = camelContext;
+        this.config = config;
+    }
 
     @Bean(name = ResilienceConstants.DEFAULT_RESILIENCE_CONFIGURATION_ID)
     @ConditionalOnClass(CamelContext.class)
diff --git a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfiguration.java b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfiguration.java
index b386aaba538..268be1dab14 100644
--- a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfiguration.java
+++ b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletMappingAutoConfiguration.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.servlet.springboot;
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.servlet.CamelHttpTransportServlet;
 import org.apache.camel.component.servlet.ServletComponent;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -28,16 +28,14 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.boot.servlet.autoconfigure.MultipartProperties;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Servlet mapping auto-configuration.
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(afterName = "org.apache.camel.spring.boot.CamelAutoConfiguration")
 @ConditionalOnProperty(name = "camel.servlet.mapping.enabled", matchIfMissing = true)
 @ConditionalOnBean(type = "org.apache.camel.spring.boot.CamelAutoConfiguration")
-@AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration")
 @ConditionalOnWebApplication
 @EnableConfigurationProperties({ ServletMappingConfiguration.class, MultipartProperties.class })
 public class ServletMappingAutoConfiguration {
diff --git a/components-starter/camel-springdoc-starter/src/main/java/org/apache/camel/springboot/springdoc/SpringdocAutoConfiguration.java b/components-starter/camel-springdoc-starter/src/main/java/org/apache/camel/springboot/springdoc/SpringdocAutoConfiguration.java
index 8e3b0a3f179..d0a7724ddf1 100644
--- a/components-starter/camel-springdoc-starter/src/main/java/org/apache/camel/springboot/springdoc/SpringdocAutoConfiguration.java
+++ b/components-starter/camel-springdoc-starter/src/main/java/org/apache/camel/springboot/springdoc/SpringdocAutoConfiguration.java
@@ -32,13 +32,11 @@ import org.apache.camel.spring.boot.CamelContextConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.GenericApplicationContext;
 
 import java.util.HashMap;
@@ -53,12 +51,12 @@ import static org.apache.camel.openapi.OpenApiHelper.clearVendorExtensions;
 /**
  * Springdoc auto-configuration.
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(
+        afterName = "org.apache.camel.spring.boot.CamelAutoConfiguration",
+        beforeName = "org.springdoc.core.SpringdocConfiguration")
 @EnableConfigurationProperties({ SpringdocConfiguration.class })
 @ConditionalOnBean(type = "org.apache.camel.spring.boot.CamelAutoConfiguration")
 @ConditionalOnProperty(name = "camel.springdoc.enabled", matchIfMissing = true)
-@AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration")
-@AutoConfigureBefore(name = "org.springdoc.core.SpringdocConfiguration")
 public class SpringdocAutoConfiguration {
 
     private static final Logger LOG = LoggerFactory.getLogger(SpringdocAutoConfiguration.class);
diff --git a/components-starter/camel-telemetry-dev-starter/src/main/java/org/apache/camel/telemetrydev/starter/TelemetryDevAutoConfiguration.java b/components-starter/camel-telemetry-dev-starter/src/main/java/org/apache/camel/telemetrydev/starter/TelemetryDevAutoConfiguration.java
index 98ac54e94c6..39065852c8c 100644
--- a/components-starter/camel-telemetry-dev-starter/src/main/java/org/apache/camel/telemetrydev/starter/TelemetryDevAutoConfiguration.java
+++ b/components-starter/camel-telemetry-dev-starter/src/main/java/org/apache/camel/telemetrydev/starter/TelemetryDevAutoConfiguration.java
@@ -18,13 +18,13 @@ package org.apache.camel.telemetrydev.starter;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.telemetrydev.TelemetryDevTracer;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration
 @EnableConfigurationProperties(TelemetryDevConfigurationProperties.class)
 @ConditionalOnProperty(value = "camel.telemetrydev.enabled", matchIfMissing = true)
 public class TelemetryDevAutoConfiguration {
diff --git a/components-starter/camel-zookeeper-cluster-service-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cluster/ZooKeeperClusterServiceAutoConfiguration.java b/components-starter/camel-zookeeper-cluster-service-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cluster/ZooKeeperClusterServiceAutoConfiguration.java
index 97e93b82996..7fa7978c61c 100644
--- a/components-starter/camel-zookeeper-cluster-service-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cluster/ZooKeeperClusterServiceAutoConfiguration.java
+++ b/components-starter/camel-zookeeper-cluster-service-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cluster/ZooKeeperClusterServiceAutoConfiguration.java
@@ -20,28 +20,25 @@ import org.apache.camel.cluster.CamelClusterService;
 import org.apache.camel.component.zookeeper.cluster.ZooKeeperClusterService;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
 
 import java.util.Optional;
 
-@Configuration
-@AutoConfigureBefore({ ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class })
+@AutoConfiguration(before = { ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class })
 @ConditionalOnProperty(prefix = "camel.cluster.zookeeper", name = "enabled", matchIfMissing = true)
 @EnableConfigurationProperties(ZooKeeperClusterServiceConfiguration.class)
 public class ZooKeeperClusterServiceAutoConfiguration {
 
-    @Autowired
-    private ZooKeeperClusterServiceConfiguration configuration;
+    private final ZooKeeperClusterServiceConfiguration configuration;
+
+    public ZooKeeperClusterServiceAutoConfiguration(ZooKeeperClusterServiceConfiguration configuration) {
+        this.configuration = configuration;
+    }
 
     @Bean(name = "zookeeper-cluster-service")
-    @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
     public CamelClusterService zookeeperClusterService() throws Exception {
         ZooKeeperClusterService service = new ZooKeeperClusterService();
 
diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
index 8ec7672b8c3..fb48dc1385f 100644
--- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
+++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
@@ -62,7 +62,7 @@ import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -428,13 +428,12 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
         String doc = "Generated by camel-package-maven-plugin - do not edit this file!";
         javaClass.getJavaDoc().setFullText(doc);
 
-        javaClass.addAnnotation(Configuration.class).setLiteralValue("proxyBeanMethods", "false");
+        javaClass.addAnnotation(AutoConfiguration.class).setStringValue("afterName",
+                "org.apache.camel.spring.boot.CamelAutoConfiguration");
         javaClass.addAnnotation(ConditionalOnBean.class).setStringValue("type",
                 "org.apache.camel.spring.boot.CamelAutoConfiguration");
         javaClass.addAnnotation(ConditionalOnProperty.class).setStringValue("name", "camel.rest.enabled")
                 .setLiteralValue("matchIfMissing", "true");
-        javaClass.addAnnotation(AutoConfigureAfter.class).setStringValue("name",
-                "org.apache.camel.spring.boot.CamelAutoConfiguration");
         javaClass.addAnnotation(EnableConfigurationProperties.class).setLiteralValue("value", configType + ".class");
 
         javaClass.addImport("java.util.Map");
@@ -446,9 +445,14 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
         javaClass.addImport("org.apache.camel.support.PluginHelper");
 
         javaClass.addField().setName("camelContext").setType(loadClass("org.apache.camel.CamelContext")).setPrivate()
-                .addAnnotation(Autowired.class);
+                .setFinal(true);
         javaClass.addField().setName("config").setType(loadClass(packageName + "." + configType)).setPrivate()
-                .addAnnotation(Autowired.class);
+                .setFinal(true);
+
+        Method ctr = javaClass.addMethod().setConstructor(true).setPublic().setName(name)
+                .addParameter("org.apache.camel.CamelContext", "camelContext")
+                .addParameter(packageName + "." + configType, "config");
+        ctr.setBody("this.camelContext = camelContext;\nthis.config = config;\n");
 
         Method method;
 
@@ -1380,7 +1384,13 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
         javaClass.setPackage(packageName);
         javaClass.setName(name);
         javaClass.getJavaDoc().setFullText("Generated by camel-package-maven-plugin - do not edit this file!");
-        javaClass.addAnnotation(Configuration.class).setLiteralValue("proxyBeanMethods", "false");
+        if (complexOptions) {
+            String cn = name.replace("ComponentAutoConfiguration", "ComponentConverter");
+            javaClass.addAnnotation(AutoConfiguration.class)
+                    .setLiteralValue("after", "{CamelAutoConfiguration.class, " + cn + ".class}");
+        } else {
+            javaClass.addAnnotation(AutoConfiguration.class).setLiteralValue("after", "CamelAutoConfiguration.class");
+        }
         javaClass.addAnnotation(Conditional.class)
                 .setLiteralValue("ConditionalOnCamelContextAndAutoConfigurationBeans.class");
         javaClass.addAnnotation(EnableConfigurationProperties.class)
@@ -1389,14 +1399,6 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
         javaClass.addAnnotation("org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties")
                 .setStringArrayValue("value", new String[] { "camel.component", "camel.component." + componentName });
 
-        if (complexOptions) {
-            String cn = name.replace("ComponentAutoConfiguration", "ComponentConverter");
-            javaClass.addAnnotation(AutoConfigureAfter.class)
-                    .setLiteralValue("{CamelAutoConfiguration.class, " + cn + ".class}");
-        } else {
-            javaClass.addAnnotation(AutoConfigureAfter.class).setLiteralValue("CamelAutoConfiguration.class");
-        }
-
         javaClass.addImport(ApplicationContext.class);
         javaClass.addImport("org.apache.camel.CamelContext");
         javaClass.addImport("org.apache.camel.Component");
@@ -1408,15 +1410,16 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
         javaClass.addImport("org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator");
         javaClass.addImport(model.getJavaType());
 
-        javaClass.addField().setPrivate().setName("applicationContext").setType(ApplicationContext.class)
-                .addAnnotation(Autowired.class);
+        javaClass.addField().setPrivate().setFinal(true).setName("applicationContext").setType(ApplicationContext.class);
         javaClass.addField().setPrivate().setFinal(true).setName("camelContext")
                 .setType(loadClass("org.apache.camel.CamelContext"));
-        javaClass.addField().setPrivate().setName("configuration").setType(configClass).addAnnotation(Autowired.class);
+        javaClass.addField().setPrivate().setFinal(true).setName("configuration").setType(configClass);
 
         Method ctr = javaClass.addMethod().setConstructor(true).setPublic().setName(name)
-                .addParameter("org.apache.camel.CamelContext", "camelContext");
-        ctr.setBody("this.camelContext = camelContext;\n");
+                .addParameter(ApplicationContext.class.getName(), "applicationContext")
+                .addParameter("org.apache.camel.CamelContext", "camelContext")
+                .addParameter(configClass.getName(), "configuration");
+        ctr.setBody("this.applicationContext = applicationContext;\nthis.camelContext = camelContext;\nthis.configuration = configuration;\n");
 
         // add method for auto configure
         String body = createComponentBody(model.getShortJavaType(), componentName);
@@ -1604,8 +1607,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
         javaClass.setPackage(packageName);
         javaClass.setName(name);
         javaClass.getJavaDoc().setFullText("Generated by camel-package-maven-plugin - do not edit this file!");
-        javaClass.addAnnotation(Configuration.class).setLiteralValue("proxyBeanMethods", "false");
-        javaClass.addAnnotation(AutoConfigureAfter.class).setLiteralValue("CamelAutoConfiguration.class");
+        javaClass.addAnnotation(AutoConfiguration.class).setLiteralValue("after", "CamelAutoConfiguration.class");
         javaClass.addAnnotation(Conditional.class)
                 .setLiteralValue("ConditionalOnCamelContextAndAutoConfigurationBeans.class");
         javaClass.addAnnotation(EnableConfigurationProperties.class)
@@ -1627,15 +1629,16 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
         javaClass.addImport("org.apache.camel.spi.DataFormatCustomizer");
         javaClass.addImport(model.getJavaType());
 
-        javaClass.addField().setPrivate().setName("applicationContext").setType(ApplicationContext.class)
-                .addAnnotation(Autowired.class);
+        javaClass.addField().setPrivate().setFinal(true).setName("applicationContext").setType(ApplicationContext.class);
         javaClass.addField().setPrivate().setFinal(true).setName("camelContext")
                 .setType(loadClass("org.apache.camel.CamelContext"));
-        javaClass.addField().setPrivate().setName("configuration").setType(configClass).addAnnotation(Autowired.class);
+        javaClass.addField().setPrivate().setFinal(true).setName("configuration").setType(configClass);
 
         Method ctr = javaClass.addMethod().setConstructor(true).setPublic().setName(name)
-                .addParameter("org.apache.camel.CamelContext", "camelContext");
-        ctr.setBody("this.camelContext = camelContext;\n");
+                .addParameter(ApplicationContext.class.getName(), "applicationContext")
+                .addParameter("org.apache.camel.CamelContext", "camelContext")
+                .addParameter(configClass.getName(), "configuration");
+        ctr.setBody("this.applicationContext = applicationContext;\nthis.camelContext = camelContext;\nthis.configuration = configuration;\n");
 
         String body = createDataFormatBody(model.getShortJavaType(), dataformatName);
         String methodName = "configure" + model.getShortJavaType() + "Factory";
@@ -1703,8 +1706,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
         javaClass.setPackage(packageName);
         javaClass.setName(name);
         javaClass.getJavaDoc().setFullText("Generated by camel-package-maven-plugin - do not edit this file!");
-        javaClass.addAnnotation(Configuration.class).setLiteralValue("proxyBeanMethods", "false");
-        javaClass.addAnnotation(AutoConfigureAfter.class).setLiteralValue("CamelAutoConfiguration.class");
+        javaClass.addAnnotation(AutoConfiguration.class).setLiteralValue("after", "CamelAutoConfiguration.class");
         javaClass.addAnnotation(Conditional.class)
                 .setLiteralValue("ConditionalOnCamelContextAndAutoConfigurationBeans.class");
         javaClass.addAnnotation(EnableConfigurationProperties.class)
@@ -1725,15 +1727,16 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
         javaClass.addImport("org.apache.camel.spi.LanguageCustomizer");
         javaClass.addImport(model.getJavaType());
 
-        javaClass.addField().setPrivate().setName("applicationContext").setType(ApplicationContext.class)
-                .addAnnotation(Autowired.class);
+        javaClass.addField().setPrivate().setFinal(true).setName("applicationContext").setType(ApplicationContext.class);
         javaClass.addField().setPrivate().setFinal(true).setName("camelContext")
                 .setType(loadClass("org.apache.camel.CamelContext"));
-        javaClass.addField().setPrivate().setName("configuration").setType(configClass).addAnnotation(Autowired.class);
+        javaClass.addField().setPrivate().setFinal(true).setName("configuration").setType(configClass);
 
         Method ctr = javaClass.addMethod().setConstructor(true).setPublic().setName(name)
-                .addParameter("org.apache.camel.CamelContext", "camelContext");
-        ctr.setBody("this.camelContext = camelContext;\n");
+                .addParameter(ApplicationContext.class.getName(), "applicationContext")
+                .addParameter("org.apache.camel.CamelContext", "camelContext")
+                .addParameter(configClass.getName(), "configuration");
+        ctr.setBody("this.applicationContext = applicationContext;\nthis.camelContext = camelContext;\nthis.configuration = configuration;\n");
 
         String body = createLanguageBody(model.getShortJavaType(), languageName);
         String methodName = "configure" + model.getShortJavaType();


(camel-spring-boot) 01/02: chore: regenerate auto-configuration classes with @AutoConfiguration

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

fmariani pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit 742feb57b6f38d98f7da8cf4a4971c0d98d268da
Author: Croway <fe...@gmail.com>
AuthorDate: Wed Apr 15 11:05:29 2026 +0200

    chore: regenerate auto-configuration classes with @AutoConfiguration
    
    Regenerated output from updated camel-spring-boot-generator-maven-plugin.
    All generated auto-configuration classes now use @AutoConfiguration(after=...)
    instead of @Configuration(proxyBeanMethods=false) + @AutoConfigureAfter,
    and constructor injection instead of @Autowired field injection.
---
 .../ActiveMQComponentAutoConfiguration.java          | 19 +++++++++----------
 .../ActiveMQComponentAutoConfiguration.java          | 19 +++++++++----------
 .../springboot/AMQPComponentAutoConfiguration.java   | 19 +++++++++----------
 .../ArangoDbComponentAutoConfiguration.java          | 19 +++++++++----------
 .../springboot/AS2ComponentAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/ASN1DataFormatAutoConfiguration.java  | 19 +++++++++----------
 .../AsteriskComponentAutoConfiguration.java          | 19 +++++++++----------
 .../WebsocketComponentAutoConfiguration.java         | 19 +++++++++----------
 .../springboot/AtomComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/AvroComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/AvroDataFormatAutoConfiguration.java  | 19 +++++++++----------
 .../BedrockAgentComponentAutoConfiguration.java      | 19 +++++++++----------
 ...edrockAgentRuntimeComponentAutoConfiguration.java | 19 +++++++++----------
 .../BedrockComponentAutoConfiguration.java           | 19 +++++++++----------
 .../CloudtrailComponentAutoConfiguration.java        | 19 +++++++++----------
 .../AWSConfigComponentAutoConfiguration.java         | 19 +++++++++----------
 .../ParameterStoreComponentAutoConfiguration.java    | 19 +++++++++----------
 .../SecretsManagerComponentAutoConfiguration.java    | 19 +++++++++----------
 .../SecurityHubComponentAutoConfiguration.java       | 19 +++++++++----------
 .../Athena2ComponentAutoConfiguration.java           | 19 +++++++++----------
 .../Comprehend2ComponentAutoConfiguration.java       | 19 +++++++++----------
 .../cw/springboot/Cw2ComponentAutoConfiguration.java | 19 +++++++++----------
 .../springboot/Ddb2ComponentAutoConfiguration.java   | 19 +++++++++----------
 .../Ddb2StreamComponentAutoConfiguration.java        | 19 +++++++++----------
 .../AWS2EC2ComponentAutoConfiguration.java           | 19 +++++++++----------
 .../springboot/ECS2ComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/EKS2ComponentAutoConfiguration.java   | 19 +++++++++----------
 .../EventbridgeComponentAutoConfiguration.java       | 19 +++++++++----------
 .../springboot/IAM2ComponentAutoConfiguration.java   | 19 +++++++++----------
 .../KinesisFirehose2ComponentAutoConfiguration.java  | 19 +++++++++----------
 .../Kinesis2ComponentAutoConfiguration.java          | 19 +++++++++----------
 .../springboot/KMS2ComponentAutoConfiguration.java   | 19 +++++++++----------
 .../Lambda2ComponentAutoConfiguration.java           | 19 +++++++++----------
 .../mq/springboot/MQ2ComponentAutoConfiguration.java | 19 +++++++++----------
 .../springboot/MSK2ComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/Polly2ComponentAutoConfiguration.java | 19 +++++++++----------
 .../RedshiftData2ComponentAutoConfiguration.java     | 19 +++++++++----------
 .../Rekognition2ComponentAutoConfiguration.java      | 19 +++++++++----------
 .../springboot/AWS2S3ComponentAutoConfiguration.java | 19 +++++++++----------
 .../AWS2S3VectorsComponentAutoConfiguration.java     | 19 +++++++++----------
 .../springboot/Ses2ComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/Sns2ComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/Sqs2ComponentAutoConfiguration.java   | 19 +++++++++----------
 .../StepFunctions2ComponentAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/STS2ComponentAutoConfiguration.java   | 19 +++++++++----------
 .../Textract2ComponentAutoConfiguration.java         | 19 +++++++++----------
 .../Timestream2ComponentAutoConfiguration.java       | 19 +++++++++----------
 .../Transcribe2ComponentAutoConfiguration.java       | 19 +++++++++----------
 .../Translate2ComponentAutoConfiguration.java        | 19 +++++++++----------
 .../CosmosDbComponentAutoConfiguration.java          | 19 +++++++++----------
 .../EventGridComponentAutoConfiguration.java         | 19 +++++++++----------
 .../EventHubsComponentAutoConfiguration.java         | 19 +++++++++----------
 .../springboot/FilesComponentAutoConfiguration.java  | 19 +++++++++----------
 .../FunctionsComponentAutoConfiguration.java         | 19 +++++++++----------
 .../KeyVaultComponentAutoConfiguration.java          | 19 +++++++++----------
 .../ServiceBusComponentAutoConfiguration.java        | 19 +++++++++----------
 .../springboot/BlobComponentAutoConfiguration.java   | 19 +++++++++----------
 .../DataLakeComponentAutoConfiguration.java          | 19 +++++++++----------
 .../springboot/QueueComponentAutoConfiguration.java  | 19 +++++++++----------
 .../BarcodeDataFormatAutoConfiguration.java          | 19 +++++++++----------
 .../Base64DataFormatAutoConfiguration.java           | 19 +++++++++----------
 .../springboot/BeanComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/ClassComponentAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/BeanLanguageAutoConfiguration.java    | 19 +++++++++----------
 .../BeanValidatorComponentAutoConfiguration.java     | 19 +++++++++----------
 .../BeanIODataFormatAutoConfiguration.java           | 19 +++++++++----------
 .../BindyCsvDataFormatAutoConfiguration.java         | 19 +++++++++----------
 .../BindyFixedLengthDataFormatAutoConfiguration.java | 19 +++++++++----------
 ...BindyKeyValuePairDataFormatAutoConfiguration.java | 19 +++++++++----------
 .../springboot/BonitaComponentAutoConfiguration.java | 19 +++++++++----------
 .../springboot/BoxComponentAutoConfiguration.java    | 19 +++++++++----------
 .../BraintreeComponentAutoConfiguration.java         | 19 +++++++++----------
 .../springboot/BrowseComponentAutoConfiguration.java | 19 +++++++++----------
 .../CaffeineCacheComponentAutoConfiguration.java     | 19 +++++++++----------
 .../CaffeineLoadCacheComponentAutoConfiguration.java | 19 +++++++++----------
 .../CassandraComponentAutoConfiguration.java         | 19 +++++++++----------
 .../springboot/CBORDataFormatAutoConfiguration.java  | 19 +++++++++----------
 .../ChatScriptComponentAutoConfiguration.java        | 19 +++++++++----------
 .../springboot/ChunkComponentAutoConfiguration.java  | 19 +++++++++----------
 .../ClickUpComponentAutoConfiguration.java           | 19 +++++++++----------
 .../cm/springboot/CMComponentAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/CoAPComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/CometdComponentAutoConfiguration.java | 19 +++++++++----------
 .../springboot/ConsulComponentAutoConfiguration.java | 19 +++++++++----------
 .../ControlBusComponentAutoConfiguration.java        | 19 +++++++++----------
 .../ConstantLanguageAutoConfiguration.java           | 19 +++++++++----------
 .../springboot/CSimpleLanguageAutoConfiguration.java | 19 +++++++++----------
 .../springboot/HeaderLanguageAutoConfiguration.java  | 19 +++++++++----------
 .../ExchangePropertyLanguageAutoConfiguration.java   | 19 +++++++++----------
 .../ref/springboot/RefLanguageAutoConfiguration.java | 19 +++++++++----------
 .../springboot/FileLanguageAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/SimpleLanguageAutoConfiguration.java  | 19 +++++++++----------
 .../TokenizeLanguageAutoConfiguration.java           | 19 +++++++++----------
 .../VariableLanguageAutoConfiguration.java           | 19 +++++++++----------
 ...RestConfigurationDefinitionAutoConfiguration.java | 20 +++++++++++---------
 .../CouchbaseComponentAutoConfiguration.java         | 19 +++++++++----------
 .../CouchDbComponentAutoConfiguration.java           | 19 +++++++++----------
 .../springboot/CronComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/PGPDataFormatAutoConfiguration.java   | 19 +++++++++----------
 .../DigitalSignatureComponentAutoConfiguration.java  | 19 +++++++++----------
 .../CryptoDataFormatAutoConfiguration.java           | 19 +++++++++----------
 .../springboot/CsvDataFormatAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/CxfRsComponentAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/CxfComponentAutoConfiguration.java    | 19 +++++++++----------
 .../CyberArkVaultComponentAutoConfiguration.java     | 19 +++++++++----------
 .../springboot/DaprComponentAutoConfiguration.java   | 19 +++++++++----------
 .../DataFormatComponentAutoConfiguration.java        | 19 +++++++++----------
 .../DataSetComponentAutoConfiguration.java           | 19 +++++++++----------
 .../DataSetTestComponentAutoConfiguration.java       | 19 +++++++++----------
 .../DatasonnetLanguageAutoConfiguration.java         | 19 +++++++++----------
 .../DebeziumDb2ComponentAutoConfiguration.java       | 19 +++++++++----------
 .../DebeziumMongodbComponentAutoConfiguration.java   | 19 +++++++++----------
 .../DebeziumMySqlComponentAutoConfiguration.java     | 19 +++++++++----------
 .../DebeziumOracleComponentAutoConfiguration.java    | 19 +++++++++----------
 .../DebeziumPostgresComponentAutoConfiguration.java  | 19 +++++++++----------
 .../DebeziumSqlserverComponentAutoConfiguration.java | 19 +++++++++----------
 .../springboot/DfdlComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/DfdlDataFormatAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/Dhis2ComponentAutoConfiguration.java  | 19 +++++++++----------
 .../DigitalOceanComponentAutoConfiguration.java      | 19 +++++++++----------
 .../springboot/DirectComponentAutoConfiguration.java | 19 +++++++++----------
 .../DisruptorComponentAutoConfiguration.java         | 19 +++++++++----------
 .../DisruptorVmComponentAutoConfiguration.java       | 19 +++++++++----------
 .../springboot/DJLComponentAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/DnsComponentAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/DockerComponentAutoConfiguration.java | 19 +++++++++----------
 .../DoclingComponentAutoConfiguration.java           | 19 +++++++++----------
 .../springboot/DrillComponentAutoConfiguration.java  | 19 +++++++++----------
 .../DropboxComponentAutoConfiguration.java           | 19 +++++++++----------
 ...namicRouterControlComponentAutoConfiguration.java | 19 +++++++++----------
 .../DynamicRouterComponentAutoConfiguration.java     | 19 +++++++++----------
 .../EhcacheComponentAutoConfiguration.java           | 19 +++++++++----------
 ...icsearchRestClientComponentAutoConfiguration.java | 19 +++++++++----------
 .../ElasticsearchComponentAutoConfiguration.java     | 19 +++++++++----------
 .../springboot/ExecComponentAutoConfiguration.java   | 19 +++++++++----------
 .../FastjsonDataFormatAutoConfiguration.java         | 19 +++++++++----------
 .../springboot/FhirComponentAutoConfiguration.java   | 19 +++++++++----------
 .../FhirJsonDataFormatAutoConfiguration.java         | 19 +++++++++----------
 .../FhirXmlDataFormatAutoConfiguration.java          | 19 +++++++++----------
 .../springboot/FileComponentAutoConfiguration.java   | 19 +++++++++----------
 .../FileWatchComponentAutoConfiguration.java         | 19 +++++++++----------
 .../FlatpackComponentAutoConfiguration.java          | 19 +++++++++----------
 .../FlatpackDataFormatAutoConfiguration.java         | 19 +++++++++----------
 .../springboot/FlinkComponentAutoConfiguration.java  | 19 +++++++++----------
 .../FlowableComponentAutoConfiguration.java          | 19 +++++++++----------
 .../springboot/FopComponentAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/ForyDataFormatAutoConfiguration.java  | 19 +++++++++----------
 .../FreemarkerComponentAutoConfiguration.java        | 19 +++++++++----------
 .../springboot/FtpComponentAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/FtpsComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/SftpComponentAutoConfiguration.java   | 19 +++++++++----------
 .../GeoCoderComponentAutoConfiguration.java          | 19 +++++++++----------
 .../springboot/GitComponentAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/GitHubComponentAutoConfiguration.java | 19 +++++++++----------
 .../GitHub2ComponentAutoConfiguration.java           | 19 +++++++++----------
 .../GoogleBigQueryComponentAutoConfiguration.java    | 19 +++++++++----------
 .../GoogleBigQuerySQLComponentAutoConfiguration.java | 19 +++++++++----------
 .../GoogleCalendarComponentAutoConfiguration.java    | 19 +++++++++----------
 ...ogleCalendarStreamComponentAutoConfiguration.java | 19 +++++++++----------
 .../GoogleDriveComponentAutoConfiguration.java       | 19 +++++++++----------
 .../GoogleFirestoreComponentAutoConfiguration.java   | 19 +++++++++----------
 ...ogleCloudFunctionsComponentAutoConfiguration.java | 19 +++++++++----------
 .../GoogleMailComponentAutoConfiguration.java        | 19 +++++++++----------
 .../GoogleMailStreamComponentAutoConfiguration.java  | 19 +++++++++----------
 .../GooglePubsubComponentAutoConfiguration.java      | 19 +++++++++----------
 ...oogleSecretManagerComponentAutoConfiguration.java | 19 +++++++++----------
 .../GoogleSheetsComponentAutoConfiguration.java      | 19 +++++++++----------
 ...GoogleSheetsStreamComponentAutoConfiguration.java | 19 +++++++++----------
 ...eCloudSpeechToTextComponentAutoConfiguration.java | 19 +++++++++----------
 ...GoogleCloudStorageComponentAutoConfiguration.java | 19 +++++++++----------
 ...eCloudTextToSpeechComponentAutoConfiguration.java | 19 +++++++++----------
 .../GoogleVertexAIComponentAutoConfiguration.java    | 19 +++++++++----------
 .../GoogleCloudVisionComponentAutoConfiguration.java | 19 +++++++++----------
 .../springboot/GrapeComponentAutoConfiguration.java  | 19 +++++++++----------
 .../GraphqlComponentAutoConfiguration.java           | 19 +++++++++----------
 .../springboot/GrokDataFormatAutoConfiguration.java  | 19 +++++++++----------
 .../GroovyJSonlDataFormatAutoConfiguration.java      | 19 +++++++++----------
 .../GroovyXmlDataFormatAutoConfiguration.java        | 19 +++++++++----------
 .../springboot/GroovyLanguageAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/GrpcComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/GsonDataFormatAutoConfiguration.java  | 19 +++++++++----------
 .../GuavaEventBusComponentAutoConfiguration.java     | 19 +++++++++----------
 .../HashicorpVaultComponentAutoConfiguration.java    | 19 +++++++++----------
 ...elcastAtomicnumberComponentAutoConfiguration.java | 19 +++++++++----------
 .../HazelcastInstanceComponentAutoConfiguration.java | 19 +++++++++----------
 .../HazelcastListComponentAutoConfiguration.java     | 19 +++++++++----------
 .../HazelcastMapComponentAutoConfiguration.java      | 19 +++++++++----------
 .../HazelcastMultimapComponentAutoConfiguration.java | 19 +++++++++----------
 ...HazelcastPNCounterComponentAutoConfiguration.java | 19 +++++++++----------
 .../HazelcastQueueComponentAutoConfiguration.java    | 19 +++++++++----------
 ...lcastReplicatedmapComponentAutoConfiguration.java | 19 +++++++++----------
 ...azelcastRingbufferComponentAutoConfiguration.java | 19 +++++++++----------
 .../HazelcastSedaComponentAutoConfiguration.java     | 19 +++++++++----------
 .../HazelcastSetComponentAutoConfiguration.java      | 19 +++++++++----------
 .../HazelcastTopicComponentAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/HL7DataFormatAutoConfiguration.java   | 19 +++++++++----------
 .../Hl7TerserLanguageAutoConfiguration.java          | 19 +++++++++----------
 .../springboot/HttpComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/DMSComponentAutoConfiguration.java    | 19 +++++++++----------
 .../FaceRecognitionComponentAutoConfiguration.java   | 19 +++++++++----------
 .../FunctionGraphComponentAutoConfiguration.java     | 19 +++++++++----------
 .../springboot/IAMComponentAutoConfiguration.java    | 19 +++++++++----------
 .../ImageRecognitionComponentAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/OBSComponentAutoConfiguration.java    | 19 +++++++++----------
 ...SimpleNotificationComponentAutoConfiguration.java | 19 +++++++++----------
 .../HuggingFaceComponentAutoConfiguration.java       | 19 +++++++++----------
 .../springboot/IBMCOSComponentAutoConfiguration.java | 19 +++++++++----------
 .../IBMSecretsManagerComponentAutoConfiguration.java | 19 +++++++++----------
 .../WatsonDiscoveryComponentAutoConfiguration.java   | 19 +++++++++----------
 .../WatsonLanguageComponentAutoConfiguration.java    | 19 +++++++++----------
 ...WatsonSpeechToTextComponentAutoConfiguration.java | 19 +++++++++----------
 ...WatsonTextToSpeechComponentAutoConfiguration.java | 19 +++++++++----------
 .../WatsonxAiComponentAutoConfiguration.java         | 19 +++++++++----------
 .../springboot/ICalDataFormatAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/ClientComponentAutoConfiguration.java | 19 +++++++++----------
 .../springboot/ServerComponentAutoConfiguration.java | 19 +++++++++----------
 .../springboot/IggyComponentAutoConfiguration.java   | 19 +++++++++----------
 .../IgniteCacheComponentAutoConfiguration.java       | 19 +++++++++----------
 .../IgniteComputeComponentAutoConfiguration.java     | 19 +++++++++----------
 .../IgniteEventsComponentAutoConfiguration.java      | 19 +++++++++----------
 .../IgniteIdGenComponentAutoConfiguration.java       | 19 +++++++++----------
 .../IgniteMessagingComponentAutoConfiguration.java   | 19 +++++++++----------
 .../IgniteQueueComponentAutoConfiguration.java       | 19 +++++++++----------
 .../IgniteSetComponentAutoConfiguration.java         | 19 +++++++++----------
 ...InfinispanEmbeddedComponentAutoConfiguration.java | 19 +++++++++----------
 .../InfinispanRemoteComponentAutoConfiguration.java  | 19 +++++++++----------
 .../InfluxDbComponentAutoConfiguration.java          | 19 +++++++++----------
 .../InfluxDb2ComponentAutoConfiguration.java         | 19 +++++++++----------
 .../springboot/IrcComponentAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/IronMQComponentAutoConfiguration.java | 19 +++++++++----------
 .../Iso8583DataFormatAutoConfiguration.java          | 19 +++++++++----------
 .../JacksonAvroDataFormatAutoConfiguration.java      | 19 +++++++++----------
 .../JacksonProtobufDataFormatAutoConfiguration.java  | 19 +++++++++----------
 .../JacksonDataFormatAutoConfiguration.java          | 19 +++++++++----------
 .../JacksonAvroDataFormatAutoConfiguration.java      | 19 +++++++++----------
 .../JacksonProtobufDataFormatAutoConfiguration.java  | 19 +++++++++----------
 .../JacksonDataFormatAutoConfiguration.java          | 19 +++++++++----------
 .../JacksonXMLDataFormatAutoConfiguration.java       | 19 +++++++++----------
 .../JacksonXMLDataFormatAutoConfiguration.java       | 19 +++++++++----------
 .../JavaScriptLanguageAutoConfiguration.java         | 19 +++++++++----------
 .../springboot/JaxbDataFormatAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/JCacheComponentAutoConfiguration.java | 19 +++++++++----------
 .../springboot/JcrComponentAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/JdbcComponentAutoConfiguration.java   | 19 +++++++++----------
 .../JettyHttpComponentAutoConfiguration12.java       | 19 +++++++++----------
 .../JGroupsRaftComponentAutoConfiguration.java       | 19 +++++++++----------
 .../JGroupsComponentAutoConfiguration.java           | 19 +++++++++----------
 .../springboot/JiraComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/JmsComponentAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/JMXComponentAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/JoltComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/JooqComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/JavaLanguageAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/JoorLanguageAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/JpaComponentAutoConfiguration.java    | 19 +++++++++----------
 .../jq/springboot/JqLanguageAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/ScpComponentAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/JsltComponentAutoConfiguration.java   | 19 +++++++++----------
 .../JsonPatchComponentAutoConfiguration.java         | 19 +++++++++----------
 .../JsonValidatorComponentAutoConfiguration.java     | 19 +++++++++----------
 .../JsonApiDataFormatAutoConfiguration.java          | 19 +++++++++----------
 .../JsonataComponentAutoConfiguration.java           | 19 +++++++++----------
 .../springboot/JsonbDataFormatAutoConfiguration.java | 19 +++++++++----------
 .../JsonPathLanguageAutoConfiguration.java           | 19 +++++++++----------
 .../springboot/Jt400ComponentAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/JteComponentAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/KafkaComponentAutoConfiguration.java  | 19 +++++++++----------
 .../KameletComponentAutoConfiguration.java           | 19 +++++++++----------
 .../KeycloakComponentAutoConfiguration.java          | 19 +++++++++----------
 .../KnativeComponentAutoConfiguration.java           | 19 +++++++++----------
 .../springboot/KServeComponentAutoConfiguration.java | 19 +++++++++----------
 ...bernetesConfigMapsComponentAutoConfiguration.java | 19 +++++++++----------
 .../KubernetesCronJobComponentAutoConfiguration.java | 19 +++++++++----------
 ...tesCustomResourcesComponentAutoConfiguration.java | 19 +++++++++----------
 ...ernetesDeploymentsComponentAutoConfiguration.java | 19 +++++++++----------
 .../KubernetesEventsComponentAutoConfiguration.java  | 19 +++++++++----------
 .../KubernetesHPAComponentAutoConfiguration.java     | 19 +++++++++----------
 .../KubernetesJobComponentAutoConfiguration.java     | 19 +++++++++----------
 ...bernetesNamespacesComponentAutoConfiguration.java | 19 +++++++++----------
 .../KubernetesNodesComponentAutoConfiguration.java   | 19 +++++++++----------
 ...sPersistentVolumesComponentAutoConfiguration.java | 19 +++++++++----------
 ...stentVolumesClaimsComponentAutoConfiguration.java | 19 +++++++++----------
 .../KubernetesPodsComponentAutoConfiguration.java    | 19 +++++++++----------
 ...icationControllersComponentAutoConfiguration.java | 19 +++++++++----------
 ...etesResourcesQuotaComponentAutoConfiguration.java | 19 +++++++++----------
 .../KubernetesSecretsComponentAutoConfiguration.java | 19 +++++++++----------
 ...tesServiceAccountsComponentAutoConfiguration.java | 19 +++++++++----------
 ...KubernetesServicesComponentAutoConfiguration.java | 19 +++++++++----------
 ...nshiftBuildConfigsComponentAutoConfiguration.java | 19 +++++++++----------
 .../OpenshiftBuildsComponentAutoConfiguration.java   | 19 +++++++++----------
 ...tDeploymentConfigsComponentAutoConfiguration.java | 19 +++++++++----------
 .../springboot/KuduComponentAutoConfiguration.java   | 19 +++++++++----------
 .../LangChain4jAgentComponentAutoConfiguration.java  | 19 +++++++++----------
 .../LangChain4jChatComponentAutoConfiguration.java   | 19 +++++++++----------
 ...gChain4jEmbeddingsComponentAutoConfiguration.java | 19 +++++++++----------
 ...in4jEmbeddingStoreComponentAutoConfiguration.java | 19 +++++++++----------
 .../LangChain4jToolsComponentAutoConfiguration.java  | 19 +++++++++----------
 ...ngChain4jWebSearchComponentAutoConfiguration.java | 19 +++++++++----------
 .../LanguageComponentAutoConfiguration.java          | 19 +++++++++----------
 .../springboot/LdapComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/LdifComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/LogComponentAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/LuceneComponentAutoConfiguration.java | 19 +++++++++----------
 .../LumberjackComponentAutoConfiguration.java        | 19 +++++++++----------
 .../springboot/LZFDataFormatAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/MailComponentAutoConfiguration.java   | 19 +++++++++----------
 .../MimeMultipartDataFormatAutoConfiguration.java    | 19 +++++++++----------
 .../MapstructComponentAutoConfiguration.java         | 19 +++++++++----------
 .../springboot/MasterComponentAutoConfiguration.java | 19 +++++++++----------
 .../MetricsComponentAutoConfiguration.java           | 19 +++++++++----------
 .../MicrometerComponentAutoConfiguration.java        | 19 +++++++++----------
 .../MiloBrowseComponentAutoConfiguration.java        | 19 +++++++++----------
 .../MiloClientComponentAutoConfiguration.java        | 19 +++++++++----------
 .../MiloServerComponentAutoConfiguration.java        | 19 +++++++++----------
 .../springboot/MilvusComponentAutoConfiguration.java | 19 +++++++++----------
 .../MinaSftpComponentAutoConfiguration.java          | 19 +++++++++----------
 .../springboot/MinaComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/MinioComponentAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/MllpComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/MockComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/GridFsComponentAutoConfiguration.java | 19 +++++++++----------
 .../MongoDbComponentAutoConfiguration.java           | 19 +++++++++----------
 .../MustacheComponentAutoConfiguration.java          | 19 +++++++++----------
 .../springboot/MvelComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/MvelLanguageAutoConfiguration.java    | 19 +++++++++----------
 .../MyBatisBeanComponentAutoConfiguration.java       | 19 +++++++++----------
 .../MyBatisComponentAutoConfiguration.java           | 19 +++++++++----------
 .../springboot/NatsComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/Neo4jComponentAutoConfiguration.java  | 19 +++++++++----------
 .../NettyHttpComponentAutoConfiguration.java         | 19 +++++++++----------
 .../springboot/NettyComponentAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/OAIPMHComponentAutoConfiguration.java | 19 +++++++++----------
 .../springboot/OcsfDataFormatAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/OgnlLanguageAutoConfiguration.java    | 19 +++++++++----------
 .../Olingo2ComponentAutoConfiguration.java           | 19 +++++++++----------
 .../Olingo4ComponentAutoConfiguration.java           | 19 +++++++++----------
 .../springboot/OnceComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/OpenAIComponentAutoConfiguration.java | 19 +++++++++----------
 .../OpensearchComponentAutoConfiguration.java        | 19 +++++++++----------
 .../springboot/CinderComponentAutoConfiguration.java | 19 +++++++++----------
 .../springboot/GlanceComponentAutoConfiguration.java | 19 +++++++++----------
 .../KeystoneComponentAutoConfiguration.java          | 19 +++++++++----------
 .../NeutronComponentAutoConfiguration.java           | 19 +++++++++----------
 .../springboot/NovaComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/SwiftComponentAutoConfiguration.java  | 19 +++++++++----------
 .../OpenTelemetryComponentAutoConfiguration.java     | 19 +++++++++----------
 .../OptaPlannerComponentAutoConfiguration.java       | 19 +++++++++----------
 .../PahoMqtt5ComponentAutoConfiguration.java         | 19 +++++++++----------
 .../springboot/PahoComponentAutoConfiguration.java   | 19 +++++++++----------
 .../ParquetAvroDataFormatAutoConfiguration.java      | 19 +++++++++----------
 .../springboot/PdfComponentAutoConfiguration.java    | 19 +++++++++----------
 .../PgReplicationSlotComponentAutoConfiguration.java | 19 +++++++++----------
 .../PgEventComponentAutoConfiguration.java           | 19 +++++++++----------
 .../PineconeVectorDbComponentAutoConfiguration.java  | 19 +++++++++----------
 .../PlatformHttpComponentAutoConfiguration.java      | 19 +++++++++----------
 .../springboot/Plc4XComponentAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/PQCDataFormatAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/PQCComponentAutoConfiguration.java    | 19 +++++++++----------
 .../PrinterComponentAutoConfiguration.java           | 19 +++++++++----------
 .../ProtobufDataFormatAutoConfiguration.java         | 19 +++++++++----------
 .../springboot/PubNubComponentAutoConfiguration.java | 19 +++++++++----------
 .../springboot/PulsarComponentAutoConfiguration.java | 19 +++++++++----------
 .../springboot/PythonLanguageAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/QdrantComponentAutoConfiguration.java | 19 +++++++++----------
 .../springboot/QuartzComponentAutoConfiguration.java | 19 +++++++++----------
 .../QuickfixjComponentAutoConfiguration.java         | 19 +++++++++----------
 .../ReactiveStreamsComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/RefComponentAutoConfiguration.java    | 19 +++++++++----------
 .../RestOpenApiComponentAutoConfiguration.java       | 19 +++++++++----------
 .../RestApiComponentAutoConfiguration.java           | 19 +++++++++----------
 .../springboot/RestComponentAutoConfiguration.java   | 19 +++++++++----------
 .../RobotFrameworkComponentAutoConfiguration.java    | 19 +++++++++----------
 .../RocketMQComponentAutoConfiguration.java          | 19 +++++++++----------
 .../springboot/RssComponentAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/RssDataFormatAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/SagaComponentAutoConfiguration.java   | 19 +++++++++----------
 .../SalesforceComponentAutoConfiguration.java        | 19 +++++++++----------
 .../NetWeaverComponentAutoConfiguration.java         | 19 +++++++++----------
 .../springboot/XQueryComponentAutoConfiguration.java | 19 +++++++++----------
 .../springboot/XQueryLanguageAutoConfiguration.java  | 19 +++++++++----------
 .../SchedulerComponentAutoConfiguration.java         | 19 +++++++++----------
 .../SchematronComponentAutoConfiguration.java        | 19 +++++++++----------
 .../springboot/SedaComponentAutoConfiguration.java   | 19 +++++++++----------
 .../ServiceNowComponentAutoConfiguration.java        | 19 +++++++++----------
 .../ServletComponentAutoConfiguration.java           | 19 +++++++++----------
 .../springboot/SjmsComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/Sjms2ComponentAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/SlackComponentAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/SmbComponentAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/SmooksComponentAutoConfiguration.java | 19 +++++++++----------
 .../SmooksDataFormatAutoConfiguration.java           | 19 +++++++++----------
 .../springboot/SmppComponentAutoConfiguration.java   | 19 +++++++++----------
 .../SnakeYAMLDataFormatAutoConfiguration.java        | 19 +++++++++----------
 .../springboot/SnmpComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/SoapDataFormatAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/SolrComponentAutoConfiguration.java   | 19 +++++++++----------
 .../SplunkHECComponentAutoConfiguration.java         | 19 +++++++++----------
 .../springboot/SplunkComponentAutoConfiguration.java | 19 +++++++++----------
 .../SpringAiChatComponentAutoConfiguration.java      | 19 +++++++++----------
 ...SpringAiEmbeddingsComponentAutoConfiguration.java | 19 +++++++++----------
 .../SpringAiImageComponentAutoConfiguration.java     | 19 +++++++++----------
 .../SpringAiToolsComponentAutoConfiguration.java     | 19 +++++++++----------
 ...pringAiVectorStoreComponentAutoConfiguration.java | 19 +++++++++----------
 .../SpringBatchComponentAutoConfiguration.java       | 19 +++++++++----------
 .../SpringJdbcComponentAutoConfiguration.java        | 19 +++++++++----------
 .../SpringLdapComponentAutoConfiguration.java        | 19 +++++++++----------
 .../SpringRabbitMQComponentAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/RedisComponentAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/EventComponentAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/SpelLanguageAutoConfiguration.java    | 19 +++++++++----------
 .../SpringWebserviceComponentAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/SqlComponentAutoConfiguration.java    | 19 +++++++++----------
 .../SqlStoredComponentAutoConfiguration.java         | 19 +++++++++----------
 .../springboot/SshComponentAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/StAXComponentAutoConfiguration.java   | 19 +++++++++----------
 .../XMLTokenizeLanguageAutoConfiguration.java        | 19 +++++++++----------
 .../springboot/StitchComponentAutoConfiguration.java | 19 +++++++++----------
 .../springboot/StompComponentAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/StreamComponentAutoConfiguration.java | 19 +++++++++----------
 .../StringTemplateComponentAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/StripeComponentAutoConfiguration.java | 19 +++++++++----------
 .../springboot/StubComponentAutoConfiguration.java   | 19 +++++++++----------
 .../SwiftMtDataFormatAutoConfiguration.java          | 19 +++++++++----------
 .../SwiftMxDataFormatAutoConfiguration.java          | 19 +++++++++----------
 .../SyslogDataFormatAutoConfiguration.java           | 19 +++++++++----------
 .../TahuEdgeComponentAutoConfiguration.java          | 19 +++++++++----------
 .../TahuHostComponentAutoConfiguration.java          | 19 +++++++++----------
 .../TarFileDataFormatAutoConfiguration.java          | 19 +++++++++----------
 .../TelegramComponentAutoConfiguration.java          | 19 +++++++++----------
 .../TensorFlowServingComponentAutoConfiguration.java | 19 +++++++++----------
 .../springboot/ThriftComponentAutoConfiguration.java | 19 +++++++++----------
 .../ThriftDataFormatAutoConfiguration.java           | 19 +++++++++----------
 .../ThymeleafComponentAutoConfiguration.java         | 19 +++++++++----------
 .../springboot/TikaComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/TimerComponentAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/TwilioComponentAutoConfiguration.java | 19 +++++++++----------
 ...itterDirectMessageComponentAutoConfiguration.java | 19 +++++++++----------
 .../TwitterSearchComponentAutoConfiguration.java     | 19 +++++++++----------
 .../TwitterTimelineComponentAutoConfiguration.java   | 19 +++++++++----------
 .../UndertowComponentAutoConfiguration.java          | 19 +++++++++----------
 .../UniVocityCsvDataFormatAutoConfiguration.java     | 19 +++++++++----------
 .../UniVocityFixedDataFormatAutoConfiguration.java   | 19 +++++++++----------
 .../UniVocityTsvDataFormatAutoConfiguration.java     | 19 +++++++++----------
 .../ValidatorComponentAutoConfiguration.java         | 19 +++++++++----------
 .../VelocityComponentAutoConfiguration.java          | 19 +++++++++----------
 .../VertxHttpComponentAutoConfiguration.java         | 19 +++++++++----------
 .../springboot/VertxComponentAutoConfiguration.java  | 19 +++++++++----------
 .../VertxWebsocketComponentAutoConfiguration.java    | 19 +++++++++----------
 .../springboot/WasmComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/WasmLanguageAutoConfiguration.java    | 19 +++++++++----------
 .../WeatherComponentAutoConfiguration.java           | 19 +++++++++----------
 .../WeaviateVectorDbComponentAutoConfiguration.java  | 19 +++++++++----------
 .../springboot/Web3jComponentAutoConfiguration.java  | 19 +++++++++----------
 .../WebhookComponentAutoConfiguration.java           | 19 +++++++++----------
 .../WhatsAppComponentAutoConfiguration.java          | 19 +++++++++----------
 .../WordpressComponentAutoConfiguration.java         | 19 +++++++++----------
 .../WorkdayComponentAutoConfiguration.java           | 19 +++++++++----------
 .../XChangeComponentAutoConfiguration.java           | 19 +++++++++----------
 .../xj/springboot/XJComponentAutoConfiguration.java  | 19 +++++++++----------
 .../XmlSignerComponentAutoConfiguration.java         | 19 +++++++++----------
 .../XmlVerifierComponentAutoConfiguration.java       | 19 +++++++++----------
 .../XMLSecurityDataFormatAutoConfiguration.java      | 19 +++++++++----------
 .../springboot/XmppComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/XPathLanguageAutoConfiguration.java   | 19 +++++++++----------
 .../XsltSaxonComponentAutoConfiguration.java         | 19 +++++++++----------
 .../springboot/XsltComponentAutoConfiguration.java   | 19 +++++++++----------
 .../springboot/ZeebeComponentAutoConfiguration.java  | 19 +++++++++----------
 .../ZendeskComponentAutoConfiguration.java           | 19 +++++++++----------
 .../GzipDeflaterDataFormatAutoConfiguration.java     | 19 +++++++++----------
 .../ZipDeflaterDataFormatAutoConfiguration.java      | 19 +++++++++----------
 .../ZipFileDataFormatAutoConfiguration.java          | 19 +++++++++----------
 .../springboot/MasterComponentAutoConfiguration.java | 19 +++++++++----------
 .../ZooKeeperComponentAutoConfiguration.java         | 19 +++++++++----------
 473 files changed, 4259 insertions(+), 4729 deletions(-)

diff --git a/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentAutoConfiguration.java b/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentAutoConfiguration.java
index b03b46d7dc4..d9e31f38c00 100644
--- a/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentAutoConfiguration.java
+++ b/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, ActiveMQComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,ActiveMQComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.activemq"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, ActiveMQComponentConverter.class})
 public class ActiveMQComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private ActiveMQComponentConfiguration configuration;
+    private final ActiveMQComponentConfiguration configuration;
 
     public ActiveMQComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.activemq.springboot.ActiveMQComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-activemq6-starter/src/main/java/org/apache/camel/component/activemq6/springboot/ActiveMQComponentAutoConfiguration.java b/components-starter/camel-activemq6-starter/src/main/java/org/apache/camel/component/activemq6/springboot/ActiveMQComponentAutoConfiguration.java
index 531bd689056..1d199c1632f 100644
--- a/components-starter/camel-activemq6-starter/src/main/java/org/apache/camel/component/activemq6/springboot/ActiveMQComponentAutoConfiguration.java
+++ b/components-starter/camel-activemq6-starter/src/main/java/org/apache/camel/component/activemq6/springboot/ActiveMQComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, ActiveMQComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,ActiveMQComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.activemq6"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, ActiveMQComponentConverter.class})
 public class ActiveMQComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private ActiveMQComponentConfiguration configuration;
+    private final ActiveMQComponentConfiguration configuration;
 
     public ActiveMQComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.activemq6.springboot.ActiveMQComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentAutoConfiguration.java b/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentAutoConfiguration.java
index 477da82feca..ab2d499c603 100644
--- a/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentAutoConfiguration.java
+++ b/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, AMQPComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,AMQPComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.amqp"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, AMQPComponentConverter.class})
 public class AMQPComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private AMQPComponentConfiguration configuration;
+    private final AMQPComponentConfiguration configuration;
 
     public AMQPComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.amqp.springboot.AMQPComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-arangodb-starter/src/main/java/org/apache/camel/component/arangodb/springboot/ArangoDbComponentAutoConfiguration.java b/components-starter/camel-arangodb-starter/src/main/java/org/apache/camel/component/arangodb/springboot/ArangoDbComponentAutoConfiguration.java
index 7a63eb1f2b9..d0d6a3f3722 100644
--- a/components-starter/camel-arangodb-starter/src/main/java/org/apache/camel/component/arangodb/springboot/ArangoDbComponentAutoConfiguration.java
+++ b/components-starter/camel-arangodb-starter/src/main/java/org/apache/camel/component/arangodb/springboot/ArangoDbComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, ArangoDbComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,ArangoDbComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.arangodb"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, ArangoDbComponentConverter.class})
 public class ArangoDbComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private ArangoDbComponentConfiguration configuration;
+    private final ArangoDbComponentConfiguration configuration;
 
     public ArangoDbComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.arangodb.springboot.ArangoDbComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-as2-starter/src/main/java/org/apache/camel/component/as2/springboot/AS2ComponentAutoConfiguration.java b/components-starter/camel-as2-starter/src/main/java/org/apache/camel/component/as2/springboot/AS2ComponentAutoConfiguration.java
index 32087dc9573..c1c74566919 100644
--- a/components-starter/camel-as2-starter/src/main/java/org/apache/camel/component/as2/springboot/AS2ComponentAutoConfiguration.java
+++ b/components-starter/camel-as2-starter/src/main/java/org/apache/camel/component/as2/springboot/AS2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, AS2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,AS2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.as2"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, AS2ComponentConverter.class})
 public class AS2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private AS2ComponentConfiguration configuration;
+    private final AS2ComponentConfiguration configuration;
 
     public AS2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.as2.springboot.AS2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-asn1-starter/src/main/java/org/apache/camel/dataformat/asn1/springboot/ASN1DataFormatAutoConfiguration.java b/components-starter/camel-asn1-starter/src/main/java/org/apache/camel/dataformat/asn1/springboot/ASN1DataFormatAutoConfiguration.java
index 29058ac490f..45529442d85 100644
--- a/components-starter/camel-asn1-starter/src/main/java/org/apache/camel/dataformat/asn1/springboot/ASN1DataFormatAutoConfiguration.java
+++ b/components-starter/camel-asn1-starter/src/main/java/org/apache/camel/dataformat/asn1/springboot/ASN1DataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,ASN1DataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.asn1"})
 public class ASN1DataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private ASN1DataFormatConfiguration configuration;
+    private final ASN1DataFormatConfiguration configuration;
 
     public ASN1DataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.dataformat.asn1.springboot.ASN1DataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-asterisk-starter/src/main/java/org/apache/camel/component/asterisk/springboot/AsteriskComponentAutoConfiguration.java b/components-starter/camel-asterisk-starter/src/main/java/org/apache/camel/component/asterisk/springboot/AsteriskComponentAutoConfiguration.java
index 1d624c13e9d..7175a5022a2 100644
--- a/components-starter/camel-asterisk-starter/src/main/java/org/apache/camel/component/asterisk/springboot/AsteriskComponentAutoConfiguration.java
+++ b/components-starter/camel-asterisk-starter/src/main/java/org/apache/camel/component/asterisk/springboot/AsteriskComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,AsteriskComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.asterisk"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class AsteriskComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private AsteriskComponentConfiguration configuration;
+    private final AsteriskComponentConfiguration configuration;
 
     public AsteriskComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.asterisk.springboot.AsteriskComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentAutoConfiguration.java b/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentAutoConfiguration.java
index e2528df7bed..4ba3e0b89e5 100644
--- a/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentAutoConfiguration.java
+++ b/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, WebsocketComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,WebsocketComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.atmosphere-websocket"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, WebsocketComponentConverter.class})
 public class WebsocketComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private WebsocketComponentConfiguration configuration;
+    private final WebsocketComponentConfiguration configuration;
 
     public WebsocketComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.atmosphere.websocket.springboot.WebsocketComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-atom-starter/src/main/java/org/apache/camel/component/atom/springboot/AtomComponentAutoConfiguration.java b/components-starter/camel-atom-starter/src/main/java/org/apache/camel/component/atom/springboot/AtomComponentAutoConfiguration.java
index 1562f5262ce..3ee6ae33ed1 100644
--- a/components-starter/camel-atom-starter/src/main/java/org/apache/camel/component/atom/springboot/AtomComponentAutoConfiguration.java
+++ b/components-starter/camel-atom-starter/src/main/java/org/apache/camel/component/atom/springboot/AtomComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,AtomComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.atom"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class AtomComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private AtomComponentConfiguration configuration;
+    private final AtomComponentConfiguration configuration;
 
     public AtomComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.atom.springboot.AtomComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-avro-rpc-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java b/components-starter/camel-avro-rpc-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java
index cc5a29fa8b9..f7041c1d86f 100644
--- a/components-starter/camel-avro-rpc-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java
+++ b/components-starter/camel-avro-rpc-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, AvroComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,AvroComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.avro"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, AvroComponentConverter.class})
 public class AvroComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private AvroComponentConfiguration configuration;
+    private final AvroComponentConfiguration configuration;
 
     public AvroComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.avro.springboot.AvroComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-avro-starter/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java b/components-starter/camel-avro-starter/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java
index 100328d17bd..4ee8e0a3bef 100644
--- a/components-starter/camel-avro-starter/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java
+++ b/components-starter/camel-avro-starter/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,AvroDataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.avro"})
 public class AvroDataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private AvroDataFormatConfiguration configuration;
+    private final AvroDataFormatConfiguration configuration;
 
     public AvroDataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.dataformat.avro.springboot.AvroDataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws-bedrock-starter/src/main/java/org/apache/camel/component/aws2/bedrock/agent/springboot/BedrockAgentComponentAutoConfiguration.java b/components-starter/camel-aws-bedrock-starter/src/main/java/org/apache/camel/component/aws2/bedrock/agent/springboot/BedrockAgentComponentAutoConfiguration.java
index a02ba538c00..b4f05d28b0c 100644
--- a/components-starter/camel-aws-bedrock-starter/src/main/java/org/apache/camel/component/aws2/bedrock/agent/springboot/BedrockAgentComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-bedrock-starter/src/main/java/org/apache/camel/component/aws2/bedrock/agent/springboot/BedrockAgentComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, BedrockAgentComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,BedrockAgentComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-bedrock-agent"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, BedrockAgentComponentConverter.class})
 public class BedrockAgentComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private BedrockAgentComponentConfiguration configuration;
+    private final BedrockAgentComponentConfiguration configuration;
 
     public BedrockAgentComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.bedrock.agent.springboot.BedrockAgentComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws-bedrock-starter/src/main/java/org/apache/camel/component/aws2/bedrock/agentruntime/springboot/BedrockAgentRuntimeComponentAutoConfiguration.java b/components-starter/camel-aws-bedrock-starter/src/main/java/org/apache/camel/component/aws2/bedrock/agentruntime/springboot/BedrockAgentRuntimeComponentAutoConfiguration.java
index c0d227e54b3..bff7b0158e4 100644
--- a/components-starter/camel-aws-bedrock-starter/src/main/java/org/apache/camel/component/aws2/bedrock/agentruntime/springboot/BedrockAgentRuntimeComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-bedrock-starter/src/main/java/org/apache/camel/component/aws2/bedrock/agentruntime/springboot/BedrockAgentRuntimeComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, BedrockAgentRuntimeComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,BedrockAgentRuntimeComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-bedrock-agent-runtime"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, BedrockAgentRuntimeComponentConverter.class})
 public class BedrockAgentRuntimeComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private BedrockAgentRuntimeComponentConfiguration configuration;
+    private final BedrockAgentRuntimeComponentConfiguration configuration;
 
     public BedrockAgentRuntimeComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.bedrock.agentruntime.springboot.BedrockAgentRuntimeComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws-bedrock-starter/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/springboot/BedrockComponentAutoConfiguration.java b/components-starter/camel-aws-bedrock-starter/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/springboot/BedrockComponentAutoConfiguration.java
index 88dbce470fd..8294eecc162 100644
--- a/components-starter/camel-aws-bedrock-starter/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/springboot/BedrockComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-bedrock-starter/src/main/java/org/apache/camel/component/aws2/bedrock/runtime/springboot/BedrockComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, BedrockComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,BedrockComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-bedrock"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, BedrockComponentConverter.class})
 public class BedrockComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private BedrockComponentConfiguration configuration;
+    private final BedrockComponentConfiguration configuration;
 
     public BedrockComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.bedrock.runtime.springboot.BedrockComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws-cloudtrail-starter/src/main/java/org/apache/camel/component/aws/cloudtrail/springboot/CloudtrailComponentAutoConfiguration.java b/components-starter/camel-aws-cloudtrail-starter/src/main/java/org/apache/camel/component/aws/cloudtrail/springboot/CloudtrailComponentAutoConfiguration.java
index 40cae25bd84..cd1e82a192c 100644
--- a/components-starter/camel-aws-cloudtrail-starter/src/main/java/org/apache/camel/component/aws/cloudtrail/springboot/CloudtrailComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-cloudtrail-starter/src/main/java/org/apache/camel/component/aws/cloudtrail/springboot/CloudtrailComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, CloudtrailComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,CloudtrailComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-cloudtrail"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, CloudtrailComponentConverter.class})
 public class CloudtrailComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private CloudtrailComponentConfiguration configuration;
+    private final CloudtrailComponentConfiguration configuration;
 
     public CloudtrailComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws.cloudtrail.springboot.CloudtrailComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws-config-starter/src/main/java/org/apache/camel/component/aws/config/springboot/AWSConfigComponentAutoConfiguration.java b/components-starter/camel-aws-config-starter/src/main/java/org/apache/camel/component/aws/config/springboot/AWSConfigComponentAutoConfiguration.java
index 0ce314f83b7..9368d72cc20 100644
--- a/components-starter/camel-aws-config-starter/src/main/java/org/apache/camel/component/aws/config/springboot/AWSConfigComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-config-starter/src/main/java/org/apache/camel/component/aws/config/springboot/AWSConfigComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, AWSConfigComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,AWSConfigComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-config"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, AWSConfigComponentConverter.class})
 public class AWSConfigComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private AWSConfigComponentConfiguration configuration;
+    private final AWSConfigComponentConfiguration configuration;
 
     public AWSConfigComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws.config.springboot.AWSConfigComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws-parameter-store-starter/src/main/java/org/apache/camel/component/aws/parameterstore/springboot/ParameterStoreComponentAutoConfiguration.java b/components-starter/camel-aws-parameter-store-starter/src/main/java/org/apache/camel/component/aws/parameterstore/springboot/ParameterStoreComponentAutoConfiguration.java
index 2cc2acea648..8c8ea5f27ba 100644
--- a/components-starter/camel-aws-parameter-store-starter/src/main/java/org/apache/camel/component/aws/parameterstore/springboot/ParameterStoreComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-parameter-store-starter/src/main/java/org/apache/camel/component/aws/parameterstore/springboot/ParameterStoreComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, ParameterStoreComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,ParameterStoreComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-parameter-store"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, ParameterStoreComponentConverter.class})
 public class ParameterStoreComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private ParameterStoreComponentConfiguration configuration;
+    private final ParameterStoreComponentConfiguration configuration;
 
     public ParameterStoreComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws.parameterstore.springboot.ParameterStoreComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws-secrets-manager-starter/src/main/java/org/apache/camel/component/aws/secretsmanager/springboot/SecretsManagerComponentAutoConfiguration.java b/components-starter/camel-aws-secrets-manager-starter/src/main/java/org/apache/camel/component/aws/secretsmanager/springboot/SecretsManagerComponentAutoConfiguration.java
index fd86829fb52..174e36c7692 100644
--- a/components-starter/camel-aws-secrets-manager-starter/src/main/java/org/apache/camel/component/aws/secretsmanager/springboot/SecretsManagerComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-secrets-manager-starter/src/main/java/org/apache/camel/component/aws/secretsmanager/springboot/SecretsManagerComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, SecretsManagerComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,SecretsManagerComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-secrets-manager"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, SecretsManagerComponentConverter.class})
 public class SecretsManagerComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private SecretsManagerComponentConfiguration configuration;
+    private final SecretsManagerComponentConfiguration configuration;
 
     public SecretsManagerComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws.secretsmanager.springboot.SecretsManagerComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws-security-hub-starter/src/main/java/org/apache/camel/component/aws/securityhub/springboot/SecurityHubComponentAutoConfiguration.java b/components-starter/camel-aws-security-hub-starter/src/main/java/org/apache/camel/component/aws/securityhub/springboot/SecurityHubComponentAutoConfiguration.java
index 23f8474abe0..a353f1d7f37 100644
--- a/components-starter/camel-aws-security-hub-starter/src/main/java/org/apache/camel/component/aws/securityhub/springboot/SecurityHubComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-security-hub-starter/src/main/java/org/apache/camel/component/aws/securityhub/springboot/SecurityHubComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, SecurityHubComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,SecurityHubComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-security-hub"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, SecurityHubComponentConverter.class})
 public class SecurityHubComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private SecurityHubComponentConfiguration configuration;
+    private final SecurityHubComponentConfiguration configuration;
 
     public SecurityHubComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws.securityhub.springboot.SecurityHubComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-athena-starter/src/main/java/org/apache/camel/component/aws2/athena/springboot/Athena2ComponentAutoConfiguration.java b/components-starter/camel-aws2-athena-starter/src/main/java/org/apache/camel/component/aws2/athena/springboot/Athena2ComponentAutoConfiguration.java
index cb399daab78..06d66bc8f4e 100644
--- a/components-starter/camel-aws2-athena-starter/src/main/java/org/apache/camel/component/aws2/athena/springboot/Athena2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-athena-starter/src/main/java/org/apache/camel/component/aws2/athena/springboot/Athena2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, Athena2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,Athena2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-athena"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, Athena2ComponentConverter.class})
 public class Athena2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private Athena2ComponentConfiguration configuration;
+    private final Athena2ComponentConfiguration configuration;
 
     public Athena2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.athena.springboot.Athena2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-comprehend-starter/src/main/java/org/apache/camel/component/aws2/comprehend/springboot/Comprehend2ComponentAutoConfiguration.java b/components-starter/camel-aws2-comprehend-starter/src/main/java/org/apache/camel/component/aws2/comprehend/springboot/Comprehend2ComponentAutoConfiguration.java
index eeaa69168b2..e9123dd5de0 100644
--- a/components-starter/camel-aws2-comprehend-starter/src/main/java/org/apache/camel/component/aws2/comprehend/springboot/Comprehend2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-comprehend-starter/src/main/java/org/apache/camel/component/aws2/comprehend/springboot/Comprehend2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, Comprehend2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,Comprehend2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-comprehend"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, Comprehend2ComponentConverter.class})
 public class Comprehend2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private Comprehend2ComponentConfiguration configuration;
+    private final Comprehend2ComponentConfiguration configuration;
 
     public Comprehend2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.comprehend.springboot.Comprehend2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentAutoConfiguration.java b/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentAutoConfiguration.java
index 5b01968e1ce..d53896becf4 100644
--- a/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, Cw2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,Cw2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-cw"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, Cw2ComponentConverter.class})
 public class Cw2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private Cw2ComponentConfiguration configuration;
+    private final Cw2ComponentConfiguration configuration;
 
     public Cw2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.cw.springboot.Cw2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddb/springboot/Ddb2ComponentAutoConfiguration.java b/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddb/springboot/Ddb2ComponentAutoConfiguration.java
index 5f93cf9cfe8..e0348f71f40 100644
--- a/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddb/springboot/Ddb2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddb/springboot/Ddb2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, Ddb2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,Ddb2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-ddb"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, Ddb2ComponentConverter.class})
 public class Ddb2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private Ddb2ComponentConfiguration configuration;
+    private final Ddb2ComponentConfiguration configuration;
 
     public Ddb2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.ddb.springboot.Ddb2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddbstream/springboot/Ddb2StreamComponentAutoConfiguration.java b/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddbstream/springboot/Ddb2StreamComponentAutoConfiguration.java
index bf0addc658c..8ba108b9997 100644
--- a/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddbstream/springboot/Ddb2StreamComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddbstream/springboot/Ddb2StreamComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, Ddb2StreamComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,Ddb2StreamComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-ddbstream"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, Ddb2StreamComponentConverter.class})
 public class Ddb2StreamComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private Ddb2StreamComponentConfiguration configuration;
+    private final Ddb2StreamComponentConfiguration configuration;
 
     public Ddb2StreamComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.ddbstream.springboot.Ddb2StreamComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-ec2-starter/src/main/java/org/apache/camel/component/aws2/ec2/springboot/AWS2EC2ComponentAutoConfiguration.java b/components-starter/camel-aws2-ec2-starter/src/main/java/org/apache/camel/component/aws2/ec2/springboot/AWS2EC2ComponentAutoConfiguration.java
index 1099f93112d..cd98f25afdd 100644
--- a/components-starter/camel-aws2-ec2-starter/src/main/java/org/apache/camel/component/aws2/ec2/springboot/AWS2EC2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-ec2-starter/src/main/java/org/apache/camel/component/aws2/ec2/springboot/AWS2EC2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, AWS2EC2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,AWS2EC2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-ec2"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, AWS2EC2ComponentConverter.class})
 public class AWS2EC2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private AWS2EC2ComponentConfiguration configuration;
+    private final AWS2EC2ComponentConfiguration configuration;
 
     public AWS2EC2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.ec2.springboot.AWS2EC2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-ecs-starter/src/main/java/org/apache/camel/component/aws2/ecs/springboot/ECS2ComponentAutoConfiguration.java b/components-starter/camel-aws2-ecs-starter/src/main/java/org/apache/camel/component/aws2/ecs/springboot/ECS2ComponentAutoConfiguration.java
index d1a8bf5c00b..b0b1d801e71 100644
--- a/components-starter/camel-aws2-ecs-starter/src/main/java/org/apache/camel/component/aws2/ecs/springboot/ECS2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-ecs-starter/src/main/java/org/apache/camel/component/aws2/ecs/springboot/ECS2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, ECS2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,ECS2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-ecs"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, ECS2ComponentConverter.class})
 public class ECS2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private ECS2ComponentConfiguration configuration;
+    private final ECS2ComponentConfiguration configuration;
 
     public ECS2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.ecs.springboot.ECS2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-eks-starter/src/main/java/org/apache/camel/component/aws2/eks/springboot/EKS2ComponentAutoConfiguration.java b/components-starter/camel-aws2-eks-starter/src/main/java/org/apache/camel/component/aws2/eks/springboot/EKS2ComponentAutoConfiguration.java
index 651deeb3012..2a4a5a3fcbe 100644
--- a/components-starter/camel-aws2-eks-starter/src/main/java/org/apache/camel/component/aws2/eks/springboot/EKS2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-eks-starter/src/main/java/org/apache/camel/component/aws2/eks/springboot/EKS2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, EKS2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,EKS2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-eks"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, EKS2ComponentConverter.class})
 public class EKS2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private EKS2ComponentConfiguration configuration;
+    private final EKS2ComponentConfiguration configuration;
 
     public EKS2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.eks.springboot.EKS2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-eventbridge-starter/src/main/java/org/apache/camel/component/aws2/eventbridge/springboot/EventbridgeComponentAutoConfiguration.java b/components-starter/camel-aws2-eventbridge-starter/src/main/java/org/apache/camel/component/aws2/eventbridge/springboot/EventbridgeComponentAutoConfiguration.java
index 9680deabb70..029bafc424b 100644
--- a/components-starter/camel-aws2-eventbridge-starter/src/main/java/org/apache/camel/component/aws2/eventbridge/springboot/EventbridgeComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-eventbridge-starter/src/main/java/org/apache/camel/component/aws2/eventbridge/springboot/EventbridgeComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, EventbridgeComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,EventbridgeComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-eventbridge"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, EventbridgeComponentConverter.class})
 public class EventbridgeComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private EventbridgeComponentConfiguration configuration;
+    private final EventbridgeComponentConfiguration configuration;
 
     public EventbridgeComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.eventbridge.springboot.EventbridgeComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-iam-starter/src/main/java/org/apache/camel/component/aws2/iam/springboot/IAM2ComponentAutoConfiguration.java b/components-starter/camel-aws2-iam-starter/src/main/java/org/apache/camel/component/aws2/iam/springboot/IAM2ComponentAutoConfiguration.java
index 4be00028caa..1cd344e3ab6 100644
--- a/components-starter/camel-aws2-iam-starter/src/main/java/org/apache/camel/component/aws2/iam/springboot/IAM2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-iam-starter/src/main/java/org/apache/camel/component/aws2/iam/springboot/IAM2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, IAM2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,IAM2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-iam"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, IAM2ComponentConverter.class})
 public class IAM2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private IAM2ComponentConfiguration configuration;
+    private final IAM2ComponentConfiguration configuration;
 
     public IAM2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.iam.springboot.IAM2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentAutoConfiguration.java b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentAutoConfiguration.java
index 13cce3dab65..f972b8c7ccc 100644
--- a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, KinesisFirehose2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,KinesisFirehose2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-kinesis-firehose"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, KinesisFirehose2ComponentConverter.class})
 public class KinesisFirehose2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private KinesisFirehose2ComponentConfiguration configuration;
+    private final KinesisFirehose2ComponentConfiguration configuration;
 
     public KinesisFirehose2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.firehose.springboot.KinesisFirehose2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/kinesis/springboot/Kinesis2ComponentAutoConfiguration.java b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/kinesis/springboot/Kinesis2ComponentAutoConfiguration.java
index 26061366b3c..5bc7e7dfe3e 100644
--- a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/kinesis/springboot/Kinesis2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/kinesis/springboot/Kinesis2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, Kinesis2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,Kinesis2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-kinesis"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, Kinesis2ComponentConverter.class})
 public class Kinesis2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private Kinesis2ComponentConfiguration configuration;
+    private final Kinesis2ComponentConfiguration configuration;
 
     public Kinesis2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.kinesis.springboot.Kinesis2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-kms-starter/src/main/java/org/apache/camel/component/aws2/kms/springboot/KMS2ComponentAutoConfiguration.java b/components-starter/camel-aws2-kms-starter/src/main/java/org/apache/camel/component/aws2/kms/springboot/KMS2ComponentAutoConfiguration.java
index 095ed45188f..d8db9294e0e 100644
--- a/components-starter/camel-aws2-kms-starter/src/main/java/org/apache/camel/component/aws2/kms/springboot/KMS2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-kms-starter/src/main/java/org/apache/camel/component/aws2/kms/springboot/KMS2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, KMS2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,KMS2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-kms"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, KMS2ComponentConverter.class})
 public class KMS2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private KMS2ComponentConfiguration configuration;
+    private final KMS2ComponentConfiguration configuration;
 
     public KMS2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.kms.springboot.KMS2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-lambda-starter/src/main/java/org/apache/camel/component/aws2/lambda/springboot/Lambda2ComponentAutoConfiguration.java b/components-starter/camel-aws2-lambda-starter/src/main/java/org/apache/camel/component/aws2/lambda/springboot/Lambda2ComponentAutoConfiguration.java
index a09b1b97335..3d220c2bae6 100644
--- a/components-starter/camel-aws2-lambda-starter/src/main/java/org/apache/camel/component/aws2/lambda/springboot/Lambda2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-lambda-starter/src/main/java/org/apache/camel/component/aws2/lambda/springboot/Lambda2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, Lambda2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,Lambda2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-lambda"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, Lambda2ComponentConverter.class})
 public class Lambda2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private Lambda2ComponentConfiguration configuration;
+    private final Lambda2ComponentConfiguration configuration;
 
     public Lambda2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.lambda.springboot.Lambda2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-mq-starter/src/main/java/org/apache/camel/component/aws2/mq/springboot/MQ2ComponentAutoConfiguration.java b/components-starter/camel-aws2-mq-starter/src/main/java/org/apache/camel/component/aws2/mq/springboot/MQ2ComponentAutoConfiguration.java
index 01b73e0be19..289ac30e65c 100644
--- a/components-starter/camel-aws2-mq-starter/src/main/java/org/apache/camel/component/aws2/mq/springboot/MQ2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-mq-starter/src/main/java/org/apache/camel/component/aws2/mq/springboot/MQ2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, MQ2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,MQ2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-mq"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, MQ2ComponentConverter.class})
 public class MQ2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private MQ2ComponentConfiguration configuration;
+    private final MQ2ComponentConfiguration configuration;
 
     public MQ2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.mq.springboot.MQ2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-msk-starter/src/main/java/org/apache/camel/component/aws2/msk/springboot/MSK2ComponentAutoConfiguration.java b/components-starter/camel-aws2-msk-starter/src/main/java/org/apache/camel/component/aws2/msk/springboot/MSK2ComponentAutoConfiguration.java
index a93bbc7a62f..74448b79ac3 100644
--- a/components-starter/camel-aws2-msk-starter/src/main/java/org/apache/camel/component/aws2/msk/springboot/MSK2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-msk-starter/src/main/java/org/apache/camel/component/aws2/msk/springboot/MSK2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, MSK2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,MSK2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-msk"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, MSK2ComponentConverter.class})
 public class MSK2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private MSK2ComponentConfiguration configuration;
+    private final MSK2ComponentConfiguration configuration;
 
     public MSK2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.msk.springboot.MSK2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-polly-starter/src/main/java/org/apache/camel/component/aws2/polly/springboot/Polly2ComponentAutoConfiguration.java b/components-starter/camel-aws2-polly-starter/src/main/java/org/apache/camel/component/aws2/polly/springboot/Polly2ComponentAutoConfiguration.java
index 016e7dafa42..54306ca5fca 100644
--- a/components-starter/camel-aws2-polly-starter/src/main/java/org/apache/camel/component/aws2/polly/springboot/Polly2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-polly-starter/src/main/java/org/apache/camel/component/aws2/polly/springboot/Polly2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, Polly2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,Polly2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-polly"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, Polly2ComponentConverter.class})
 public class Polly2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private Polly2ComponentConfiguration configuration;
+    private final Polly2ComponentConfiguration configuration;
 
     public Polly2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.polly.springboot.Polly2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-redshift-starter/src/main/java/org/apache/camel/component/aws2/redshift/data/springboot/RedshiftData2ComponentAutoConfiguration.java b/components-starter/camel-aws2-redshift-starter/src/main/java/org/apache/camel/component/aws2/redshift/data/springboot/RedshiftData2ComponentAutoConfiguration.java
index 2be298bd012..335f34b4242 100644
--- a/components-starter/camel-aws2-redshift-starter/src/main/java/org/apache/camel/component/aws2/redshift/data/springboot/RedshiftData2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-redshift-starter/src/main/java/org/apache/camel/component/aws2/redshift/data/springboot/RedshiftData2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, RedshiftData2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,RedshiftData2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-redshift-data"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, RedshiftData2ComponentConverter.class})
 public class RedshiftData2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private RedshiftData2ComponentConfiguration configuration;
+    private final RedshiftData2ComponentConfiguration configuration;
 
     public RedshiftData2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.redshift.data.springboot.RedshiftData2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-rekognition-starter/src/main/java/org/apache/camel/component/aws2/rekognition/springboot/Rekognition2ComponentAutoConfiguration.java b/components-starter/camel-aws2-rekognition-starter/src/main/java/org/apache/camel/component/aws2/rekognition/springboot/Rekognition2ComponentAutoConfiguration.java
index a1bde1cc818..005946cdf9c 100644
--- a/components-starter/camel-aws2-rekognition-starter/src/main/java/org/apache/camel/component/aws2/rekognition/springboot/Rekognition2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-rekognition-starter/src/main/java/org/apache/camel/component/aws2/rekognition/springboot/Rekognition2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, Rekognition2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,Rekognition2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-rekognition"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, Rekognition2ComponentConverter.class})
 public class Rekognition2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private Rekognition2ComponentConfiguration configuration;
+    private final Rekognition2ComponentConfiguration configuration;
 
     public Rekognition2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.rekognition.springboot.Rekognition2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentAutoConfiguration.java b/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentAutoConfiguration.java
index b81b00a616f..68e3ea1810f 100644
--- a/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, AWS2S3ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,AWS2S3ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-s3"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, AWS2S3ComponentConverter.class})
 public class AWS2S3ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private AWS2S3ComponentConfiguration configuration;
+    private final AWS2S3ComponentConfiguration configuration;
 
     public AWS2S3ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.s3.springboot.AWS2S3ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-s3-vectors-starter/src/main/java/org/apache/camel/component/aws2/s3vectors/springboot/AWS2S3VectorsComponentAutoConfiguration.java b/components-starter/camel-aws2-s3-vectors-starter/src/main/java/org/apache/camel/component/aws2/s3vectors/springboot/AWS2S3VectorsComponentAutoConfiguration.java
index a1524b12ecd..bfb637c57a0 100644
--- a/components-starter/camel-aws2-s3-vectors-starter/src/main/java/org/apache/camel/component/aws2/s3vectors/springboot/AWS2S3VectorsComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-s3-vectors-starter/src/main/java/org/apache/camel/component/aws2/s3vectors/springboot/AWS2S3VectorsComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, AWS2S3VectorsComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,AWS2S3VectorsComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-s3-vectors"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, AWS2S3VectorsComponentConverter.class})
 public class AWS2S3VectorsComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private AWS2S3VectorsComponentConfiguration configuration;
+    private final AWS2S3VectorsComponentConfiguration configuration;
 
     public AWS2S3VectorsComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.s3vectors.springboot.AWS2S3VectorsComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-ses-starter/src/main/java/org/apache/camel/component/aws2/ses/springboot/Ses2ComponentAutoConfiguration.java b/components-starter/camel-aws2-ses-starter/src/main/java/org/apache/camel/component/aws2/ses/springboot/Ses2ComponentAutoConfiguration.java
index ba919970b60..e1dc6900c5f 100644
--- a/components-starter/camel-aws2-ses-starter/src/main/java/org/apache/camel/component/aws2/ses/springboot/Ses2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-ses-starter/src/main/java/org/apache/camel/component/aws2/ses/springboot/Ses2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, Ses2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,Ses2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-ses"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, Ses2ComponentConverter.class})
 public class Ses2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private Ses2ComponentConfiguration configuration;
+    private final Ses2ComponentConfiguration configuration;
 
     public Ses2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.ses.springboot.Ses2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-sns-starter/src/main/java/org/apache/camel/component/aws2/sns/springboot/Sns2ComponentAutoConfiguration.java b/components-starter/camel-aws2-sns-starter/src/main/java/org/apache/camel/component/aws2/sns/springboot/Sns2ComponentAutoConfiguration.java
index 400c5fabc76..6ac52be5b04 100644
--- a/components-starter/camel-aws2-sns-starter/src/main/java/org/apache/camel/component/aws2/sns/springboot/Sns2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-sns-starter/src/main/java/org/apache/camel/component/aws2/sns/springboot/Sns2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, Sns2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,Sns2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-sns"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, Sns2ComponentConverter.class})
 public class Sns2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private Sns2ComponentConfiguration configuration;
+    private final Sns2ComponentConfiguration configuration;
 
     public Sns2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.sns.springboot.Sns2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentAutoConfiguration.java b/components-starter/camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentAutoConfiguration.java
index 05bdcb500e4..759aac4ac63 100644
--- a/components-starter/camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, Sqs2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,Sqs2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-sqs"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, Sqs2ComponentConverter.class})
 public class Sqs2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private Sqs2ComponentConfiguration configuration;
+    private final Sqs2ComponentConfiguration configuration;
 
     public Sqs2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.sqs.springboot.Sqs2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-step-functions-starter/src/main/java/org/apache/camel/component/aws2/stepfunctions/springboot/StepFunctions2ComponentAutoConfiguration.java b/components-starter/camel-aws2-step-functions-starter/src/main/java/org/apache/camel/component/aws2/stepfunctions/springboot/StepFunctions2ComponentAutoConfiguration.java
index 76927718874..7cf23072c9e 100644
--- a/components-starter/camel-aws2-step-functions-starter/src/main/java/org/apache/camel/component/aws2/stepfunctions/springboot/StepFunctions2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-step-functions-starter/src/main/java/org/apache/camel/component/aws2/stepfunctions/springboot/StepFunctions2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, StepFunctions2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,StepFunctions2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-step-functions"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, StepFunctions2ComponentConverter.class})
 public class StepFunctions2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private StepFunctions2ComponentConfiguration configuration;
+    private final StepFunctions2ComponentConfiguration configuration;
 
     public StepFunctions2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.stepfunctions.springboot.StepFunctions2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-sts-starter/src/main/java/org/apache/camel/component/aws2/sts/springboot/STS2ComponentAutoConfiguration.java b/components-starter/camel-aws2-sts-starter/src/main/java/org/apache/camel/component/aws2/sts/springboot/STS2ComponentAutoConfiguration.java
index 2466b1bac84..4dace2ab598 100644
--- a/components-starter/camel-aws2-sts-starter/src/main/java/org/apache/camel/component/aws2/sts/springboot/STS2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-sts-starter/src/main/java/org/apache/camel/component/aws2/sts/springboot/STS2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, STS2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,STS2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-sts"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, STS2ComponentConverter.class})
 public class STS2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private STS2ComponentConfiguration configuration;
+    private final STS2ComponentConfiguration configuration;
 
     public STS2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.sts.springboot.STS2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-textract-starter/src/main/java/org/apache/camel/component/aws2/textract/springboot/Textract2ComponentAutoConfiguration.java b/components-starter/camel-aws2-textract-starter/src/main/java/org/apache/camel/component/aws2/textract/springboot/Textract2ComponentAutoConfiguration.java
index fc4311363b4..dc33691c0c1 100644
--- a/components-starter/camel-aws2-textract-starter/src/main/java/org/apache/camel/component/aws2/textract/springboot/Textract2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-textract-starter/src/main/java/org/apache/camel/component/aws2/textract/springboot/Textract2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, Textract2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,Textract2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-textract"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, Textract2ComponentConverter.class})
 public class Textract2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private Textract2ComponentConfiguration configuration;
+    private final Textract2ComponentConfiguration configuration;
 
     public Textract2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.textract.springboot.Textract2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-timestream-starter/src/main/java/org/apache/camel/component/aws2/timestream/springboot/Timestream2ComponentAutoConfiguration.java b/components-starter/camel-aws2-timestream-starter/src/main/java/org/apache/camel/component/aws2/timestream/springboot/Timestream2ComponentAutoConfiguration.java
index 101ab2d6070..2e1aaafcfec 100644
--- a/components-starter/camel-aws2-timestream-starter/src/main/java/org/apache/camel/component/aws2/timestream/springboot/Timestream2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-timestream-starter/src/main/java/org/apache/camel/component/aws2/timestream/springboot/Timestream2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, Timestream2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,Timestream2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-timestream"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, Timestream2ComponentConverter.class})
 public class Timestream2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private Timestream2ComponentConfiguration configuration;
+    private final Timestream2ComponentConfiguration configuration;
 
     public Timestream2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.timestream.springboot.Timestream2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-transcribe-starter/src/main/java/org/apache/camel/component/aws2/transcribe/springboot/Transcribe2ComponentAutoConfiguration.java b/components-starter/camel-aws2-transcribe-starter/src/main/java/org/apache/camel/component/aws2/transcribe/springboot/Transcribe2ComponentAutoConfiguration.java
index f254abfd689..2b722543004 100644
--- a/components-starter/camel-aws2-transcribe-starter/src/main/java/org/apache/camel/component/aws2/transcribe/springboot/Transcribe2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-transcribe-starter/src/main/java/org/apache/camel/component/aws2/transcribe/springboot/Transcribe2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, Transcribe2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,Transcribe2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-transcribe"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, Transcribe2ComponentConverter.class})
 public class Transcribe2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private Transcribe2ComponentConfiguration configuration;
+    private final Transcribe2ComponentConfiguration configuration;
 
     public Transcribe2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.transcribe.springboot.Transcribe2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-aws2-translate-starter/src/main/java/org/apache/camel/component/aws2/translate/springboot/Translate2ComponentAutoConfiguration.java b/components-starter/camel-aws2-translate-starter/src/main/java/org/apache/camel/component/aws2/translate/springboot/Translate2ComponentAutoConfiguration.java
index f275731056c..953f5576c2e 100644
--- a/components-starter/camel-aws2-translate-starter/src/main/java/org/apache/camel/component/aws2/translate/springboot/Translate2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-translate-starter/src/main/java/org/apache/camel/component/aws2/translate/springboot/Translate2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, Translate2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,Translate2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-translate"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, Translate2ComponentConverter.class})
 public class Translate2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private Translate2ComponentConfiguration configuration;
+    private final Translate2ComponentConfiguration configuration;
 
     public Translate2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.aws2.translate.springboot.Translate2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-azure-cosmosdb-starter/src/main/java/org/apache/camel/component/azure/cosmosdb/springboot/CosmosDbComponentAutoConfiguration.java b/components-starter/camel-azure-cosmosdb-starter/src/main/java/org/apache/camel/component/azure/cosmosdb/springboot/CosmosDbComponentAutoConfiguration.java
index 12de1db048e..066ebc13780 100644
--- a/components-starter/camel-azure-cosmosdb-starter/src/main/java/org/apache/camel/component/azure/cosmosdb/springboot/CosmosDbComponentAutoConfiguration.java
+++ b/components-starter/camel-azure-cosmosdb-starter/src/main/java/org/apache/camel/component/azure/cosmosdb/springboot/CosmosDbComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, CosmosDbComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,CosmosDbComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.azure-cosmosdb"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, CosmosDbComponentConverter.class})
 public class CosmosDbComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private CosmosDbComponentConfiguration configuration;
+    private final CosmosDbComponentConfiguration configuration;
 
     public CosmosDbComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.azure.cosmosdb.springboot.CosmosDbComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-azure-eventgrid-starter/src/main/java/org/apache/camel/component/azure/eventgrid/springboot/EventGridComponentAutoConfiguration.java b/components-starter/camel-azure-eventgrid-starter/src/main/java/org/apache/camel/component/azure/eventgrid/springboot/EventGridComponentAutoConfiguration.java
index e81c0550b19..22a9fe16d5a 100644
--- a/components-starter/camel-azure-eventgrid-starter/src/main/java/org/apache/camel/component/azure/eventgrid/springboot/EventGridComponentAutoConfiguration.java
+++ b/components-starter/camel-azure-eventgrid-starter/src/main/java/org/apache/camel/component/azure/eventgrid/springboot/EventGridComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, EventGridComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,EventGridComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.azure-eventgrid"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, EventGridComponentConverter.class})
 public class EventGridComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private EventGridComponentConfiguration configuration;
+    private final EventGridComponentConfiguration configuration;
 
     public EventGridComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.azure.eventgrid.springboot.EventGridComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-azure-eventhubs-starter/src/main/java/org/apache/camel/component/azure/eventhubs/springboot/EventHubsComponentAutoConfiguration.java b/components-starter/camel-azure-eventhubs-starter/src/main/java/org/apache/camel/component/azure/eventhubs/springboot/EventHubsComponentAutoConfiguration.java
index 0854a31656c..671eeae73e2 100644
--- a/components-starter/camel-azure-eventhubs-starter/src/main/java/org/apache/camel/component/azure/eventhubs/springboot/EventHubsComponentAutoConfiguration.java
+++ b/components-starter/camel-azure-eventhubs-starter/src/main/java/org/apache/camel/component/azure/eventhubs/springboot/EventHubsComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, EventHubsComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,EventHubsComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.azure-eventhubs"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, EventHubsComponentConverter.class})
 public class EventHubsComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private EventHubsComponentConfiguration configuration;
+    private final EventHubsComponentConfiguration configuration;
 
     public EventHubsComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.azure.eventhubs.springboot.EventHubsComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-azure-files-starter/src/main/java/org/apache/camel/component/file/azure/springboot/FilesComponentAutoConfiguration.java b/components-starter/camel-azure-files-starter/src/main/java/org/apache/camel/component/file/azure/springboot/FilesComponentAutoConfiguration.java
index c7bbc44b3dc..a999e0d42c5 100644
--- a/components-starter/camel-azure-files-starter/src/main/java/org/apache/camel/component/file/azure/springboot/FilesComponentAutoConfiguration.java
+++ b/components-starter/camel-azure-files-starter/src/main/java/org/apache/camel/component/file/azure/springboot/FilesComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,FilesComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.azure-files"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class FilesComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private FilesComponentConfiguration configuration;
+    private final FilesComponentConfiguration configuration;
 
     public FilesComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.file.azure.springboot.FilesComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-azure-functions-starter/src/main/java/org/apache/camel/component/azure/functions/springboot/FunctionsComponentAutoConfiguration.java b/components-starter/camel-azure-functions-starter/src/main/java/org/apache/camel/component/azure/functions/springboot/FunctionsComponentAutoConfiguration.java
index 16c9cfc70b2..e44fde18614 100644
--- a/components-starter/camel-azure-functions-starter/src/main/java/org/apache/camel/component/azure/functions/springboot/FunctionsComponentAutoConfiguration.java
+++ b/components-starter/camel-azure-functions-starter/src/main/java/org/apache/camel/component/azure/functions/springboot/FunctionsComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, FunctionsComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,FunctionsComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.azure-functions"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, FunctionsComponentConverter.class})
 public class FunctionsComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private FunctionsComponentConfiguration configuration;
+    private final FunctionsComponentConfiguration configuration;
 
     public FunctionsComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.azure.functions.springboot.FunctionsComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-azure-key-vault-starter/src/main/java/org/apache/camel/component/azure/key/vault/springboot/KeyVaultComponentAutoConfiguration.java b/components-starter/camel-azure-key-vault-starter/src/main/java/org/apache/camel/component/azure/key/vault/springboot/KeyVaultComponentAutoConfiguration.java
index 5f66a8d87af..f152fd9bee1 100644
--- a/components-starter/camel-azure-key-vault-starter/src/main/java/org/apache/camel/component/azure/key/vault/springboot/KeyVaultComponentAutoConfiguration.java
+++ b/components-starter/camel-azure-key-vault-starter/src/main/java/org/apache/camel/component/azure/key/vault/springboot/KeyVaultComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,KeyVaultComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.azure-key-vault"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class KeyVaultComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private KeyVaultComponentConfiguration configuration;
+    private final KeyVaultComponentConfiguration configuration;
 
     public KeyVaultComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.azure.key.vault.springboot.KeyVaultComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-azure-servicebus-starter/src/main/java/org/apache/camel/component/azure/servicebus/springboot/ServiceBusComponentAutoConfiguration.java b/components-starter/camel-azure-servicebus-starter/src/main/java/org/apache/camel/component/azure/servicebus/springboot/ServiceBusComponentAutoConfiguration.java
index 3ef4654b3e0..cd970bcfa97 100644
--- a/components-starter/camel-azure-servicebus-starter/src/main/java/org/apache/camel/component/azure/servicebus/springboot/ServiceBusComponentAutoConfiguration.java
+++ b/components-starter/camel-azure-servicebus-starter/src/main/java/org/apache/camel/component/azure/servicebus/springboot/ServiceBusComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, ServiceBusComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,ServiceBusComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.azure-servicebus"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, ServiceBusComponentConverter.class})
 public class ServiceBusComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private ServiceBusComponentConfiguration configuration;
+    private final ServiceBusComponentConfiguration configuration;
 
     public ServiceBusComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.azure.servicebus.springboot.ServiceBusComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-azure-storage-blob-starter/src/main/java/org/apache/camel/component/azure/storage/blob/springboot/BlobComponentAutoConfiguration.java b/components-starter/camel-azure-storage-blob-starter/src/main/java/org/apache/camel/component/azure/storage/blob/springboot/BlobComponentAutoConfiguration.java
index 772a3860d30..170a6b07a54 100644
--- a/components-starter/camel-azure-storage-blob-starter/src/main/java/org/apache/camel/component/azure/storage/blob/springboot/BlobComponentAutoConfiguration.java
+++ b/components-starter/camel-azure-storage-blob-starter/src/main/java/org/apache/camel/component/azure/storage/blob/springboot/BlobComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, BlobComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,BlobComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.azure-storage-blob"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, BlobComponentConverter.class})
 public class BlobComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private BlobComponentConfiguration configuration;
+    private final BlobComponentConfiguration configuration;
 
     public BlobComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.azure.storage.blob.springboot.BlobComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-azure-storage-datalake-starter/src/main/java/org/apache/camel/component/azure/storage/datalake/springboot/DataLakeComponentAutoConfiguration.java b/components-starter/camel-azure-storage-datalake-starter/src/main/java/org/apache/camel/component/azure/storage/datalake/springboot/DataLakeComponentAutoConfiguration.java
index b324a45b408..ba01de1e5a6 100644
--- a/components-starter/camel-azure-storage-datalake-starter/src/main/java/org/apache/camel/component/azure/storage/datalake/springboot/DataLakeComponentAutoConfiguration.java
+++ b/components-starter/camel-azure-storage-datalake-starter/src/main/java/org/apache/camel/component/azure/storage/datalake/springboot/DataLakeComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, DataLakeComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DataLakeComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.azure-storage-datalake"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, DataLakeComponentConverter.class})
 public class DataLakeComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DataLakeComponentConfiguration configuration;
+    private final DataLakeComponentConfiguration configuration;
 
     public DataLakeComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.azure.storage.datalake.springboot.DataLakeComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-azure-storage-queue-starter/src/main/java/org/apache/camel/component/azure/storage/queue/springboot/QueueComponentAutoConfiguration.java b/components-starter/camel-azure-storage-queue-starter/src/main/java/org/apache/camel/component/azure/storage/queue/springboot/QueueComponentAutoConfiguration.java
index 110627c6630..a6ec51fc217 100644
--- a/components-starter/camel-azure-storage-queue-starter/src/main/java/org/apache/camel/component/azure/storage/queue/springboot/QueueComponentAutoConfiguration.java
+++ b/components-starter/camel-azure-storage-queue-starter/src/main/java/org/apache/camel/component/azure/storage/queue/springboot/QueueComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, QueueComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,QueueComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.azure-storage-queue"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, QueueComponentConverter.class})
 public class QueueComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private QueueComponentConfiguration configuration;
+    private final QueueComponentConfiguration configuration;
 
     public QueueComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.azure.storage.queue.springboot.QueueComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-barcode-starter/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatAutoConfiguration.java b/components-starter/camel-barcode-starter/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatAutoConfiguration.java
index 845f4ad6bd6..6307d38daee 100644
--- a/components-starter/camel-barcode-starter/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatAutoConfiguration.java
+++ b/components-starter/camel-barcode-starter/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,BarcodeDataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.barcode"})
 public class BarcodeDataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private BarcodeDataFormatConfiguration configuration;
+    private final BarcodeDataFormatConfiguration configuration;
 
     public BarcodeDataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.dataformat.barcode.springboot.BarcodeDataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-base64-starter/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatAutoConfiguration.java b/components-starter/camel-base64-starter/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatAutoConfiguration.java
index ec6963e2267..5020907da67 100644
--- a/components-starter/camel-base64-starter/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatAutoConfiguration.java
+++ b/components-starter/camel-base64-starter/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,Base64DataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.base64"})
 public class Base64DataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private Base64DataFormatConfiguration configuration;
+    private final Base64DataFormatConfiguration configuration;
 
     public Base64DataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.dataformat.base64.springboot.Base64DataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/bean/springboot/BeanComponentAutoConfiguration.java b/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/bean/springboot/BeanComponentAutoConfiguration.java
index 5859ee83279..d97a934a440 100644
--- a/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/bean/springboot/BeanComponentAutoConfiguration.java
+++ b/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/bean/springboot/BeanComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,BeanComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.bean"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class BeanComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private BeanComponentConfiguration configuration;
+    private final BeanComponentConfiguration configuration;
 
     public BeanComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.bean.springboot.BeanComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/beanclass/springboot/ClassComponentAutoConfiguration.java b/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/beanclass/springboot/ClassComponentAutoConfiguration.java
index bc4989024ef..37bb3f74629 100644
--- a/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/beanclass/springboot/ClassComponentAutoConfiguration.java
+++ b/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/beanclass/springboot/ClassComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,ClassComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.class"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class ClassComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private ClassComponentConfiguration configuration;
+    private final ClassComponentConfiguration configuration;
 
     public ClassComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.beanclass.springboot.ClassComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-bean-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageAutoConfiguration.java b/components-starter/camel-bean-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageAutoConfiguration.java
index 388e24f00b8..d5cc6f4be34 100644
--- a/components-starter/camel-bean-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageAutoConfiguration.java
+++ b/components-starter/camel-bean-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({LanguageConfigurationProperties.class,BeanLanguageConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.language", "camel.language.bean"})
 public class BeanLanguageAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private BeanLanguageConfiguration configuration;
+    private final BeanLanguageConfiguration configuration;
 
     public BeanLanguageAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.language.bean.springboot.BeanLanguageConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-bean-validator-starter/src/main/java/org/apache/camel/component/bean/validator/springboot/BeanValidatorComponentAutoConfiguration.java b/components-starter/camel-bean-validator-starter/src/main/java/org/apache/camel/component/bean/validator/springboot/BeanValidatorComponentAutoConfiguration.java
index 5bb9035675e..7d7bf550db3 100644
--- a/components-starter/camel-bean-validator-starter/src/main/java/org/apache/camel/component/bean/validator/springboot/BeanValidatorComponentAutoConfiguration.java
+++ b/components-starter/camel-bean-validator-starter/src/main/java/org/apache/camel/component/bean/validator/springboot/BeanValidatorComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, BeanValidatorComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,BeanValidatorComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.bean-validator"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, BeanValidatorComponentConverter.class})
 public class BeanValidatorComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private BeanValidatorComponentConfiguration configuration;
+    private final BeanValidatorComponentConfiguration configuration;
 
     public BeanValidatorComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.bean.validator.springboot.BeanValidatorComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-beanio-starter/src/main/java/org/apache/camel/dataformat/beanio/springboot/BeanIODataFormatAutoConfiguration.java b/components-starter/camel-beanio-starter/src/main/java/org/apache/camel/dataformat/beanio/springboot/BeanIODataFormatAutoConfiguration.java
index 0efd7282c4d..d2c94ca788c 100644
--- a/components-starter/camel-beanio-starter/src/main/java/org/apache/camel/dataformat/beanio/springboot/BeanIODataFormatAutoConfiguration.java
+++ b/components-starter/camel-beanio-starter/src/main/java/org/apache/camel/dataformat/beanio/springboot/BeanIODataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,BeanIODataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.beanio"})
 public class BeanIODataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private BeanIODataFormatConfiguration configuration;
+    private final BeanIODataFormatConfiguration configuration;
 
     public BeanIODataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.dataformat.beanio.springboot.BeanIODataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java b/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java
index ddb04978560..ca548041ae0 100644
--- a/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java
+++ b/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,BindyCsvDataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.bindy-csv"})
 public class BindyCsvDataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private BindyCsvDataFormatConfiguration configuration;
+    private final BindyCsvDataFormatConfiguration configuration;
 
     public BindyCsvDataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.dataformat.bindy.csv.springboot.BindyCsvDataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java b/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java
index 5210a500801..5811907d757 100644
--- a/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java
+++ b/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,BindyFixedLengthDataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.bindy-fixed"})
 public class BindyFixedLengthDataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private BindyFixedLengthDataFormatConfiguration configuration;
+    private final BindyFixedLengthDataFormatConfiguration configuration;
 
     public BindyFixedLengthDataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.dataformat.bindy.fixed.springboot.BindyFixedLengthDataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java b/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java
index 9bf1f4e5704..63393e0c05d 100644
--- a/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java
+++ b/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,BindyKeyValuePairDataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.bindy-kvp"})
 public class BindyKeyValuePairDataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private BindyKeyValuePairDataFormatConfiguration configuration;
+    private final BindyKeyValuePairDataFormatConfiguration configuration;
 
     public BindyKeyValuePairDataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.dataformat.bindy.kvp.springboot.BindyKeyValuePairDataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-bonita-starter/src/main/java/org/apache/camel/component/bonita/springboot/BonitaComponentAutoConfiguration.java b/components-starter/camel-bonita-starter/src/main/java/org/apache/camel/component/bonita/springboot/BonitaComponentAutoConfiguration.java
index 9751c57c400..8ea7e1edfcd 100644
--- a/components-starter/camel-bonita-starter/src/main/java/org/apache/camel/component/bonita/springboot/BonitaComponentAutoConfiguration.java
+++ b/components-starter/camel-bonita-starter/src/main/java/org/apache/camel/component/bonita/springboot/BonitaComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,BonitaComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.bonita"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class BonitaComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private BonitaComponentConfiguration configuration;
+    private final BonitaComponentConfiguration configuration;
 
     public BonitaComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.bonita.springboot.BonitaComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-box-starter/src/main/java/org/apache/camel/component/box/springboot/BoxComponentAutoConfiguration.java b/components-starter/camel-box-starter/src/main/java/org/apache/camel/component/box/springboot/BoxComponentAutoConfiguration.java
index 22b10868563..13a01336b9f 100644
--- a/components-starter/camel-box-starter/src/main/java/org/apache/camel/component/box/springboot/BoxComponentAutoConfiguration.java
+++ b/components-starter/camel-box-starter/src/main/java/org/apache/camel/component/box/springboot/BoxComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, BoxComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,BoxComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.box"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, BoxComponentConverter.class})
 public class BoxComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private BoxComponentConfiguration configuration;
+    private final BoxComponentConfiguration configuration;
 
     public BoxComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.box.springboot.BoxComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentAutoConfiguration.java b/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentAutoConfiguration.java
index 23f99473241..a85627e0633 100644
--- a/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentAutoConfiguration.java
+++ b/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, BraintreeComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,BraintreeComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.braintree"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, BraintreeComponentConverter.class})
 public class BraintreeComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private BraintreeComponentConfiguration configuration;
+    private final BraintreeComponentConfiguration configuration;
 
     public BraintreeComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.braintree.springboot.BraintreeComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-browse-starter/src/main/java/org/apache/camel/component/browse/springboot/BrowseComponentAutoConfiguration.java b/components-starter/camel-browse-starter/src/main/java/org/apache/camel/component/browse/springboot/BrowseComponentAutoConfiguration.java
index 8d7bfd6204e..48b0b43f2d2 100644
--- a/components-starter/camel-browse-starter/src/main/java/org/apache/camel/component/browse/springboot/BrowseComponentAutoConfiguration.java
+++ b/components-starter/camel-browse-starter/src/main/java/org/apache/camel/component/browse/springboot/BrowseComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,BrowseComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.browse"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class BrowseComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private BrowseComponentConfiguration configuration;
+    private final BrowseComponentConfiguration configuration;
 
     public BrowseComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.browse.springboot.BrowseComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentAutoConfiguration.java b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentAutoConfiguration.java
index d0acaea8392..06610f14582 100644
--- a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentAutoConfiguration.java
+++ b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, CaffeineCacheComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,CaffeineCacheComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.caffeine-cache"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, CaffeineCacheComponentConverter.class})
 public class CaffeineCacheComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private CaffeineCacheComponentConfiguration configuration;
+    private final CaffeineCacheComponentConfiguration configuration;
 
     public CaffeineCacheComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.caffeine.cache.springboot.CaffeineCacheComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentAutoConfiguration.java b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentAutoConfiguration.java
index 37275164454..54f97bf4de9 100644
--- a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentAutoConfiguration.java
+++ b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, CaffeineLoadCacheComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,CaffeineLoadCacheComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.caffeine-loadcache"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, CaffeineLoadCacheComponentConverter.class})
 public class CaffeineLoadCacheComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private CaffeineLoadCacheComponentConfiguration configuration;
+    private final CaffeineLoadCacheComponentConfiguration configuration;
 
     public CaffeineLoadCacheComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.caffeine.load.springboot.CaffeineLoadCacheComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-cassandraql-starter/src/main/java/org/apache/camel/component/cassandra/springboot/CassandraComponentAutoConfiguration.java b/components-starter/camel-cassandraql-starter/src/main/java/org/apache/camel/component/cassandra/springboot/CassandraComponentAutoConfiguration.java
index b00fbabc33b..1dd693b4603 100644
--- a/components-starter/camel-cassandraql-starter/src/main/java/org/apache/camel/component/cassandra/springboot/CassandraComponentAutoConfiguration.java
+++ b/components-starter/camel-cassandraql-starter/src/main/java/org/apache/camel/component/cassandra/springboot/CassandraComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,CassandraComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.cql"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class CassandraComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private CassandraComponentConfiguration configuration;
+    private final CassandraComponentConfiguration configuration;
 
     public CassandraComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.cassandra.springboot.CassandraComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-cbor-starter/src/main/java/org/apache/camel/component/cbor/springboot/CBORDataFormatAutoConfiguration.java b/components-starter/camel-cbor-starter/src/main/java/org/apache/camel/component/cbor/springboot/CBORDataFormatAutoConfiguration.java
index 3b92bff0deb..38481831bcb 100644
--- a/components-starter/camel-cbor-starter/src/main/java/org/apache/camel/component/cbor/springboot/CBORDataFormatAutoConfiguration.java
+++ b/components-starter/camel-cbor-starter/src/main/java/org/apache/camel/component/cbor/springboot/CBORDataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,CBORDataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.cbor"})
 public class CBORDataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private CBORDataFormatConfiguration configuration;
+    private final CBORDataFormatConfiguration configuration;
 
     public CBORDataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.cbor.springboot.CBORDataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-chatscript-starter/src/main/java/org/apache/camel/component/chatscript/springboot/ChatScriptComponentAutoConfiguration.java b/components-starter/camel-chatscript-starter/src/main/java/org/apache/camel/component/chatscript/springboot/ChatScriptComponentAutoConfiguration.java
index ed533b90fb8..9b9c03e0e89 100644
--- a/components-starter/camel-chatscript-starter/src/main/java/org/apache/camel/component/chatscript/springboot/ChatScriptComponentAutoConfiguration.java
+++ b/components-starter/camel-chatscript-starter/src/main/java/org/apache/camel/component/chatscript/springboot/ChatScriptComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,ChatScriptComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.chatscript"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class ChatScriptComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private ChatScriptComponentConfiguration configuration;
+    private final ChatScriptComponentConfiguration configuration;
 
     public ChatScriptComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.chatscript.springboot.ChatScriptComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-chunk-starter/src/main/java/org/apache/camel/component/chunk/springboot/ChunkComponentAutoConfiguration.java b/components-starter/camel-chunk-starter/src/main/java/org/apache/camel/component/chunk/springboot/ChunkComponentAutoConfiguration.java
index 1bc31f70241..b1b082a7777 100644
--- a/components-starter/camel-chunk-starter/src/main/java/org/apache/camel/component/chunk/springboot/ChunkComponentAutoConfiguration.java
+++ b/components-starter/camel-chunk-starter/src/main/java/org/apache/camel/component/chunk/springboot/ChunkComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,ChunkComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.chunk"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class ChunkComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private ChunkComponentConfiguration configuration;
+    private final ChunkComponentConfiguration configuration;
 
     public ChunkComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.chunk.springboot.ChunkComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-clickup-starter/src/main/java/org/apache/camel/component/clickup/springboot/ClickUpComponentAutoConfiguration.java b/components-starter/camel-clickup-starter/src/main/java/org/apache/camel/component/clickup/springboot/ClickUpComponentAutoConfiguration.java
index deaae8f9bad..95d2184a8d6 100644
--- a/components-starter/camel-clickup-starter/src/main/java/org/apache/camel/component/clickup/springboot/ClickUpComponentAutoConfiguration.java
+++ b/components-starter/camel-clickup-starter/src/main/java/org/apache/camel/component/clickup/springboot/ClickUpComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,ClickUpComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.clickup"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class ClickUpComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private ClickUpComponentConfiguration configuration;
+    private final ClickUpComponentConfiguration configuration;
 
     public ClickUpComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.clickup.springboot.ClickUpComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-cm-sms-starter/src/main/java/org/apache/camel/component/cm/springboot/CMComponentAutoConfiguration.java b/components-starter/camel-cm-sms-starter/src/main/java/org/apache/camel/component/cm/springboot/CMComponentAutoConfiguration.java
index c168a20b1bf..1cdf0ea0d77 100644
--- a/components-starter/camel-cm-sms-starter/src/main/java/org/apache/camel/component/cm/springboot/CMComponentAutoConfiguration.java
+++ b/components-starter/camel-cm-sms-starter/src/main/java/org/apache/camel/component/cm/springboot/CMComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,CMComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.cm-sms"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class CMComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private CMComponentConfiguration configuration;
+    private final CMComponentConfiguration configuration;
 
     public CMComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.cm.springboot.CMComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-coap-starter/src/main/java/org/apache/camel/coap/springboot/CoAPComponentAutoConfiguration.java b/components-starter/camel-coap-starter/src/main/java/org/apache/camel/coap/springboot/CoAPComponentAutoConfiguration.java
index 0c1803a7de7..5a9bafb2951 100644
--- a/components-starter/camel-coap-starter/src/main/java/org/apache/camel/coap/springboot/CoAPComponentAutoConfiguration.java
+++ b/components-starter/camel-coap-starter/src/main/java/org/apache/camel/coap/springboot/CoAPComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, CoAPComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,CoAPComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.coap"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, CoAPComponentConverter.class})
 public class CoAPComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private CoAPComponentConfiguration configuration;
+    private final CoAPComponentConfiguration configuration;
 
     public CoAPComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.coap.springboot.CoAPComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-cometd-starter/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java b/components-starter/camel-cometd-starter/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
index bd1ff83fb08..2575d22e91e 100644
--- a/components-starter/camel-cometd-starter/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
+++ b/components-starter/camel-cometd-starter/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, CometdComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,CometdComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.cometd"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, CometdComponentConverter.class})
 public class CometdComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private CometdComponentConfiguration configuration;
+    private final CometdComponentConfiguration configuration;
 
     public CometdComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.cometd.springboot.CometdComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentAutoConfiguration.java b/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentAutoConfiguration.java
index 5c205407b07..77d44ce9fbe 100644
--- a/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentAutoConfiguration.java
+++ b/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, ConsulComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,ConsulComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.consul"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, ConsulComponentConverter.class})
 public class ConsulComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private ConsulComponentConfiguration configuration;
+    private final ConsulComponentConfiguration configuration;
 
     public ConsulComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.consul.springboot.ConsulComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-controlbus-starter/src/main/java/org/apache/camel/component/controlbus/springboot/ControlBusComponentAutoConfiguration.java b/components-starter/camel-controlbus-starter/src/main/java/org/apache/camel/component/controlbus/springboot/ControlBusComponentAutoConfiguration.java
index 0a4776bd05f..690c2e85d99 100644
--- a/components-starter/camel-controlbus-starter/src/main/java/org/apache/camel/component/controlbus/springboot/ControlBusComponentAutoConfiguration.java
+++ b/components-starter/camel-controlbus-starter/src/main/java/org/apache/camel/component/controlbus/springboot/ControlBusComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,ControlBusComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.controlbus"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class ControlBusComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private ControlBusComponentConfiguration configuration;
+    private final ControlBusComponentConfiguration configuration;
 
     public ControlBusComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.controlbus.springboot.ControlBusComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/constant/springboot/ConstantLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/constant/springboot/ConstantLanguageAutoConfiguration.java
index 37dbcfd17ae..4406dd9c24d 100644
--- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/constant/springboot/ConstantLanguageAutoConfiguration.java
+++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/constant/springboot/ConstantLanguageAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({LanguageConfigurationProperties.class,ConstantLanguageConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.language", "camel.language.constant"})
 public class ConstantLanguageAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private ConstantLanguageConfiguration configuration;
+    private final ConstantLanguageConfiguration configuration;
 
     public ConstantLanguageAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.language.constant.springboot.ConstantLanguageConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/csimple/springboot/CSimpleLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/csimple/springboot/CSimpleLanguageAutoConfiguration.java
index 0697be1dd0c..b5053563160 100644
--- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/csimple/springboot/CSimpleLanguageAutoConfiguration.java
+++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/csimple/springboot/CSimpleLanguageAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({LanguageConfigurationProperties.class,CSimpleLanguageConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.language", "camel.language.csimple"})
 public class CSimpleLanguageAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private CSimpleLanguageConfiguration configuration;
+    private final CSimpleLanguageConfiguration configuration;
 
     public CSimpleLanguageAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.language.csimple.springboot.CSimpleLanguageConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/header/springboot/HeaderLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/header/springboot/HeaderLanguageAutoConfiguration.java
index 0c807bd374d..6481c71c3f4 100644
--- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/header/springboot/HeaderLanguageAutoConfiguration.java
+++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/header/springboot/HeaderLanguageAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({LanguageConfigurationProperties.class,HeaderLanguageConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.language", "camel.language.header"})
 public class HeaderLanguageAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private HeaderLanguageConfiguration configuration;
+    private final HeaderLanguageConfiguration configuration;
 
     public HeaderLanguageAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.language.header.springboot.HeaderLanguageConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/property/springboot/ExchangePropertyLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/property/springboot/ExchangePropertyLanguageAutoConfiguration.java
index 3f43019500d..8f21024153c 100644
--- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/property/springboot/ExchangePropertyLanguageAutoConfiguration.java
+++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/property/springboot/ExchangePropertyLanguageAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({LanguageConfigurationProperties.class,ExchangePropertyLanguageConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.language", "camel.language.exchange-property"})
 public class ExchangePropertyLanguageAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private ExchangePropertyLanguageConfiguration configuration;
+    private final ExchangePropertyLanguageConfiguration configuration;
 
     public ExchangePropertyLanguageAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.language.property.springboot.ExchangePropertyLanguageConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/ref/springboot/RefLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/ref/springboot/RefLanguageAutoConfiguration.java
index f6e532eeb82..9707099ac55 100644
--- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/ref/springboot/RefLanguageAutoConfiguration.java
+++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/ref/springboot/RefLanguageAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({LanguageConfigurationProperties.class,RefLanguageConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.language", "camel.language.ref"})
 public class RefLanguageAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private RefLanguageConfiguration configuration;
+    private final RefLanguageConfiguration configuration;
 
     public RefLanguageAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.language.ref.springboot.RefLanguageConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/FileLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/FileLanguageAutoConfiguration.java
index dae04bf522f..6ee6faa5623 100644
--- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/FileLanguageAutoConfiguration.java
+++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/FileLanguageAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({LanguageConfigurationProperties.class,FileLanguageConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.language", "camel.language.file"})
 public class FileLanguageAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private FileLanguageConfiguration configuration;
+    private final FileLanguageConfiguration configuration;
 
     public FileLanguageAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.language.simple.springboot.FileLanguageConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java
index 99f57362b8b..0bd9ca2e89c 100644
--- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java
+++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({LanguageConfigurationProperties.class,SimpleLanguageConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.language", "camel.language.simple"})
 public class SimpleLanguageAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private SimpleLanguageConfiguration configuration;
+    private final SimpleLanguageConfiguration configuration;
 
     public SimpleLanguageAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.language.simple.springboot.SimpleLanguageConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java
index 6e384a71694..29ddd8f0d88 100644
--- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java
+++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({LanguageConfigurationProperties.class,TokenizeLanguageConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.language", "camel.language.tokenize"})
 public class TokenizeLanguageAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private TokenizeLanguageConfiguration configuration;
+    private final TokenizeLanguageConfiguration configuration;
 
     public TokenizeLanguageAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.language.tokenizer.springboot.TokenizeLanguageConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/variable/springboot/VariableLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/variable/springboot/VariableLanguageAutoConfiguration.java
index f10d6855aaa..f599573b11b 100644
--- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/variable/springboot/VariableLanguageAutoConfiguration.java
+++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/variable/springboot/VariableLanguageAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({LanguageConfigurationProperties.class,VariableLanguageConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.language", "camel.language.variable"})
 public class VariableLanguageAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private VariableLanguageConfiguration configuration;
+    private final VariableLanguageConfiguration configuration;
 
     public VariableLanguageAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.language.variable.springboot.VariableLanguageConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/rest/springboot/RestConfigurationDefinitionAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/rest/springboot/RestConfigurationDefinitionAutoConfiguration.java
index 0f652b0ecb3..b976e101e1f 100644
--- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/rest/springboot/RestConfigurationDefinitionAutoConfiguration.java
+++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/rest/springboot/RestConfigurationDefinitionAutoConfiguration.java
@@ -23,31 +23,33 @@ import org.apache.camel.spi.RestConfiguration;
 import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.support.PluginHelper;
 import org.apache.camel.util.CollectionHelper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(afterName = "org.apache.camel.spring.boot.CamelAutoConfiguration")
 @ConditionalOnBean(type = "org.apache.camel.spring.boot.CamelAutoConfiguration")
 @ConditionalOnProperty(name = "camel.rest.enabled", matchIfMissing = true)
-@AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration")
 @EnableConfigurationProperties(RestConfigurationDefinitionProperties.class)
 public class RestConfigurationDefinitionAutoConfiguration {
 
-    @Autowired
-    private CamelContext camelContext;
-    @Autowired
-    private RestConfigurationDefinitionProperties config;
+    private final CamelContext camelContext;
+    private final RestConfigurationDefinitionProperties config;
+
+    public RestConfigurationDefinitionAutoConfiguration(
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.model.rest.springboot.RestConfigurationDefinitionProperties config) {
+        this.camelContext = camelContext;
+        this.config = config;
+    }
 
     @Lazy
     @Bean(name = "rest-configuration")
diff --git a/components-starter/camel-couchbase-starter/src/main/java/org/apache/camel/component/couchbase/springboot/CouchbaseComponentAutoConfiguration.java b/components-starter/camel-couchbase-starter/src/main/java/org/apache/camel/component/couchbase/springboot/CouchbaseComponentAutoConfiguration.java
index ca910ca8b4e..75c2fc821a0 100644
--- a/components-starter/camel-couchbase-starter/src/main/java/org/apache/camel/component/couchbase/springboot/CouchbaseComponentAutoConfiguration.java
+++ b/components-starter/camel-couchbase-starter/src/main/java/org/apache/camel/component/couchbase/springboot/CouchbaseComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,CouchbaseComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.couchbase"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class CouchbaseComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private CouchbaseComponentConfiguration configuration;
+    private final CouchbaseComponentConfiguration configuration;
 
     public CouchbaseComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.couchbase.springboot.CouchbaseComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-couchdb-starter/src/main/java/org/apache/camel/component/couchdb/springboot/CouchDbComponentAutoConfiguration.java b/components-starter/camel-couchdb-starter/src/main/java/org/apache/camel/component/couchdb/springboot/CouchDbComponentAutoConfiguration.java
index 98e48ffdad3..e347ddb71af 100644
--- a/components-starter/camel-couchdb-starter/src/main/java/org/apache/camel/component/couchdb/springboot/CouchDbComponentAutoConfiguration.java
+++ b/components-starter/camel-couchdb-starter/src/main/java/org/apache/camel/component/couchdb/springboot/CouchDbComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,CouchDbComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.couchdb"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class CouchDbComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private CouchDbComponentConfiguration configuration;
+    private final CouchDbComponentConfiguration configuration;
 
     public CouchDbComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.couchdb.springboot.CouchDbComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-cron-starter/src/main/java/org/apache/camel/component/cron/springboot/CronComponentAutoConfiguration.java b/components-starter/camel-cron-starter/src/main/java/org/apache/camel/component/cron/springboot/CronComponentAutoConfiguration.java
index 0095673fbf5..a49e8d16c70 100644
--- a/components-starter/camel-cron-starter/src/main/java/org/apache/camel/component/cron/springboot/CronComponentAutoConfiguration.java
+++ b/components-starter/camel-cron-starter/src/main/java/org/apache/camel/component/cron/springboot/CronComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,CronComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.cron"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class CronComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private CronComponentConfiguration configuration;
+    private final CronComponentConfiguration configuration;
 
     public CronComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.cron.springboot.CronComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-crypto-pgp-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java b/components-starter/camel-crypto-pgp-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java
index cdb5896842b..429048a0a4a 100644
--- a/components-starter/camel-crypto-pgp-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java
+++ b/components-starter/camel-crypto-pgp-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,PGPDataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.pgp"})
 public class PGPDataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private PGPDataFormatConfiguration configuration;
+    private final PGPDataFormatConfiguration configuration;
 
     public PGPDataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.converter.crypto.springboot.PGPDataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentAutoConfiguration.java b/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentAutoConfiguration.java
index 855e1147092..c629af62ac3 100644
--- a/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentAutoConfiguration.java
+++ b/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, DigitalSignatureComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DigitalSignatureComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.crypto"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, DigitalSignatureComponentConverter.class})
 public class DigitalSignatureComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DigitalSignatureComponentConfiguration configuration;
+    private final DigitalSignatureComponentConfiguration configuration;
 
     public DigitalSignatureComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.crypto.springboot.DigitalSignatureComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatAutoConfiguration.java b/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatAutoConfiguration.java
index ebdabf3dbc0..ec61b977e6f 100644
--- a/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatAutoConfiguration.java
+++ b/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,CryptoDataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.crypto"})
 public class CryptoDataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private CryptoDataFormatConfiguration configuration;
+    private final CryptoDataFormatConfiguration configuration;
 
     public CryptoDataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.converter.crypto.springboot.CryptoDataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatAutoConfiguration.java b/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatAutoConfiguration.java
index bc33ab59467..7e5b6ad6406 100644
--- a/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatAutoConfiguration.java
+++ b/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,CsvDataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.csv"})
 public class CsvDataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private CsvDataFormatConfiguration configuration;
+    private final CsvDataFormatConfiguration configuration;
 
     public CsvDataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.dataformat.csv.springboot.CsvDataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-cxf-rest-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentAutoConfiguration.java b/components-starter/camel-cxf-rest-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentAutoConfiguration.java
index 4925a3c6c9f..b4222cede30 100644
--- a/components-starter/camel-cxf-rest-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentAutoConfiguration.java
+++ b/components-starter/camel-cxf-rest-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, CxfRsComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,CxfRsComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.cxfrs"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, CxfRsComponentConverter.class})
 public class CxfRsComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private CxfRsComponentConfiguration configuration;
+    private final CxfRsComponentConfiguration configuration;
 
     public CxfRsComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.cxf.jaxrs.springboot.CxfRsComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-cxf-soap-starter/src/main/java/org/apache/camel/component/cxf/jaxws/springboot/CxfComponentAutoConfiguration.java b/components-starter/camel-cxf-soap-starter/src/main/java/org/apache/camel/component/cxf/jaxws/springboot/CxfComponentAutoConfiguration.java
index 2a7ffef9063..e0faa6e7cf0 100644
--- a/components-starter/camel-cxf-soap-starter/src/main/java/org/apache/camel/component/cxf/jaxws/springboot/CxfComponentAutoConfiguration.java
+++ b/components-starter/camel-cxf-soap-starter/src/main/java/org/apache/camel/component/cxf/jaxws/springboot/CxfComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, CxfComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,CxfComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.cxf"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, CxfComponentConverter.class})
 public class CxfComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private CxfComponentConfiguration configuration;
+    private final CxfComponentConfiguration configuration;
 
     public CxfComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.cxf.jaxws.springboot.CxfComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-cyberark-vault-starter/src/main/java/org/apache/camel/component/cyberark/vault/springboot/CyberArkVaultComponentAutoConfiguration.java b/components-starter/camel-cyberark-vault-starter/src/main/java/org/apache/camel/component/cyberark/vault/springboot/CyberArkVaultComponentAutoConfiguration.java
index 1b5af299108..a12cd4256c1 100644
--- a/components-starter/camel-cyberark-vault-starter/src/main/java/org/apache/camel/component/cyberark/vault/springboot/CyberArkVaultComponentAutoConfiguration.java
+++ b/components-starter/camel-cyberark-vault-starter/src/main/java/org/apache/camel/component/cyberark/vault/springboot/CyberArkVaultComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, CyberArkVaultComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,CyberArkVaultComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.cyberark-vault"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, CyberArkVaultComponentConverter.class})
 public class CyberArkVaultComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private CyberArkVaultComponentConfiguration configuration;
+    private final CyberArkVaultComponentConfiguration configuration;
 
     public CyberArkVaultComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.cyberark.vault.springboot.CyberArkVaultComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-dapr-starter/src/main/java/org/apache/camel/component/dapr/springboot/DaprComponentAutoConfiguration.java b/components-starter/camel-dapr-starter/src/main/java/org/apache/camel/component/dapr/springboot/DaprComponentAutoConfiguration.java
index 2206b18f332..d6e5c6ae141 100644
--- a/components-starter/camel-dapr-starter/src/main/java/org/apache/camel/component/dapr/springboot/DaprComponentAutoConfiguration.java
+++ b/components-starter/camel-dapr-starter/src/main/java/org/apache/camel/component/dapr/springboot/DaprComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, DaprComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DaprComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.dapr"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, DaprComponentConverter.class})
 public class DaprComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DaprComponentConfiguration configuration;
+    private final DaprComponentConfiguration configuration;
 
     public DaprComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.dapr.springboot.DaprComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-dataformat-starter/src/main/java/org/apache/camel/component/dataformat/springboot/DataFormatComponentAutoConfiguration.java b/components-starter/camel-dataformat-starter/src/main/java/org/apache/camel/component/dataformat/springboot/DataFormatComponentAutoConfiguration.java
index b11f9030e6e..b5d7aa2e9e0 100644
--- a/components-starter/camel-dataformat-starter/src/main/java/org/apache/camel/component/dataformat/springboot/DataFormatComponentAutoConfiguration.java
+++ b/components-starter/camel-dataformat-starter/src/main/java/org/apache/camel/component/dataformat/springboot/DataFormatComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DataFormatComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.dataformat"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class DataFormatComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DataFormatComponentConfiguration configuration;
+    private final DataFormatComponentConfiguration configuration;
 
     public DataFormatComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.dataformat.springboot.DataFormatComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetComponentAutoConfiguration.java b/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetComponentAutoConfiguration.java
index d1409ab8ec9..9c3540167d4 100644
--- a/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetComponentAutoConfiguration.java
+++ b/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, DataSetComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DataSetComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.dataset"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, DataSetComponentConverter.class})
 public class DataSetComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DataSetComponentConfiguration configuration;
+    private final DataSetComponentConfiguration configuration;
 
     public DataSetComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.dataset.springboot.DataSetComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetTestComponentAutoConfiguration.java b/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetTestComponentAutoConfiguration.java
index fc18a9341d9..b90bd94e05a 100644
--- a/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetTestComponentAutoConfiguration.java
+++ b/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetTestComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, DataSetTestComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DataSetTestComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.dataset-test"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, DataSetTestComponentConverter.class})
 public class DataSetTestComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DataSetTestComponentConfiguration configuration;
+    private final DataSetTestComponentConfiguration configuration;
 
     public DataSetTestComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.dataset.springboot.DataSetTestComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-datasonnet-starter/src/main/java/org/apache/camel/language/datasonnet/springboot/DatasonnetLanguageAutoConfiguration.java b/components-starter/camel-datasonnet-starter/src/main/java/org/apache/camel/language/datasonnet/springboot/DatasonnetLanguageAutoConfiguration.java
index 05f08e106fe..a54598e3937 100644
--- a/components-starter/camel-datasonnet-starter/src/main/java/org/apache/camel/language/datasonnet/springboot/DatasonnetLanguageAutoConfiguration.java
+++ b/components-starter/camel-datasonnet-starter/src/main/java/org/apache/camel/language/datasonnet/springboot/DatasonnetLanguageAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({LanguageConfigurationProperties.class,DatasonnetLanguageConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.language", "camel.language.datasonnet"})
 public class DatasonnetLanguageAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DatasonnetLanguageConfiguration configuration;
+    private final DatasonnetLanguageConfiguration configuration;
 
     public DatasonnetLanguageAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.language.datasonnet.springboot.DatasonnetLanguageConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-debezium-db2-starter/src/main/java/org/apache/camel/component/debezium/db2/springboot/DebeziumDb2ComponentAutoConfiguration.java b/components-starter/camel-debezium-db2-starter/src/main/java/org/apache/camel/component/debezium/db2/springboot/DebeziumDb2ComponentAutoConfiguration.java
index 9bee841c35b..05248cb42db 100644
--- a/components-starter/camel-debezium-db2-starter/src/main/java/org/apache/camel/component/debezium/db2/springboot/DebeziumDb2ComponentAutoConfiguration.java
+++ b/components-starter/camel-debezium-db2-starter/src/main/java/org/apache/camel/component/debezium/db2/springboot/DebeziumDb2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, DebeziumDb2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DebeziumDb2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.debezium-db2"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, DebeziumDb2ComponentConverter.class})
 public class DebeziumDb2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DebeziumDb2ComponentConfiguration configuration;
+    private final DebeziumDb2ComponentConfiguration configuration;
 
     public DebeziumDb2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.debezium.db2.springboot.DebeziumDb2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-debezium-mongodb-starter/src/main/java/org/apache/camel/component/debezium/mongodb/springboot/DebeziumMongodbComponentAutoConfiguration.java b/components-starter/camel-debezium-mongodb-starter/src/main/java/org/apache/camel/component/debezium/mongodb/springboot/DebeziumMongodbComponentAutoConfiguration.java
index d5b71c5cb5a..003a660154a 100644
--- a/components-starter/camel-debezium-mongodb-starter/src/main/java/org/apache/camel/component/debezium/mongodb/springboot/DebeziumMongodbComponentAutoConfiguration.java
+++ b/components-starter/camel-debezium-mongodb-starter/src/main/java/org/apache/camel/component/debezium/mongodb/springboot/DebeziumMongodbComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, DebeziumMongodbComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DebeziumMongodbComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.debezium-mongodb"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, DebeziumMongodbComponentConverter.class})
 public class DebeziumMongodbComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DebeziumMongodbComponentConfiguration configuration;
+    private final DebeziumMongodbComponentConfiguration configuration;
 
     public DebeziumMongodbComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.debezium.mongodb.springboot.DebeziumMongodbComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-debezium-mysql-starter/src/main/java/org/apache/camel/component/debezium/mysql/springboot/DebeziumMySqlComponentAutoConfiguration.java b/components-starter/camel-debezium-mysql-starter/src/main/java/org/apache/camel/component/debezium/mysql/springboot/DebeziumMySqlComponentAutoConfiguration.java
index 57fbbe20c38..69db44c1709 100644
--- a/components-starter/camel-debezium-mysql-starter/src/main/java/org/apache/camel/component/debezium/mysql/springboot/DebeziumMySqlComponentAutoConfiguration.java
+++ b/components-starter/camel-debezium-mysql-starter/src/main/java/org/apache/camel/component/debezium/mysql/springboot/DebeziumMySqlComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, DebeziumMySqlComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DebeziumMySqlComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.debezium-mysql"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, DebeziumMySqlComponentConverter.class})
 public class DebeziumMySqlComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DebeziumMySqlComponentConfiguration configuration;
+    private final DebeziumMySqlComponentConfiguration configuration;
 
     public DebeziumMySqlComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.debezium.mysql.springboot.DebeziumMySqlComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-debezium-oracle-starter/src/main/java/org/apache/camel/component/debezium/oracle/springboot/DebeziumOracleComponentAutoConfiguration.java b/components-starter/camel-debezium-oracle-starter/src/main/java/org/apache/camel/component/debezium/oracle/springboot/DebeziumOracleComponentAutoConfiguration.java
index 88d249c0d0e..e163983dcd3 100644
--- a/components-starter/camel-debezium-oracle-starter/src/main/java/org/apache/camel/component/debezium/oracle/springboot/DebeziumOracleComponentAutoConfiguration.java
+++ b/components-starter/camel-debezium-oracle-starter/src/main/java/org/apache/camel/component/debezium/oracle/springboot/DebeziumOracleComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, DebeziumOracleComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DebeziumOracleComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.debezium-oracle"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, DebeziumOracleComponentConverter.class})
 public class DebeziumOracleComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DebeziumOracleComponentConfiguration configuration;
+    private final DebeziumOracleComponentConfiguration configuration;
 
     public DebeziumOracleComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.debezium.oracle.springboot.DebeziumOracleComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-debezium-postgres-starter/src/main/java/org/apache/camel/component/debezium/postgres/springboot/DebeziumPostgresComponentAutoConfiguration.java b/components-starter/camel-debezium-postgres-starter/src/main/java/org/apache/camel/component/debezium/postgres/springboot/DebeziumPostgresComponentAutoConfiguration.java
index 6a35ae2eda6..42d8734f00c 100644
--- a/components-starter/camel-debezium-postgres-starter/src/main/java/org/apache/camel/component/debezium/postgres/springboot/DebeziumPostgresComponentAutoConfiguration.java
+++ b/components-starter/camel-debezium-postgres-starter/src/main/java/org/apache/camel/component/debezium/postgres/springboot/DebeziumPostgresComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, DebeziumPostgresComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DebeziumPostgresComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.debezium-postgres"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, DebeziumPostgresComponentConverter.class})
 public class DebeziumPostgresComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DebeziumPostgresComponentConfiguration configuration;
+    private final DebeziumPostgresComponentConfiguration configuration;
 
     public DebeziumPostgresComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.debezium.postgres.springboot.DebeziumPostgresComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-debezium-sqlserver-starter/src/main/java/org/apache/camel/component/debezium/sqlserver/springboot/DebeziumSqlserverComponentAutoConfiguration.java b/components-starter/camel-debezium-sqlserver-starter/src/main/java/org/apache/camel/component/debezium/sqlserver/springboot/DebeziumSqlserverComponentAutoConfiguration.java
index d0efffd28ea..38f45fe0e45 100644
--- a/components-starter/camel-debezium-sqlserver-starter/src/main/java/org/apache/camel/component/debezium/sqlserver/springboot/DebeziumSqlserverComponentAutoConfiguration.java
+++ b/components-starter/camel-debezium-sqlserver-starter/src/main/java/org/apache/camel/component/debezium/sqlserver/springboot/DebeziumSqlserverComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, DebeziumSqlserverComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DebeziumSqlserverComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.debezium-sqlserver"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, DebeziumSqlserverComponentConverter.class})
 public class DebeziumSqlserverComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DebeziumSqlserverComponentConfiguration configuration;
+    private final DebeziumSqlserverComponentConfiguration configuration;
 
     public DebeziumSqlserverComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.debezium.sqlserver.springboot.DebeziumSqlserverComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-dfdl-starter/src/main/java/org/apache/camel/component/dfdl/springboot/DfdlComponentAutoConfiguration.java b/components-starter/camel-dfdl-starter/src/main/java/org/apache/camel/component/dfdl/springboot/DfdlComponentAutoConfiguration.java
index 242f3a7e856..33bcadfd429 100644
--- a/components-starter/camel-dfdl-starter/src/main/java/org/apache/camel/component/dfdl/springboot/DfdlComponentAutoConfiguration.java
+++ b/components-starter/camel-dfdl-starter/src/main/java/org/apache/camel/component/dfdl/springboot/DfdlComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DfdlComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.dfdl"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class DfdlComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DfdlComponentConfiguration configuration;
+    private final DfdlComponentConfiguration configuration;
 
     public DfdlComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.dfdl.springboot.DfdlComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-dfdl-starter/src/main/java/org/apache/camel/dataformat/dfdl/springboot/DfdlDataFormatAutoConfiguration.java b/components-starter/camel-dfdl-starter/src/main/java/org/apache/camel/dataformat/dfdl/springboot/DfdlDataFormatAutoConfiguration.java
index 72fe054616b..6b79ce21934 100644
--- a/components-starter/camel-dfdl-starter/src/main/java/org/apache/camel/dataformat/dfdl/springboot/DfdlDataFormatAutoConfiguration.java
+++ b/components-starter/camel-dfdl-starter/src/main/java/org/apache/camel/dataformat/dfdl/springboot/DfdlDataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,DfdlDataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.dfdl"})
 public class DfdlDataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DfdlDataFormatConfiguration configuration;
+    private final DfdlDataFormatConfiguration configuration;
 
     public DfdlDataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.dataformat.dfdl.springboot.DfdlDataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-dhis2-starter/src/main/java/org/apache/camel/component/dhis2/springboot/Dhis2ComponentAutoConfiguration.java b/components-starter/camel-dhis2-starter/src/main/java/org/apache/camel/component/dhis2/springboot/Dhis2ComponentAutoConfiguration.java
index 7c3e72c8f39..ecf8d52bde6 100644
--- a/components-starter/camel-dhis2-starter/src/main/java/org/apache/camel/component/dhis2/springboot/Dhis2ComponentAutoConfiguration.java
+++ b/components-starter/camel-dhis2-starter/src/main/java/org/apache/camel/component/dhis2/springboot/Dhis2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, Dhis2ComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,Dhis2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.dhis2"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, Dhis2ComponentConverter.class})
 public class Dhis2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private Dhis2ComponentConfiguration configuration;
+    private final Dhis2ComponentConfiguration configuration;
 
     public Dhis2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.dhis2.springboot.Dhis2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-digitalocean-starter/src/main/java/org/apache/camel/component/digitalocean/springboot/DigitalOceanComponentAutoConfiguration.java b/components-starter/camel-digitalocean-starter/src/main/java/org/apache/camel/component/digitalocean/springboot/DigitalOceanComponentAutoConfiguration.java
index 5b3b86bbf86..dd4f039a821 100644
--- a/components-starter/camel-digitalocean-starter/src/main/java/org/apache/camel/component/digitalocean/springboot/DigitalOceanComponentAutoConfiguration.java
+++ b/components-starter/camel-digitalocean-starter/src/main/java/org/apache/camel/component/digitalocean/springboot/DigitalOceanComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DigitalOceanComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.digitalocean"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class DigitalOceanComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DigitalOceanComponentConfiguration configuration;
+    private final DigitalOceanComponentConfiguration configuration;
 
     public DigitalOceanComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.digitalocean.springboot.DigitalOceanComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-direct-starter/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentAutoConfiguration.java b/components-starter/camel-direct-starter/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentAutoConfiguration.java
index 55a4ed85cdc..8a734e3d887 100644
--- a/components-starter/camel-direct-starter/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentAutoConfiguration.java
+++ b/components-starter/camel-direct-starter/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DirectComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.direct"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class DirectComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DirectComponentConfiguration configuration;
+    private final DirectComponentConfiguration configuration;
 
     public DirectComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.direct.springboot.DirectComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-disruptor-starter/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java b/components-starter/camel-disruptor-starter/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java
index 5c7aeaf72b7..6768616c916 100644
--- a/components-starter/camel-disruptor-starter/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java
+++ b/components-starter/camel-disruptor-starter/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DisruptorComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.disruptor"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class DisruptorComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DisruptorComponentConfiguration configuration;
+    private final DisruptorComponentConfiguration configuration;
 
     public DisruptorComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.disruptor.springboot.DisruptorComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-disruptor-starter/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java b/components-starter/camel-disruptor-starter/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java
index e431d7012fb..91049fa90c4 100644
--- a/components-starter/camel-disruptor-starter/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java
+++ b/components-starter/camel-disruptor-starter/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DisruptorVmComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.disruptor-vm"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class DisruptorVmComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DisruptorVmComponentConfiguration configuration;
+    private final DisruptorVmComponentConfiguration configuration;
 
     public DisruptorVmComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.disruptor.vm.springboot.DisruptorVmComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-djl-starter/src/main/java/org/apache/camel/component/djl/springboot/DJLComponentAutoConfiguration.java b/components-starter/camel-djl-starter/src/main/java/org/apache/camel/component/djl/springboot/DJLComponentAutoConfiguration.java
index f2fd32033b9..2f4b5ad904d 100644
--- a/components-starter/camel-djl-starter/src/main/java/org/apache/camel/component/djl/springboot/DJLComponentAutoConfiguration.java
+++ b/components-starter/camel-djl-starter/src/main/java/org/apache/camel/component/djl/springboot/DJLComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DJLComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.djl"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class DJLComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DJLComponentConfiguration configuration;
+    private final DJLComponentConfiguration configuration;
 
     public DJLComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.djl.springboot.DJLComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-dns-starter/src/main/java/org/apache/camel/component/dns/springboot/DnsComponentAutoConfiguration.java b/components-starter/camel-dns-starter/src/main/java/org/apache/camel/component/dns/springboot/DnsComponentAutoConfiguration.java
index 3a429f2eb93..3d42c37c9f4 100644
--- a/components-starter/camel-dns-starter/src/main/java/org/apache/camel/component/dns/springboot/DnsComponentAutoConfiguration.java
+++ b/components-starter/camel-dns-starter/src/main/java/org/apache/camel/component/dns/springboot/DnsComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DnsComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.dns"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class DnsComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DnsComponentConfiguration configuration;
+    private final DnsComponentConfiguration configuration;
 
     public DnsComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.dns.springboot.DnsComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentAutoConfiguration.java b/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentAutoConfiguration.java
index 864424c3498..25ee5458eea 100644
--- a/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentAutoConfiguration.java
+++ b/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, DockerComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DockerComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.docker"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, DockerComponentConverter.class})
 public class DockerComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DockerComponentConfiguration configuration;
+    private final DockerComponentConfiguration configuration;
 
     public DockerComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.docker.springboot.DockerComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-docling-starter/src/main/java/org/apache/camel/component/docling/springboot/DoclingComponentAutoConfiguration.java b/components-starter/camel-docling-starter/src/main/java/org/apache/camel/component/docling/springboot/DoclingComponentAutoConfiguration.java
index 113f50c1350..dcf811fd868 100644
--- a/components-starter/camel-docling-starter/src/main/java/org/apache/camel/component/docling/springboot/DoclingComponentAutoConfiguration.java
+++ b/components-starter/camel-docling-starter/src/main/java/org/apache/camel/component/docling/springboot/DoclingComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, DoclingComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DoclingComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.docling"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, DoclingComponentConverter.class})
 public class DoclingComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DoclingComponentConfiguration configuration;
+    private final DoclingComponentConfiguration configuration;
 
     public DoclingComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.docling.springboot.DoclingComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-drill-starter/src/main/java/org/apache/camel/component/drill/springboot/DrillComponentAutoConfiguration.java b/components-starter/camel-drill-starter/src/main/java/org/apache/camel/component/drill/springboot/DrillComponentAutoConfiguration.java
index 919de5f3610..c06b2f8781c 100644
--- a/components-starter/camel-drill-starter/src/main/java/org/apache/camel/component/drill/springboot/DrillComponentAutoConfiguration.java
+++ b/components-starter/camel-drill-starter/src/main/java/org/apache/camel/component/drill/springboot/DrillComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DrillComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.drill"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class DrillComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DrillComponentConfiguration configuration;
+    private final DrillComponentConfiguration configuration;
 
     public DrillComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.drill.springboot.DrillComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-dropbox-starter/src/main/java/org/apache/camel/component/dropbox/springboot/DropboxComponentAutoConfiguration.java b/components-starter/camel-dropbox-starter/src/main/java/org/apache/camel/component/dropbox/springboot/DropboxComponentAutoConfiguration.java
index b1856080633..648299968f4 100644
--- a/components-starter/camel-dropbox-starter/src/main/java/org/apache/camel/component/dropbox/springboot/DropboxComponentAutoConfiguration.java
+++ b/components-starter/camel-dropbox-starter/src/main/java/org/apache/camel/component/dropbox/springboot/DropboxComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DropboxComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.dropbox"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class DropboxComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DropboxComponentConfiguration configuration;
+    private final DropboxComponentConfiguration configuration;
 
     public DropboxComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.dropbox.springboot.DropboxComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-dynamic-router-starter/src/main/java/org/apache/camel/component/dynamicrouter/control/springboot/DynamicRouterControlComponentAutoConfiguration.java b/components-starter/camel-dynamic-router-starter/src/main/java/org/apache/camel/component/dynamicrouter/control/springboot/DynamicRouterControlComponentAutoConfiguration.java
index 4eb669e0bdf..6d1fc7b22f2 100644
--- a/components-starter/camel-dynamic-router-starter/src/main/java/org/apache/camel/component/dynamicrouter/control/springboot/DynamicRouterControlComponentAutoConfiguration.java
+++ b/components-starter/camel-dynamic-router-starter/src/main/java/org/apache/camel/component/dynamicrouter/control/springboot/DynamicRouterControlComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DynamicRouterControlComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.dynamic-router-control"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class DynamicRouterControlComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DynamicRouterControlComponentConfiguration configuration;
+    private final DynamicRouterControlComponentConfiguration configuration;
 
     public DynamicRouterControlComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.dynamicrouter.control.springboot.DynamicRouterControlComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-dynamic-router-starter/src/main/java/org/apache/camel/component/dynamicrouter/routing/springboot/DynamicRouterComponentAutoConfiguration.java b/components-starter/camel-dynamic-router-starter/src/main/java/org/apache/camel/component/dynamicrouter/routing/springboot/DynamicRouterComponentAutoConfiguration.java
index 9e25cf640b8..8dfa562faab 100644
--- a/components-starter/camel-dynamic-router-starter/src/main/java/org/apache/camel/component/dynamicrouter/routing/springboot/DynamicRouterComponentAutoConfiguration.java
+++ b/components-starter/camel-dynamic-router-starter/src/main/java/org/apache/camel/component/dynamicrouter/routing/springboot/DynamicRouterComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,DynamicRouterComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.dynamic-router"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class DynamicRouterComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private DynamicRouterComponentConfiguration configuration;
+    private final DynamicRouterComponentConfiguration configuration;
 
     public DynamicRouterComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.dynamicrouter.routing.springboot.DynamicRouterComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentAutoConfiguration.java b/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentAutoConfiguration.java
index ac426c7aeff..11b029e1561 100644
--- a/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentAutoConfiguration.java
+++ b/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, EhcacheComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,EhcacheComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.ehcache"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, EhcacheComponentConverter.class})
 public class EhcacheComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private EhcacheComponentConfiguration configuration;
+    private final EhcacheComponentConfiguration configuration;
 
     public EhcacheComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.ehcache.springboot.EhcacheComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-elasticsearch-rest-client-starter/src/main/java/org/apache/camel/component/elasticsearch/rest/client/springboot/ElasticsearchRestClientComponentAutoConfiguration.java b/components-starter/camel-elasticsearch-rest-client-starter/src/main/java/org/apache/camel/component/elasticsearch/rest/client/springboot/ElasticsearchRestClientComponentAutoConfiguration.java
index eea80255b62..91dcd2a1ea2 100644
--- a/components-starter/camel-elasticsearch-rest-client-starter/src/main/java/org/apache/camel/component/elasticsearch/rest/client/springboot/ElasticsearchRestClientComponentAutoConfiguration.java
+++ b/components-starter/camel-elasticsearch-rest-client-starter/src/main/java/org/apache/camel/component/elasticsearch/rest/client/springboot/ElasticsearchRestClientComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, ElasticsearchRestClientComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,ElasticsearchRestClientComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.elasticsearch-rest-client"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, ElasticsearchRestClientComponentConverter.class})
 public class ElasticsearchRestClientComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private ElasticsearchRestClientComponentConfiguration configuration;
+    private final ElasticsearchRestClientComponentConfiguration configuration;
 
     public ElasticsearchRestClientComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.elasticsearch.rest.client.springboot.ElasticsearchRestClientComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-elasticsearch-starter/src/main/java/org/apache/camel/component/es/springboot/ElasticsearchComponentAutoConfiguration.java b/components-starter/camel-elasticsearch-starter/src/main/java/org/apache/camel/component/es/springboot/ElasticsearchComponentAutoConfiguration.java
index 9e34570963c..3160c82dba3 100644
--- a/components-starter/camel-elasticsearch-starter/src/main/java/org/apache/camel/component/es/springboot/ElasticsearchComponentAutoConfiguration.java
+++ b/components-starter/camel-elasticsearch-starter/src/main/java/org/apache/camel/component/es/springboot/ElasticsearchComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, ElasticsearchComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,ElasticsearchComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.elasticsearch"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, ElasticsearchComponentConverter.class})
 public class ElasticsearchComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private ElasticsearchComponentConfiguration configuration;
+    private final ElasticsearchComponentConfiguration configuration;
 
     public ElasticsearchComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.es.springboot.ElasticsearchComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-exec-starter/src/main/java/org/apache/camel/component/exec/springboot/ExecComponentAutoConfiguration.java b/components-starter/camel-exec-starter/src/main/java/org/apache/camel/component/exec/springboot/ExecComponentAutoConfiguration.java
index 7b3b5689620..95b4221fd5c 100644
--- a/components-starter/camel-exec-starter/src/main/java/org/apache/camel/component/exec/springboot/ExecComponentAutoConfiguration.java
+++ b/components-starter/camel-exec-starter/src/main/java/org/apache/camel/component/exec/springboot/ExecComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, ExecComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,ExecComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.exec"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, ExecComponentConverter.class})
 public class ExecComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private ExecComponentConfiguration configuration;
+    private final ExecComponentConfiguration configuration;
 
     public ExecComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.exec.springboot.ExecComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-fastjson-starter/src/main/java/org/apache/camel/component/fastjson/springboot/FastjsonDataFormatAutoConfiguration.java b/components-starter/camel-fastjson-starter/src/main/java/org/apache/camel/component/fastjson/springboot/FastjsonDataFormatAutoConfiguration.java
index 26aa79e685e..6e33ae0dea5 100644
--- a/components-starter/camel-fastjson-starter/src/main/java/org/apache/camel/component/fastjson/springboot/FastjsonDataFormatAutoConfiguration.java
+++ b/components-starter/camel-fastjson-starter/src/main/java/org/apache/camel/component/fastjson/springboot/FastjsonDataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,FastjsonDataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.fastjson"})
 public class FastjsonDataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private FastjsonDataFormatConfiguration configuration;
+    private final FastjsonDataFormatConfiguration configuration;
 
     public FastjsonDataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.fastjson.springboot.FastjsonDataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentAutoConfiguration.java b/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentAutoConfiguration.java
index 94d5f36bae0..d78b94e82c1 100644
--- a/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentAutoConfiguration.java
+++ b/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, FhirComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,FhirComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.fhir"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, FhirComponentConverter.class})
 public class FhirComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private FhirComponentConfiguration configuration;
+    private final FhirComponentConfiguration configuration;
 
     public FhirComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.fhir.springboot.FhirComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirJsonDataFormatAutoConfiguration.java b/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirJsonDataFormatAutoConfiguration.java
index bc545a5e9bc..2b3abe8bc6d 100644
--- a/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirJsonDataFormatAutoConfiguration.java
+++ b/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirJsonDataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,FhirJsonDataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.fhir-json"})
 public class FhirJsonDataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private FhirJsonDataFormatConfiguration configuration;
+    private final FhirJsonDataFormatConfiguration configuration;
 
     public FhirJsonDataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.fhir.springboot.FhirJsonDataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirXmlDataFormatAutoConfiguration.java b/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirXmlDataFormatAutoConfiguration.java
index e044d2b72a8..6469921cf14 100644
--- a/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirXmlDataFormatAutoConfiguration.java
+++ b/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirXmlDataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,FhirXmlDataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.fhir-xml"})
 public class FhirXmlDataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private FhirXmlDataFormatConfiguration configuration;
+    private final FhirXmlDataFormatConfiguration configuration;
 
     public FhirXmlDataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.fhir.springboot.FhirXmlDataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-file-starter/src/main/java/org/apache/camel/component/file/springboot/FileComponentAutoConfiguration.java b/components-starter/camel-file-starter/src/main/java/org/apache/camel/component/file/springboot/FileComponentAutoConfiguration.java
index 81d78f91715..3ba54f69f31 100644
--- a/components-starter/camel-file-starter/src/main/java/org/apache/camel/component/file/springboot/FileComponentAutoConfiguration.java
+++ b/components-starter/camel-file-starter/src/main/java/org/apache/camel/component/file/springboot/FileComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,FileComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.file"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class FileComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private FileComponentConfiguration configuration;
+    private final FileComponentConfiguration configuration;
 
     public FileComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.file.springboot.FileComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-file-watch-starter/src/main/java/org/apache/camel/component/file/watch/springboot/FileWatchComponentAutoConfiguration.java b/components-starter/camel-file-watch-starter/src/main/java/org/apache/camel/component/file/watch/springboot/FileWatchComponentAutoConfiguration.java
index c108c2e0a49..7e0efdc636f 100644
--- a/components-starter/camel-file-watch-starter/src/main/java/org/apache/camel/component/file/watch/springboot/FileWatchComponentAutoConfiguration.java
+++ b/components-starter/camel-file-watch-starter/src/main/java/org/apache/camel/component/file/watch/springboot/FileWatchComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, FileWatchComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,FileWatchComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.file-watch"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, FileWatchComponentConverter.class})
 public class FileWatchComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private FileWatchComponentConfiguration configuration;
+    private final FileWatchComponentConfiguration configuration;
 
     public FileWatchComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.file.watch.springboot.FileWatchComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/component/flatpack/springboot/FlatpackComponentAutoConfiguration.java b/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/component/flatpack/springboot/FlatpackComponentAutoConfiguration.java
index 1e8fce9f2e4..ed8e424bb8e 100644
--- a/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/component/flatpack/springboot/FlatpackComponentAutoConfiguration.java
+++ b/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/component/flatpack/springboot/FlatpackComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,FlatpackComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.flatpack"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class FlatpackComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private FlatpackComponentConfiguration configuration;
+    private final FlatpackComponentConfiguration configuration;
 
     public FlatpackComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.flatpack.springboot.FlatpackComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatAutoConfiguration.java b/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatAutoConfiguration.java
index 542cfc8c3eb..bcb376ce588 100644
--- a/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatAutoConfiguration.java
+++ b/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,FlatpackDataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.flatpack"})
 public class FlatpackDataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private FlatpackDataFormatConfiguration configuration;
+    private final FlatpackDataFormatConfiguration configuration;
 
     public FlatpackDataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.dataformat.flatpack.springboot.FlatpackDataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-flink-starter/src/main/java/org/apache/camel/component/flink/springboot/FlinkComponentAutoConfiguration.java b/components-starter/camel-flink-starter/src/main/java/org/apache/camel/component/flink/springboot/FlinkComponentAutoConfiguration.java
index ba75b11e8cd..f5489432686 100644
--- a/components-starter/camel-flink-starter/src/main/java/org/apache/camel/component/flink/springboot/FlinkComponentAutoConfiguration.java
+++ b/components-starter/camel-flink-starter/src/main/java/org/apache/camel/component/flink/springboot/FlinkComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, FlinkComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,FlinkComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.flink"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, FlinkComponentConverter.class})
 public class FlinkComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private FlinkComponentConfiguration configuration;
+    private final FlinkComponentConfiguration configuration;
 
     public FlinkComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.flink.springboot.FlinkComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-flowable-starter/src/main/java/org/apache/camel/component/flowable/springboot/FlowableComponentAutoConfiguration.java b/components-starter/camel-flowable-starter/src/main/java/org/apache/camel/component/flowable/springboot/FlowableComponentAutoConfiguration.java
index 8eda4404e9a..2a695e4c7a6 100644
--- a/components-starter/camel-flowable-starter/src/main/java/org/apache/camel/component/flowable/springboot/FlowableComponentAutoConfiguration.java
+++ b/components-starter/camel-flowable-starter/src/main/java/org/apache/camel/component/flowable/springboot/FlowableComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,FlowableComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.flowable"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class FlowableComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private FlowableComponentConfiguration configuration;
+    private final FlowableComponentConfiguration configuration;
 
     public FlowableComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.flowable.springboot.FlowableComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-fop-starter/src/main/java/org/apache/camel/component/fop/springboot/FopComponentAutoConfiguration.java b/components-starter/camel-fop-starter/src/main/java/org/apache/camel/component/fop/springboot/FopComponentAutoConfiguration.java
index 618ed07d37d..32ef27251b9 100644
--- a/components-starter/camel-fop-starter/src/main/java/org/apache/camel/component/fop/springboot/FopComponentAutoConfiguration.java
+++ b/components-starter/camel-fop-starter/src/main/java/org/apache/camel/component/fop/springboot/FopComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,FopComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.fop"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class FopComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private FopComponentConfiguration configuration;
+    private final FopComponentConfiguration configuration;
 
     public FopComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.fop.springboot.FopComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-fory-starter/src/main/java/org/apache/camel/component/fory/springboot/ForyDataFormatAutoConfiguration.java b/components-starter/camel-fory-starter/src/main/java/org/apache/camel/component/fory/springboot/ForyDataFormatAutoConfiguration.java
index a30115076d6..964edca0548 100644
--- a/components-starter/camel-fory-starter/src/main/java/org/apache/camel/component/fory/springboot/ForyDataFormatAutoConfiguration.java
+++ b/components-starter/camel-fory-starter/src/main/java/org/apache/camel/component/fory/springboot/ForyDataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,ForyDataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.fory"})
 public class ForyDataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private ForyDataFormatConfiguration configuration;
+    private final ForyDataFormatConfiguration configuration;
 
     public ForyDataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.fory.springboot.ForyDataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentAutoConfiguration.java b/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentAutoConfiguration.java
index a93cda07cbd..71f69b74f72 100644
--- a/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentAutoConfiguration.java
+++ b/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, FreemarkerComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,FreemarkerComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.freemarker"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, FreemarkerComponentConverter.class})
 public class FreemarkerComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private FreemarkerComponentConfiguration configuration;
+    private final FreemarkerComponentConfiguration configuration;
 
     public FreemarkerComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.freemarker.springboot.FreemarkerComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpComponentAutoConfiguration.java b/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpComponentAutoConfiguration.java
index 7398886d8f5..5333eba0698 100644
--- a/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpComponentAutoConfiguration.java
+++ b/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,FtpComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.ftp"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class FtpComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private FtpComponentConfiguration configuration;
+    private final FtpComponentConfiguration configuration;
 
     public FtpComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.file.remote.springboot.FtpComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpsComponentAutoConfiguration.java b/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpsComponentAutoConfiguration.java
index 74c6757fd3e..b44e4d4a767 100644
--- a/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpsComponentAutoConfiguration.java
+++ b/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpsComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,FtpsComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.ftps"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class FtpsComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private FtpsComponentConfiguration configuration;
+    private final FtpsComponentConfiguration configuration;
 
     public FtpsComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.file.remote.springboot.FtpsComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/SftpComponentAutoConfiguration.java b/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/SftpComponentAutoConfiguration.java
index ef6ab1e03f2..c1c6de7137a 100644
--- a/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/SftpComponentAutoConfiguration.java
+++ b/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/SftpComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,SftpComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.sftp"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class SftpComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private SftpComponentConfiguration configuration;
+    private final SftpComponentConfiguration configuration;
 
     public SftpComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.file.remote.springboot.SftpComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-geocoder-starter/src/main/java/org/apache/camel/component/geocoder/springboot/GeoCoderComponentAutoConfiguration.java b/components-starter/camel-geocoder-starter/src/main/java/org/apache/camel/component/geocoder/springboot/GeoCoderComponentAutoConfiguration.java
index 9f94b17bb57..0562b37bcd1 100644
--- a/components-starter/camel-geocoder-starter/src/main/java/org/apache/camel/component/geocoder/springboot/GeoCoderComponentAutoConfiguration.java
+++ b/components-starter/camel-geocoder-starter/src/main/java/org/apache/camel/component/geocoder/springboot/GeoCoderComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, GeoCoderComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GeoCoderComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.geocoder"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, GeoCoderComponentConverter.class})
 public class GeoCoderComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GeoCoderComponentConfiguration configuration;
+    private final GeoCoderComponentConfiguration configuration;
 
     public GeoCoderComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.geocoder.springboot.GeoCoderComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-git-starter/src/main/java/org/apache/camel/component/git/springboot/GitComponentAutoConfiguration.java b/components-starter/camel-git-starter/src/main/java/org/apache/camel/component/git/springboot/GitComponentAutoConfiguration.java
index 5489c49fbb8..a8ebcd1040a 100644
--- a/components-starter/camel-git-starter/src/main/java/org/apache/camel/component/git/springboot/GitComponentAutoConfiguration.java
+++ b/components-starter/camel-git-starter/src/main/java/org/apache/camel/component/git/springboot/GitComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GitComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.git"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class GitComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GitComponentConfiguration configuration;
+    private final GitComponentConfiguration configuration;
 
     public GitComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.git.springboot.GitComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-github-starter/src/main/java/org/apache/camel/component/github/springboot/GitHubComponentAutoConfiguration.java b/components-starter/camel-github-starter/src/main/java/org/apache/camel/component/github/springboot/GitHubComponentAutoConfiguration.java
index bad9feba10f..04249e41a91 100644
--- a/components-starter/camel-github-starter/src/main/java/org/apache/camel/component/github/springboot/GitHubComponentAutoConfiguration.java
+++ b/components-starter/camel-github-starter/src/main/java/org/apache/camel/component/github/springboot/GitHubComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GitHubComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.github"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class GitHubComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GitHubComponentConfiguration configuration;
+    private final GitHubComponentConfiguration configuration;
 
     public GitHubComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.github.springboot.GitHubComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-github2-starter/src/main/java/org/apache/camel/component/github2/springboot/GitHub2ComponentAutoConfiguration.java b/components-starter/camel-github2-starter/src/main/java/org/apache/camel/component/github2/springboot/GitHub2ComponentAutoConfiguration.java
index 06680348983..2d1356d5e66 100644
--- a/components-starter/camel-github2-starter/src/main/java/org/apache/camel/component/github2/springboot/GitHub2ComponentAutoConfiguration.java
+++ b/components-starter/camel-github2-starter/src/main/java/org/apache/camel/component/github2/springboot/GitHub2ComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GitHub2ComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.github2"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class GitHub2ComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GitHub2ComponentConfiguration configuration;
+    private final GitHub2ComponentConfiguration configuration;
 
     public GitHub2ComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.github2.springboot.GitHub2ComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/springboot/GoogleBigQueryComponentAutoConfiguration.java b/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/springboot/GoogleBigQueryComponentAutoConfiguration.java
index a8cda0591e4..016bf0ca0c6 100644
--- a/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/springboot/GoogleBigQueryComponentAutoConfiguration.java
+++ b/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/springboot/GoogleBigQueryComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, GoogleBigQueryComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GoogleBigQueryComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.google-bigquery"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, GoogleBigQueryComponentConverter.class})
 public class GoogleBigQueryComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GoogleBigQueryComponentConfiguration configuration;
+    private final GoogleBigQueryComponentConfiguration configuration;
 
     public GoogleBigQueryComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.google.bigquery.springboot.GoogleBigQueryComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentAutoConfiguration.java b/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentAutoConfiguration.java
index f7bc97e5435..b0e59e29f90 100644
--- a/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentAutoConfiguration.java
+++ b/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, GoogleBigQuerySQLComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GoogleBigQuerySQLComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.google-bigquery-sql"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, GoogleBigQuerySQLComponentConverter.class})
 public class GoogleBigQuerySQLComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GoogleBigQuerySQLComponentConfiguration configuration;
+    private final GoogleBigQuerySQLComponentConfiguration configuration;
 
     public GoogleBigQuerySQLComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.google.bigquery.sql.springboot.GoogleBigQuerySQLComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/springboot/GoogleCalendarComponentAutoConfiguration.java b/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/springboot/GoogleCalendarComponentAutoConfiguration.java
index d1015403100..a518dc6b55f 100644
--- a/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/springboot/GoogleCalendarComponentAutoConfiguration.java
+++ b/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/springboot/GoogleCalendarComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, GoogleCalendarComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GoogleCalendarComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.google-calendar"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, GoogleCalendarComponentConverter.class})
 public class GoogleCalendarComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GoogleCalendarComponentConfiguration configuration;
+    private final GoogleCalendarComponentConfiguration configuration;
 
     public GoogleCalendarComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.google.calendar.springboot.GoogleCalendarComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/stream/springboot/GoogleCalendarStreamComponentAutoConfiguration.java b/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/stream/springboot/GoogleCalendarStreamComponentAutoConfiguration.java
index 7e50f7c1782..815cd903203 100644
--- a/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/stream/springboot/GoogleCalendarStreamComponentAutoConfiguration.java
+++ b/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/stream/springboot/GoogleCalendarStreamComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, GoogleCalendarStreamComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GoogleCalendarStreamComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.google-calendar-stream"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, GoogleCalendarStreamComponentConverter.class})
 public class GoogleCalendarStreamComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GoogleCalendarStreamComponentConfiguration configuration;
+    private final GoogleCalendarStreamComponentConfiguration configuration;
 
     public GoogleCalendarStreamComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.google.calendar.stream.springboot.GoogleCalendarStreamComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-google-drive-starter/src/main/java/org/apache/camel/component/google/drive/springboot/GoogleDriveComponentAutoConfiguration.java b/components-starter/camel-google-drive-starter/src/main/java/org/apache/camel/component/google/drive/springboot/GoogleDriveComponentAutoConfiguration.java
index ef2985b1249..529ced07850 100644
--- a/components-starter/camel-google-drive-starter/src/main/java/org/apache/camel/component/google/drive/springboot/GoogleDriveComponentAutoConfiguration.java
+++ b/components-starter/camel-google-drive-starter/src/main/java/org/apache/camel/component/google/drive/springboot/GoogleDriveComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, GoogleDriveComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GoogleDriveComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.google-drive"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, GoogleDriveComponentConverter.class})
 public class GoogleDriveComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GoogleDriveComponentConfiguration configuration;
+    private final GoogleDriveComponentConfiguration configuration;
 
     public GoogleDriveComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.google.drive.springboot.GoogleDriveComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-google-firestore-starter/src/main/java/org/apache/camel/component/google/firestore/springboot/GoogleFirestoreComponentAutoConfiguration.java b/components-starter/camel-google-firestore-starter/src/main/java/org/apache/camel/component/google/firestore/springboot/GoogleFirestoreComponentAutoConfiguration.java
index 4d0fc94d5ca..c4d85914211 100644
--- a/components-starter/camel-google-firestore-starter/src/main/java/org/apache/camel/component/google/firestore/springboot/GoogleFirestoreComponentAutoConfiguration.java
+++ b/components-starter/camel-google-firestore-starter/src/main/java/org/apache/camel/component/google/firestore/springboot/GoogleFirestoreComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, GoogleFirestoreComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GoogleFirestoreComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.google-firestore"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, GoogleFirestoreComponentConverter.class})
 public class GoogleFirestoreComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GoogleFirestoreComponentConfiguration configuration;
+    private final GoogleFirestoreComponentConfiguration configuration;
 
     public GoogleFirestoreComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.google.firestore.springboot.GoogleFirestoreComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-google-functions-starter/src/main/java/org/apache/camel/component/google/functions/springboot/GoogleCloudFunctionsComponentAutoConfiguration.java b/components-starter/camel-google-functions-starter/src/main/java/org/apache/camel/component/google/functions/springboot/GoogleCloudFunctionsComponentAutoConfiguration.java
index f6e46d83c3c..c8e24c1d045 100644
--- a/components-starter/camel-google-functions-starter/src/main/java/org/apache/camel/component/google/functions/springboot/GoogleCloudFunctionsComponentAutoConfiguration.java
+++ b/components-starter/camel-google-functions-starter/src/main/java/org/apache/camel/component/google/functions/springboot/GoogleCloudFunctionsComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GoogleCloudFunctionsComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.google-functions"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class GoogleCloudFunctionsComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GoogleCloudFunctionsComponentConfiguration configuration;
+    private final GoogleCloudFunctionsComponentConfiguration configuration;
 
     public GoogleCloudFunctionsComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.google.functions.springboot.GoogleCloudFunctionsComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentAutoConfiguration.java b/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentAutoConfiguration.java
index 8864a1bb9cb..2e7cfc68d65 100644
--- a/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentAutoConfiguration.java
+++ b/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, GoogleMailComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GoogleMailComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.google-mail"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, GoogleMailComponentConverter.class})
 public class GoogleMailComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GoogleMailComponentConfiguration configuration;
+    private final GoogleMailComponentConfiguration configuration;
 
     public GoogleMailComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.google.mail.springboot.GoogleMailComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentAutoConfiguration.java b/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentAutoConfiguration.java
index f4b0e717baf..2a6127bb99e 100644
--- a/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentAutoConfiguration.java
+++ b/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, GoogleMailStreamComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GoogleMailStreamComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.google-mail-stream"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, GoogleMailStreamComponentConverter.class})
 public class GoogleMailStreamComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GoogleMailStreamComponentConfiguration configuration;
+    private final GoogleMailStreamComponentConfiguration configuration;
 
     public GoogleMailStreamComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.google.mail.stream.springboot.GoogleMailStreamComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-google-pubsub-starter/src/main/java/org/apache/camel/component/google/pubsub/springboot/GooglePubsubComponentAutoConfiguration.java b/components-starter/camel-google-pubsub-starter/src/main/java/org/apache/camel/component/google/pubsub/springboot/GooglePubsubComponentAutoConfiguration.java
index 08bc7753195..75c0da97139 100644
--- a/components-starter/camel-google-pubsub-starter/src/main/java/org/apache/camel/component/google/pubsub/springboot/GooglePubsubComponentAutoConfiguration.java
+++ b/components-starter/camel-google-pubsub-starter/src/main/java/org/apache/camel/component/google/pubsub/springboot/GooglePubsubComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, GooglePubsubComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GooglePubsubComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.google-pubsub"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, GooglePubsubComponentConverter.class})
 public class GooglePubsubComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GooglePubsubComponentConfiguration configuration;
+    private final GooglePubsubComponentConfiguration configuration;
 
     public GooglePubsubComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.google.pubsub.springboot.GooglePubsubComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-google-secret-manager-starter/src/main/java/org/apache/camel/component/google/secret/manager/springboot/GoogleSecretManagerComponentAutoConfiguration.java b/components-starter/camel-google-secret-manager-starter/src/main/java/org/apache/camel/component/google/secret/manager/springboot/GoogleSecretManagerComponentAutoConfiguration.java
index 67cf53de2e5..7dfc970d5a9 100644
--- a/components-starter/camel-google-secret-manager-starter/src/main/java/org/apache/camel/component/google/secret/manager/springboot/GoogleSecretManagerComponentAutoConfiguration.java
+++ b/components-starter/camel-google-secret-manager-starter/src/main/java/org/apache/camel/component/google/secret/manager/springboot/GoogleSecretManagerComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GoogleSecretManagerComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.google-secret-manager"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class GoogleSecretManagerComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GoogleSecretManagerComponentConfiguration configuration;
+    private final GoogleSecretManagerComponentConfiguration configuration;
 
     public GoogleSecretManagerComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.google.secret.manager.springboot.GoogleSecretManagerComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentAutoConfiguration.java b/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentAutoConfiguration.java
index f48a5d18970..84714b2bb74 100644
--- a/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentAutoConfiguration.java
+++ b/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, GoogleSheetsComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GoogleSheetsComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.google-sheets"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, GoogleSheetsComponentConverter.class})
 public class GoogleSheetsComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GoogleSheetsComponentConfiguration configuration;
+    private final GoogleSheetsComponentConfiguration configuration;
 
     public GoogleSheetsComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.google.sheets.springboot.GoogleSheetsComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentAutoConfiguration.java b/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentAutoConfiguration.java
index aa38ac44e74..6e987aab7c6 100644
--- a/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentAutoConfiguration.java
+++ b/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, GoogleSheetsStreamComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GoogleSheetsStreamComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.google-sheets-stream"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, GoogleSheetsStreamComponentConverter.class})
 public class GoogleSheetsStreamComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GoogleSheetsStreamComponentConfiguration configuration;
+    private final GoogleSheetsStreamComponentConfiguration configuration;
 
     public GoogleSheetsStreamComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.google.sheets.stream.springboot.GoogleSheetsStreamComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-google-speech-to-text-starter/src/main/java/org/apache/camel/component/google/speechtotext/springboot/GoogleCloudSpeechToTextComponentAutoConfiguration.java b/components-starter/camel-google-speech-to-text-starter/src/main/java/org/apache/camel/component/google/speechtotext/springboot/GoogleCloudSpeechToTextComponentAutoConfiguration.java
index c6febd33032..03650697594 100644
--- a/components-starter/camel-google-speech-to-text-starter/src/main/java/org/apache/camel/component/google/speechtotext/springboot/GoogleCloudSpeechToTextComponentAutoConfiguration.java
+++ b/components-starter/camel-google-speech-to-text-starter/src/main/java/org/apache/camel/component/google/speechtotext/springboot/GoogleCloudSpeechToTextComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GoogleCloudSpeechToTextComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.google-speech-to-text"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class GoogleCloudSpeechToTextComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GoogleCloudSpeechToTextComponentConfiguration configuration;
+    private final GoogleCloudSpeechToTextComponentConfiguration configuration;
 
     public GoogleCloudSpeechToTextComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.google.speechtotext.springboot.GoogleCloudSpeechToTextComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-google-storage-starter/src/main/java/org/apache/camel/component/google/storage/springboot/GoogleCloudStorageComponentAutoConfiguration.java b/components-starter/camel-google-storage-starter/src/main/java/org/apache/camel/component/google/storage/springboot/GoogleCloudStorageComponentAutoConfiguration.java
index a4172742301..5ba0ce5d733 100644
--- a/components-starter/camel-google-storage-starter/src/main/java/org/apache/camel/component/google/storage/springboot/GoogleCloudStorageComponentAutoConfiguration.java
+++ b/components-starter/camel-google-storage-starter/src/main/java/org/apache/camel/component/google/storage/springboot/GoogleCloudStorageComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, GoogleCloudStorageComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GoogleCloudStorageComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.google-storage"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, GoogleCloudStorageComponentConverter.class})
 public class GoogleCloudStorageComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GoogleCloudStorageComponentConfiguration configuration;
+    private final GoogleCloudStorageComponentConfiguration configuration;
 
     public GoogleCloudStorageComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.google.storage.springboot.GoogleCloudStorageComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-google-text-to-speech-starter/src/main/java/org/apache/camel/component/google/texttospeech/springboot/GoogleCloudTextToSpeechComponentAutoConfiguration.java b/components-starter/camel-google-text-to-speech-starter/src/main/java/org/apache/camel/component/google/texttospeech/springboot/GoogleCloudTextToSpeechComponentAutoConfiguration.java
index 373da55fa08..3329c0c791d 100644
--- a/components-starter/camel-google-text-to-speech-starter/src/main/java/org/apache/camel/component/google/texttospeech/springboot/GoogleCloudTextToSpeechComponentAutoConfiguration.java
+++ b/components-starter/camel-google-text-to-speech-starter/src/main/java/org/apache/camel/component/google/texttospeech/springboot/GoogleCloudTextToSpeechComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GoogleCloudTextToSpeechComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.google-text-to-speech"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class GoogleCloudTextToSpeechComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GoogleCloudTextToSpeechComponentConfiguration configuration;
+    private final GoogleCloudTextToSpeechComponentConfiguration configuration;
 
     public GoogleCloudTextToSpeechComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.google.texttospeech.springboot.GoogleCloudTextToSpeechComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-google-vertexai-starter/src/main/java/org/apache/camel/component/google/vertexai/springboot/GoogleVertexAIComponentAutoConfiguration.java b/components-starter/camel-google-vertexai-starter/src/main/java/org/apache/camel/component/google/vertexai/springboot/GoogleVertexAIComponentAutoConfiguration.java
index cf8ac5614ec..79edb964047 100644
--- a/components-starter/camel-google-vertexai-starter/src/main/java/org/apache/camel/component/google/vertexai/springboot/GoogleVertexAIComponentAutoConfiguration.java
+++ b/components-starter/camel-google-vertexai-starter/src/main/java/org/apache/camel/component/google/vertexai/springboot/GoogleVertexAIComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, GoogleVertexAIComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GoogleVertexAIComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.google-vertexai"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, GoogleVertexAIComponentConverter.class})
 public class GoogleVertexAIComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GoogleVertexAIComponentConfiguration configuration;
+    private final GoogleVertexAIComponentConfiguration configuration;
 
     public GoogleVertexAIComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.google.vertexai.springboot.GoogleVertexAIComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-google-vision-starter/src/main/java/org/apache/camel/component/google/vision/springboot/GoogleCloudVisionComponentAutoConfiguration.java b/components-starter/camel-google-vision-starter/src/main/java/org/apache/camel/component/google/vision/springboot/GoogleCloudVisionComponentAutoConfiguration.java
index 16b3e0a4bec..eed70cffcf8 100644
--- a/components-starter/camel-google-vision-starter/src/main/java/org/apache/camel/component/google/vision/springboot/GoogleCloudVisionComponentAutoConfiguration.java
+++ b/components-starter/camel-google-vision-starter/src/main/java/org/apache/camel/component/google/vision/springboot/GoogleCloudVisionComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GoogleCloudVisionComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.google-vision"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class GoogleCloudVisionComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GoogleCloudVisionComponentConfiguration configuration;
+    private final GoogleCloudVisionComponentConfiguration configuration;
 
     public GoogleCloudVisionComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.google.vision.springboot.GoogleCloudVisionComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-grape-starter/src/main/java/org/apache/camel/component/grape/springboot/GrapeComponentAutoConfiguration.java b/components-starter/camel-grape-starter/src/main/java/org/apache/camel/component/grape/springboot/GrapeComponentAutoConfiguration.java
index 369def589d0..027b59a4fb8 100644
--- a/components-starter/camel-grape-starter/src/main/java/org/apache/camel/component/grape/springboot/GrapeComponentAutoConfiguration.java
+++ b/components-starter/camel-grape-starter/src/main/java/org/apache/camel/component/grape/springboot/GrapeComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, GrapeComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GrapeComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.grape"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, GrapeComponentConverter.class})
 public class GrapeComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GrapeComponentConfiguration configuration;
+    private final GrapeComponentConfiguration configuration;
 
     public GrapeComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.grape.springboot.GrapeComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-graphql-starter/src/main/java/org/apache/camel/component/graphql/springboot/GraphqlComponentAutoConfiguration.java b/components-starter/camel-graphql-starter/src/main/java/org/apache/camel/component/graphql/springboot/GraphqlComponentAutoConfiguration.java
index 6c7c4eaffae..faed4954096 100644
--- a/components-starter/camel-graphql-starter/src/main/java/org/apache/camel/component/graphql/springboot/GraphqlComponentAutoConfiguration.java
+++ b/components-starter/camel-graphql-starter/src/main/java/org/apache/camel/component/graphql/springboot/GraphqlComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, GraphqlComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GraphqlComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.graphql"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, GraphqlComponentConverter.class})
 public class GraphqlComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GraphqlComponentConfiguration configuration;
+    private final GraphqlComponentConfiguration configuration;
 
     public GraphqlComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.graphql.springboot.GraphqlComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-grok-starter/src/main/java/org/apache/camel/component/grok/springboot/GrokDataFormatAutoConfiguration.java b/components-starter/camel-grok-starter/src/main/java/org/apache/camel/component/grok/springboot/GrokDataFormatAutoConfiguration.java
index 44ccade939e..ecac7e9997f 100644
--- a/components-starter/camel-grok-starter/src/main/java/org/apache/camel/component/grok/springboot/GrokDataFormatAutoConfiguration.java
+++ b/components-starter/camel-grok-starter/src/main/java/org/apache/camel/component/grok/springboot/GrokDataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,GrokDataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.grok"})
 public class GrokDataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GrokDataFormatConfiguration configuration;
+    private final GrokDataFormatConfiguration configuration;
 
     public GrokDataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.grok.springboot.GrokDataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/groovy/json/springboot/GroovyJSonlDataFormatAutoConfiguration.java b/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/groovy/json/springboot/GroovyJSonlDataFormatAutoConfiguration.java
index 6b24239b778..55917030512 100644
--- a/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/groovy/json/springboot/GroovyJSonlDataFormatAutoConfiguration.java
+++ b/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/groovy/json/springboot/GroovyJSonlDataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,GroovyJSonlDataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.groovy-json"})
 public class GroovyJSonlDataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GroovyJSonlDataFormatConfiguration configuration;
+    private final GroovyJSonlDataFormatConfiguration configuration;
 
     public GroovyJSonlDataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.groovy.json.springboot.GroovyJSonlDataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/groovy/xml/springboot/GroovyXmlDataFormatAutoConfiguration.java b/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/groovy/xml/springboot/GroovyXmlDataFormatAutoConfiguration.java
index 713af6e2a22..1e249c5bfaf 100644
--- a/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/groovy/xml/springboot/GroovyXmlDataFormatAutoConfiguration.java
+++ b/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/groovy/xml/springboot/GroovyXmlDataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,GroovyXmlDataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.groovy-xml"})
 public class GroovyXmlDataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GroovyXmlDataFormatConfiguration configuration;
+    private final GroovyXmlDataFormatConfiguration configuration;
 
     public GroovyXmlDataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.groovy.xml.springboot.GroovyXmlDataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/language/groovy/springboot/GroovyLanguageAutoConfiguration.java b/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/language/groovy/springboot/GroovyLanguageAutoConfiguration.java
index 220c428c8f7..c4944034e52 100644
--- a/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/language/groovy/springboot/GroovyLanguageAutoConfiguration.java
+++ b/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/language/groovy/springboot/GroovyLanguageAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({LanguageConfigurationProperties.class,GroovyLanguageConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.language", "camel.language.groovy"})
 public class GroovyLanguageAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GroovyLanguageConfiguration configuration;
+    private final GroovyLanguageConfiguration configuration;
 
     public GroovyLanguageAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.language.groovy.springboot.GroovyLanguageConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-grpc-starter/src/main/java/org/apache/camel/component/grpc/springboot/GrpcComponentAutoConfiguration.java b/components-starter/camel-grpc-starter/src/main/java/org/apache/camel/component/grpc/springboot/GrpcComponentAutoConfiguration.java
index 18de41cb1fa..e114a36d0a8 100644
--- a/components-starter/camel-grpc-starter/src/main/java/org/apache/camel/component/grpc/springboot/GrpcComponentAutoConfiguration.java
+++ b/components-starter/camel-grpc-starter/src/main/java/org/apache/camel/component/grpc/springboot/GrpcComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GrpcComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.grpc"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class GrpcComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GrpcComponentConfiguration configuration;
+    private final GrpcComponentConfiguration configuration;
 
     public GrpcComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.grpc.springboot.GrpcComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java b/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java
index 4956505a5e1..cc4e68da60f 100644
--- a/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java
+++ b/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,GsonDataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.gson"})
 public class GsonDataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GsonDataFormatConfiguration configuration;
+    private final GsonDataFormatConfiguration configuration;
 
     public GsonDataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.gson.springboot.GsonDataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-guava-eventbus-starter/src/main/java/org/apache/camel/component/guava/eventbus/springboot/GuavaEventBusComponentAutoConfiguration.java b/components-starter/camel-guava-eventbus-starter/src/main/java/org/apache/camel/component/guava/eventbus/springboot/GuavaEventBusComponentAutoConfiguration.java
index cd25ddd4c60..f984d68b7a5 100644
--- a/components-starter/camel-guava-eventbus-starter/src/main/java/org/apache/camel/component/guava/eventbus/springboot/GuavaEventBusComponentAutoConfiguration.java
+++ b/components-starter/camel-guava-eventbus-starter/src/main/java/org/apache/camel/component/guava/eventbus/springboot/GuavaEventBusComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, GuavaEventBusComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,GuavaEventBusComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.guava-eventbus"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, GuavaEventBusComponentConverter.class})
 public class GuavaEventBusComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private GuavaEventBusComponentConfiguration configuration;
+    private final GuavaEventBusComponentConfiguration configuration;
 
     public GuavaEventBusComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.guava.eventbus.springboot.GuavaEventBusComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-hashicorp-vault-starter/src/main/java/org/apache/camel/component/hashicorp/vault/springboot/HashicorpVaultComponentAutoConfiguration.java b/components-starter/camel-hashicorp-vault-starter/src/main/java/org/apache/camel/component/hashicorp/vault/springboot/HashicorpVaultComponentAutoConfiguration.java
index 1b7caf1b342..5214a322478 100644
--- a/components-starter/camel-hashicorp-vault-starter/src/main/java/org/apache/camel/component/hashicorp/vault/springboot/HashicorpVaultComponentAutoConfiguration.java
+++ b/components-starter/camel-hashicorp-vault-starter/src/main/java/org/apache/camel/component/hashicorp/vault/springboot/HashicorpVaultComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,HashicorpVaultComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.hashicorp-vault"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
 public class HashicorpVaultComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private HashicorpVaultComponentConfiguration configuration;
+    private final HashicorpVaultComponentConfiguration configuration;
 
     public HashicorpVaultComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.hashicorp.vault.springboot.HashicorpVaultComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/HazelcastAtomicnumberComponentAutoConfiguration.java b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/HazelcastAtomicnumberComponentAutoConfiguration.java
index abfd3930d85..d1075ebb6bc 100644
--- a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/HazelcastAtomicnumberComponentAutoConfiguration.java
+++ b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/HazelcastAtomicnumberComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, HazelcastAtomicnumberComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,HazelcastAtomicnumberComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.hazelcast-atomicvalue"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, HazelcastAtomicnumberComponentConverter.class})
 public class HazelcastAtomicnumberComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private HazelcastAtomicnumberComponentConfiguration configuration;
+    private final HazelcastAtomicnumberComponentConfiguration configuration;
 
     public HazelcastAtomicnumberComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.hazelcast.atomicnumber.springboot.HazelcastAtomicnumberComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/instance/springboot/HazelcastInstanceComponentAutoConfiguration.java b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/instance/springboot/HazelcastInstanceComponentAutoConfiguration.java
index 7de2459b00b..2f23f407ad6 100644
--- a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/instance/springboot/HazelcastInstanceComponentAutoConfiguration.java
+++ b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/instance/springboot/HazelcastInstanceComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, HazelcastInstanceComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,HazelcastInstanceComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.hazelcast-instance"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, HazelcastInstanceComponentConverter.class})
 public class HazelcastInstanceComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private HazelcastInstanceComponentConfiguration configuration;
+    private final HazelcastInstanceComponentConfiguration configuration;
 
     public HazelcastInstanceComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.hazelcast.instance.springboot.HazelcastInstanceComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/list/springboot/HazelcastListComponentAutoConfiguration.java b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/list/springboot/HazelcastListComponentAutoConfiguration.java
index af1b23c671d..88ef62084c2 100644
--- a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/list/springboot/HazelcastListComponentAutoConfiguration.java
+++ b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/list/springboot/HazelcastListComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, HazelcastListComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,HazelcastListComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.hazelcast-list"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, HazelcastListComponentConverter.class})
 public class HazelcastListComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private HazelcastListComponentConfiguration configuration;
+    private final HazelcastListComponentConfiguration configuration;
 
     public HazelcastListComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.hazelcast.list.springboot.HazelcastListComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/map/springboot/HazelcastMapComponentAutoConfiguration.java b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/map/springboot/HazelcastMapComponentAutoConfiguration.java
index 213fb1e8f02..c4bb360b0de 100644
--- a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/map/springboot/HazelcastMapComponentAutoConfiguration.java
+++ b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/map/springboot/HazelcastMapComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, HazelcastMapComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,HazelcastMapComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.hazelcast-map"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, HazelcastMapComponentConverter.class})
 public class HazelcastMapComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private HazelcastMapComponentConfiguration configuration;
+    private final HazelcastMapComponentConfiguration configuration;
 
     public HazelcastMapComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.hazelcast.map.springboot.HazelcastMapComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/multimap/springboot/HazelcastMultimapComponentAutoConfiguration.java b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/multimap/springboot/HazelcastMultimapComponentAutoConfiguration.java
index d5dba7fa4ed..e3d8b429b8b 100644
--- a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/multimap/springboot/HazelcastMultimapComponentAutoConfiguration.java
+++ b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/multimap/springboot/HazelcastMultimapComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, HazelcastMultimapComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,HazelcastMultimapComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.hazelcast-multimap"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, HazelcastMultimapComponentConverter.class})
 public class HazelcastMultimapComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private HazelcastMultimapComponentConfiguration configuration;
+    private final HazelcastMultimapComponentConfiguration configuration;
 
     public HazelcastMultimapComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.hazelcast.multimap.springboot.HazelcastMultimapComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/pncounter/springboot/HazelcastPNCounterComponentAutoConfiguration.java b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/pncounter/springboot/HazelcastPNCounterComponentAutoConfiguration.java
index d3eb9ca0aa0..24634293871 100644
--- a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/pncounter/springboot/HazelcastPNCounterComponentAutoConfiguration.java
+++ b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/pncounter/springboot/HazelcastPNCounterComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, HazelcastPNCounterComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,HazelcastPNCounterComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.hazelcast-pncounter"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, HazelcastPNCounterComponentConverter.class})
 public class HazelcastPNCounterComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private HazelcastPNCounterComponentConfiguration configuration;
+    private final HazelcastPNCounterComponentConfiguration configuration;
 
     public HazelcastPNCounterComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.hazelcast.pncounter.springboot.HazelcastPNCounterComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/queue/springboot/HazelcastQueueComponentAutoConfiguration.java b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/queue/springboot/HazelcastQueueComponentAutoConfiguration.java
index a12dbfdc274..631b5a5ae72 100644
--- a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/queue/springboot/HazelcastQueueComponentAutoConfiguration.java
+++ b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/queue/springboot/HazelcastQueueComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, HazelcastQueueComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,HazelcastQueueComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.hazelcast-queue"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, HazelcastQueueComponentConverter.class})
 public class HazelcastQueueComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private HazelcastQueueComponentConfiguration configuration;
+    private final HazelcastQueueComponentConfiguration configuration;
 
     public HazelcastQueueComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.hazelcast.queue.springboot.HazelcastQueueComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/replicatedmap/springboot/HazelcastReplicatedmapComponentAutoConfiguration.java b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/replicatedmap/springboot/HazelcastReplicatedmapComponentAutoConfiguration.java
index 145faf343ae..2ddbbfcc58f 100644
--- a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/replicatedmap/springboot/HazelcastReplicatedmapComponentAutoConfiguration.java
+++ b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/replicatedmap/springboot/HazelcastReplicatedmapComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, HazelcastReplicatedmapComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,HazelcastReplicatedmapComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.hazelcast-replicatedmap"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, HazelcastReplicatedmapComponentConverter.class})
 public class HazelcastReplicatedmapComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private HazelcastReplicatedmapComponentConfiguration configuration;
+    private final HazelcastReplicatedmapComponentConfiguration configuration;
 
     public HazelcastReplicatedmapComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.hazelcast.replicatedmap.springboot.HazelcastReplicatedmapComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/ringbuffer/springboot/HazelcastRingbufferComponentAutoConfiguration.java b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/ringbuffer/springboot/HazelcastRingbufferComponentAutoConfiguration.java
index b71222d6161..0a1e0399c1c 100644
--- a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/ringbuffer/springboot/HazelcastRingbufferComponentAutoConfiguration.java
+++ b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/ringbuffer/springboot/HazelcastRingbufferComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, HazelcastRingbufferComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,HazelcastRingbufferComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.hazelcast-ringbuffer"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, HazelcastRingbufferComponentConverter.class})
 public class HazelcastRingbufferComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private HazelcastRingbufferComponentConfiguration configuration;
+    private final HazelcastRingbufferComponentConfiguration configuration;
 
     public HazelcastRingbufferComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.hazelcast.ringbuffer.springboot.HazelcastRingbufferComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/seda/springboot/HazelcastSedaComponentAutoConfiguration.java b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/seda/springboot/HazelcastSedaComponentAutoConfiguration.java
index 3880f5ad064..4ab17259ea7 100644
--- a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/seda/springboot/HazelcastSedaComponentAutoConfiguration.java
+++ b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/seda/springboot/HazelcastSedaComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, HazelcastSedaComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,HazelcastSedaComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.hazelcast-seda"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, HazelcastSedaComponentConverter.class})
 public class HazelcastSedaComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private HazelcastSedaComponentConfiguration configuration;
+    private final HazelcastSedaComponentConfiguration configuration;
 
     public HazelcastSedaComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.hazelcast.seda.springboot.HazelcastSedaComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/set/springboot/HazelcastSetComponentAutoConfiguration.java b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/set/springboot/HazelcastSetComponentAutoConfiguration.java
index 16e1f68b1b6..0d6f437b02f 100644
--- a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/set/springboot/HazelcastSetComponentAutoConfiguration.java
+++ b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/set/springboot/HazelcastSetComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, HazelcastSetComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,HazelcastSetComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.hazelcast-set"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, HazelcastSetComponentConverter.class})
 public class HazelcastSetComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private HazelcastSetComponentConfiguration configuration;
+    private final HazelcastSetComponentConfiguration configuration;
 
     public HazelcastSetComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.hazelcast.set.springboot.HazelcastSetComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/topic/springboot/HazelcastTopicComponentAutoConfiguration.java b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/topic/springboot/HazelcastTopicComponentAutoConfiguration.java
index 5e63c08341b..b663a006704 100644
--- a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/topic/springboot/HazelcastTopicComponentAutoConfiguration.java
+++ b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/topic/springboot/HazelcastTopicComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, HazelcastTopicComponentConverter.class})
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,HazelcastTopicComponentConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.component", "camel.component.hazelcast-topic"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, HazelcastTopicComponentConverter.class})
 public class HazelcastTopicComponentAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private HazelcastTopicComponentConfiguration configuration;
+    private final HazelcastTopicComponentConfiguration configuration;
 
     public HazelcastTopicComponentAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.hazelcast.topic.springboot.HazelcastTopicComponentConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java b/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java
index 914e4c2487d..b8fb784b1f9 100644
--- a/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java
+++ b/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,HL7DataFormatConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.hl7"})
 public class HL7DataFormatAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private HL7DataFormatConfiguration configuration;
+    private final HL7DataFormatConfiguration configuration;
 
     public HL7DataFormatAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.hl7.springboot.HL7DataFormatConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/Hl7TerserLanguageAutoConfiguration.java b/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/Hl7TerserLanguageAutoConfiguration.java
index e3d2e49234c..43fbb0709f5 100644
--- a/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/Hl7TerserLanguageAutoConfiguration.java
+++ b/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/Hl7TerserLanguageAutoConfiguration.java
@@ -26,35 +26,34 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfiguration(after = CamelAutoConfiguration.class)
 @Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
 @EnableConfigurationProperties({LanguageConfigurationProperties.class,Hl7TerserLanguageConfiguration.class})
 @ConditionalOnHierarchicalProperties({"camel.language", "camel.language.hl7terser"})
 public class Hl7TerserLanguageAutoConfiguration {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
     private final CamelContext camelContext;
-    @Autowired
-    private Hl7TerserLanguageConfiguration configuration;
+    private final Hl7TerserLanguageConfiguration configuration;
 
     public Hl7TerserLanguageAutoConfiguration(
-            org.apache.camel.CamelContext camelContext) {
+            org.springframework.context.ApplicationContext applicationContext,
+            org.apache.camel.CamelContext camelContext,
+            org.apache.camel.component.hl7.springboot.Hl7TerserLanguageConfiguration configuration) {
+        this.applicationContext = applicationContext;
         this.camelContext = camelContext;
+        this.configuration = configuration;
     }
 
     @Lazy
diff --git a/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java b/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java
index 2386f913982..ab6a845bac6 100644
--- a/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java
+++ b/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java
@@ -26,34 +26,33 @@ import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
 import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
 import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
 /**
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@Configuration(proxyBeanMethods = false)
+@AutoConfiguration(after = {CamelAutoConfiguration.class, HttpComponentConverter.class})
... 13273 lines suppressed ...