This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 352e0e7f93a CAMEL-18933: camel-spring-boot - Adjust auto configuration
to load Spring Boot 3
352e0e7f93a is described below
commit 352e0e7f93abe54ecb5894b545d07f798d1363ad
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Jan 16 14:25:02 2023 +0100
CAMEL-18933: camel-spring-boot - Adjust auto configuration to load Spring
Boot 3
---
...k.boot.autoconfigure.AutoConfiguration.imports} | 19 +----------
...k.boot.autoconfigure.AutoConfiguration.imports} | 39 +++++++++++-----------
2 files changed, 20 insertions(+), 38 deletions(-)
diff --git
a/core/camel-spring-boot-xml/src/main/resources/META-INF/spring.factories
b/core/camel-spring-boot-xml/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 51%
rename from
core/camel-spring-boot-xml/src/main/resources/META-INF/spring.factories
rename to
core/camel-spring-boot-xml/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 13bc9e4ce5c..116ce6f256f 100644
--- a/core/camel-spring-boot-xml/src/main/resources/META-INF/spring.factories
+++
b/core/camel-spring-boot-xml/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -14,22 +14,5 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.spring.boot.xml.CamelXmlAutoConfiguration
+org.apache.camel.spring.boot.xml.CamelXmlAutoConfiguration
\ No newline at end of file
diff --git
a/core/camel-spring-boot/src/main/resources/META-INF/spring.factories
b/core/camel-spring-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 73%
rename from core/camel-spring-boot/src/main/resources/META-INF/spring.factories
rename to
core/camel-spring-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 8819f21b892..eb2fd0f9aed 100644
--- a/core/camel-spring-boot/src/main/resources/META-INF/spring.factories
+++
b/core/camel-spring-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -15,25 +15,24 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.spring.boot.CamelAutoConfiguration,\
-org.apache.camel.spring.boot.actuate.console.CamelDevConsoleAutoConfiguration,\
-org.apache.camel.spring.boot.actuate.endpoint.CamelRouteControllerEndpointAutoConfiguration,\
-org.apache.camel.spring.boot.actuate.endpoint.CamelRoutesEndpointAutoConfiguration,\
-org.apache.camel.spring.boot.actuate.health.CamelHealthCheckAutoConfiguration,\
-org.apache.camel.spring.boot.actuate.info.CamelInfoAutoConfiguration,\
-org.apache.camel.spring.boot.cloud.CamelCloudAutoConfiguration,\
-org.apache.camel.spring.boot.cloud.CamelCloudServiceCallConfigurationAutoConfiguration,\
-org.apache.camel.spring.boot.cloud.CamelCloudServiceDiscoveryAutoConfiguration,\
-org.apache.camel.spring.boot.cloud.CamelCloudServiceFilterAutoConfiguration,\
-org.apache.camel.spring.boot.cloud.CamelCloudServiceChooserAutoConfiguration,\
-org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration,\
-org.apache.camel.spring.boot.properties.PropertiesComponentAutoConfiguration,\
-org.apache.camel.spring.boot.security.CamelSSLAutoConfiguration,\
-org.apache.camel.spring.boot.threadpool.CamelThreadPoolAutoConfiguration,\
-org.apache.camel.spring.boot.routetemplate.CamelRouteTemplateAutoConfiguration,\
-org.apache.camel.spring.boot.vault.AwsVaultAutoConfiguration, \
-org.apache.camel.spring.boot.vault.GcpVaultAutoConfiguration, \
-org.apache.camel.spring.boot.vault.AzureVaultAutoConfiguration, \
+org.apache.camel.spring.boot.CamelAutoConfiguration
+org.apache.camel.spring.boot.actuate.console.CamelDevConsoleAutoConfiguration
+org.apache.camel.spring.boot.actuate.endpoint.CamelRouteControllerEndpointAutoConfiguration
+org.apache.camel.spring.boot.actuate.endpoint.CamelRoutesEndpointAutoConfiguration
+org.apache.camel.spring.boot.actuate.health.CamelHealthCheckAutoConfiguration
+org.apache.camel.spring.boot.actuate.info.CamelInfoAutoConfiguration
+org.apache.camel.spring.boot.cloud.CamelCloudAutoConfiguration
+org.apache.camel.spring.boot.cloud.CamelCloudServiceCallConfigurationAutoConfiguration
+org.apache.camel.spring.boot.cloud.CamelCloudServiceDiscoveryAutoConfiguration
+org.apache.camel.spring.boot.cloud.CamelCloudServiceFilterAutoConfiguration
+org.apache.camel.spring.boot.cloud.CamelCloudServiceChooserAutoConfiguration
+org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration
+org.apache.camel.spring.boot.properties.PropertiesComponentAutoConfiguration
+org.apache.camel.spring.boot.security.CamelSSLAutoConfiguration
+org.apache.camel.spring.boot.threadpool.CamelThreadPoolAutoConfiguration
+org.apache.camel.spring.boot.routetemplate.CamelRouteTemplateAutoConfiguration
+org.apache.camel.spring.boot.vault.AwsVaultAutoConfiguration
+org.apache.camel.spring.boot.vault.GcpVaultAutoConfiguration
+org.apache.camel.spring.boot.vault.AzureVaultAutoConfiguration
org.apache.camel.spring.boot.vault.HashicorpVaultAutoConfiguration
