[camel-spring-boot] branch master updated: CAMEL-14528: Cleanup root and move into sub folders.

[davsclaus]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new db09ad7  CAMEL-14528: Cleanup root and move into sub folders.
db09ad7 is described below

commit db09ad76d28bfda76bd3b98407f4c88b69005fb1
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Feb 10 16:03:34 2020 +0100

    CAMEL-14528: Cleanup root and move into sub folders.
---
 .../camel-spring-boot}/pom.xml                     |  3 +-
 .../src/main/docs/spring-boot.adoc                 |  0
 .../camel/spring/boot/CamelAutoConfiguration.java  |  0
 .../spring/boot/CamelConfigurationProperties.java  |  0
 .../spring/boot/CamelContextConfiguration.java     |  0
 .../camel/spring/boot/CamelMainRunController.java  |  0
 .../boot/CamelSpringBootApplicationController.java |  0
 .../boot/CamelSpringBootApplicationListener.java   |  0
 .../boot/CamelSpringBootBeanPostProcessor.java     |  0
 .../CamelSpringBootInitializationException.java    |  0
 .../boot/ComponentConfigurationProperties.java     |  0
 .../ComponentConfigurationPropertiesCommon.java    |  0
 .../boot/DataFormatConfigurationProperties.java    |  0
 .../DataFormatConfigurationPropertiesCommon.java   |  0
 .../boot/FatJarPackageScanClassResolver.java       |  0
 .../camel/spring/boot/FilePropertySource.java      |  0
 .../boot/LanguageConfigurationProperties.java      |  0
 .../LanguageConfigurationPropertiesCommon.java     |  0
 .../camel/spring/boot/SpringBootCamelContext.java  |  0
 .../spring/boot/SpringBootRoutesCollector.java     |  0
 .../boot/SpringBootXmlCamelContextConfigurer.java  |  0
 .../camel/spring/boot/SpringPropertiesParser.java  |  0
 .../camel/spring/boot/SpringTypeConverter.java     |  0
 ...upervisingRouteControllerAutoConfiguration.java |  0
 .../SupervisingRouteControllerConfiguration.java   |  0
 .../spring/boot/TypeConversionConfiguration.java   |  0
 .../endpoint/CamelRouteControllerEndpoint.java     |  0
 ...elRouteControllerEndpointAutoConfiguration.java |  0
 .../boot/actuate/endpoint/CamelRoutesEndpoint.java |  0
 .../CamelRoutesEndpointAutoConfiguration.java      |  0
 .../endpoint/CamelRoutesEndpointProperties.java    |  0
 .../health/CamelHealthAutoConfiguration.java       |  0
 .../boot/actuate/health/CamelHealthIndicator.java  |  0
 .../actuate/info/CamelInfoAutoConfiguration.java   |  0
 .../boot/actuate/info/CamelInfoContributor.java    |  0
 .../boot/cloud/CamelCloudAutoConfiguration.java    |  0
 .../cloud/CamelCloudConfigurationProperties.java   |  0
 ...dServiceCallConfigurationAutoConfiguration.java |  0
 .../CamelCloudServiceChooserAutoConfiguration.java |  0
 .../boot/cloud/CamelCloudServiceDiscovery.java     |  0
 ...amelCloudServiceDiscoveryAutoConfiguration.java |  0
 .../spring/boot/cloud/CamelCloudServiceFilter.java |  0
 .../CamelCloudServiceFilterAutoConfiguration.java  |  0
 .../ClusteredRouteControllerAutoConfiguration.java |  0
 .../ClusteredRouteControllerConfiguration.java     |  0
 .../health/AbstractHealthCheckConfiguration.java   |  0
 .../health/HealthCheckRoutesAutoConfiguration.java |  0
 .../health/HealthCheckRoutesConfiguration.java     |  0
 .../HealthCheckServiceAutoConfiguration.java       |  0
 .../health/HealthCheckServiceConfiguration.java    |  0
 .../health/HealthCheckVerboseConfiguration.java    |  0
 .../spring/boot/health/HealthConfiguration.java    |  0
 .../camel/spring/boot/health/HealthConstants.java  |  0
 .../camel/spring/boot/model/RouteDetails.java      |  0
 .../camel/spring/boot/model/RouteDetailsInfo.java  |  0
 .../apache/camel/spring/boot/model/RouteInfo.java  |  0
 .../PropertiesComponentAutoConfiguration.java      |  0
 .../PropertiesComponentConfiguration.java          |  0
 .../boot/security/CamelSSLAutoConfiguration.java   |  0
 .../security/CamelSSLConfigurationProperties.java  |  0
 .../spring/boot/util/CamelPropertiesHelper.java    |  0
 .../boot/util/CompositeConversionService.java      |  0
 ...nalOnCamelContextAndAutoConfigurationBeans.java |  0
 .../camel/spring/boot/util/GroupCondition.java     |  0
 .../boot/util/HierarchicalPropertiesEvaluator.java |  0
 .../additional-spring-configuration-metadata.json  |  0
 .../src/main/resources/META-INF/spring.factories   |  0
 .../camel/spring/boot/CamelAnnotationsTest.java    |  0
 .../boot/CamelAutoConfigurationPropertiesTest.java |  0
 .../spring/boot/CamelAutoConfigurationTest.java    |  0
 .../boot/CamelConfigurationLocationsTest.java      |  0
 .../camel/spring/boot/CamelEventNotifierTest.java  |  0
 .../boot/CamelNonInvasiveCamelContextTest.java     |  0
 .../spring/boot/CamelSpringBootShutdownTest.java   |  0
 .../boot/CamelSpringBootTemplateShutdownTest.java  |  0
 .../camel/spring/boot/CamelXmlRoutesTest.java      |  0
 .../boot/CustomCamelCamelConfigurationTest.java    |  0
 .../spring/boot/CustomShutdownStrategyTest.java    |  0
 .../spring/boot/ExistingConversionServiceTest.java |  0
 .../spring/boot/LogListenerDiscoveryTest.java      |  0
 .../apache/camel/spring/boot/NoConvertersTest.java |  0
 .../org/apache/camel/spring/boot/PlainTest.java    |  0
 .../boot/RouteConfigWithCamelContextInjected.java  |  0
 .../spring/boot/SpringConverterDelegationTest.java |  0
 .../camel/spring/boot/SpringTypeConverterTest.java |  0
 .../spring/boot/StartupShutdownOrderTest.java      |  0
 .../SupervisingRouteControllerRestartTest.java     |  0
 .../boot/SupervisingRouteControllerTest.java       |  0
 .../spring/boot/UuidGeneratorDiscoveryTest.java    |  0
 .../spring/boot/XPathPropertyPlaceholderTest.java  |  0
 .../boot/actuate/endpoint/ActuatorTestRoute.java   |  0
 .../CamelEndpointsGloballyDisabledTest.java        |  0
 .../CamelRouteControllerEndpointDisabledTest.java  |  0
 ...erEndpointGloballyDisabledAndReenabledTest.java |  0
 .../endpoint/CamelRouteControllerEndpointTest.java |  0
 .../endpoint/CamelRoutesEndpointDisabledTest.java  |  0
 ...esEndpointGloballyDisabledAndReenabledTest.java |  0
 .../actuate/endpoint/CamelRoutesEndpointTest.java  |  0
 .../CamelRoutesEndpointWriteOperationTest.java     |  0
 .../boot/actuate/health/CamelHealthTest.java       |  0
 .../spring/boot/actuate/health/MyCamelRoute.java   |  0
 .../spring/boot/actuate/info/CamelInfoTest.java    |  0
 .../CamelCloudServiceCallConfigurationTest.java    |  0
 ...melCloudServiceCallGlobalConfigurationTest.java |  0
 .../CamelCloudServiceCallRefExpressionTest.java    |  0
 .../CamelCloudServiceCallSimpleExpressionTest.java |  0
 .../boot/cloud/CamelCloudServiceCallTest.java      |  0
 .../spring/boot/cloud/SpringBootPropertyUtil.java  |  0
 .../spring/boot/componentroute/ComponentRoute.java |  0
 .../boot/componentroute/ComponentRouteTest.java    |  0
 .../camel/spring/boot/dummy/DummyComponent.java    |  0
 .../camel/spring/boot/dummy/DummyConsumer.java     |  0
 .../camel/spring/boot/dummy/DummyEndpoint.java     |  0
 .../spring/boot/example/MyApplicationTest.java     |  0
 .../apache/camel/spring/boot/example/MyRoute.java  |  0
 .../boot/health/HealthCheckRegistryTest.java       |  0
 .../camel/spring/boot/issues/CountryPojo.java      |  0
 .../camel/spring/boot/issues/RestDslPostTest.java  |  0
 .../camel/spring/boot/issues/SimpleOgnlTest.java   |  0
 .../spring/boot/issues/StreamCachingTest.java      |  0
 .../apache/camel/spring/boot/issues/UserPojo.java  |  0
 .../spring/boot/mockendpoints/AdviceWithTest.java  |  0
 .../MockEndpointsAndSkipDirtiesContextTest.java    |  0
 .../boot/mockendpoints/MockEndpointsTest.java      |  0
 .../camel/spring/boot/mockendpoints/MyRoute.java   |  0
 .../boot/parent/SpringBootRefreshContextTest.java  |  0
 .../camel/spring/boot/routefilter/BarRoute.java    |  0
 .../camel/spring/boot/routefilter/BarTest.java     |  0
 .../camel/spring/boot/routefilter/DrinkRoute.java  |  0
 .../routefilter/FooExcludeRouteAnnotationTest.java |  0
 .../camel/spring/boot/routefilter/FooRoute.java    |  0
 .../camel/spring/boot/routefilter/FooTest.java     |  0
 .../security/CamelSSLAutoConfigurationTest.java    |  0
 .../spring/boot/security/CamelSSLNoConfigTest.java |  0
 .../boot/util/CamelPropertiesHelperTest.java       |  0
 .../spring/boot/util/GroupCondition1Test.java      |  0
 .../spring/boot/util/GroupCondition2Test.java      |  0
 .../spring/boot/util/GroupCondition3Test.java      |  0
 .../spring/boot/util/GroupCondition4Test.java      |  0
 .../spring/boot/util/GroupConditionTestBase.java   |  0
 .../util/HierarchicalPropertiesEvaluatorTest.java  |  0
 .../apache/camel/spring/boot/util/MyFooClass.java  |  0
 .../zlast/MixedBootAndXmlConfigurationTest.java    |  0
 .../spring/boot/zlast/MixedJavaDslAndXmlTest.java  |  0
 .../src/test/resources/application.properties      |  0
 .../src/test/resources/camel/camelContext.xml      |  0
 .../src/test/resources/externalCamelContext.xml    |  0
 .../src/test/resources/logback.xml                 |  0
 .../src/test/resources/mixed-camel-context.xml     |  0
 .../src/test/resources/routes/bar.xml              |  0
 .../src/test/resources/routes/foo.xml              |  0
 .../src/test/resources/test-camel-context.xml      |  0
 .../src/test/secret/do-not-tell.properties         |  0
 .../camel-spring-cloud-consul}/pom.xml             |  3 +-
 .../src/main/docs/spring-cloud-consul.adoc         |  0
 .../consul/ConsulServerToServiceDefinition.java    |  0
 ...ServerToServiceDefinitionAutoConfiguration.java |  0
 .../ServiceDefinitionToConsulRegistration.java     |  0
 ...itionToConsulRegistrationAutoConfiguration.java |  0
 .../src/main/resources/META-INF/spring.factories   |  0
 .../CamelCloudConsulAutoConfigurationTest.java     |  0
 .../CamelCloudConsulServiceRegistryTest.java       |  0
 .../src/test/resources/logback.xml                 |  0
 .../camel-spring-cloud-netflix}/pom.xml            |  3 +-
 .../src/main/docs/spring-cloud-netflix.adoc        |  0
 .../CamelCloudNetflixAutoConfiguration.java        |  0
 .../cloud/netflix/CamelCloudNetflixServerList.java |  0
 .../CamelCloudNetflixServiceLoadBalancer.java      |  0
 ...etflixServiceLoadBalancerAutoConfiguration.java |  0
 .../src/main/resources/META-INF/spring.factories   |  0
 ...ixServiceLoadBalancerAutoConfigurationTest.java |  0
 .../src/test/resources/logback.xml                 |  0
 .../camel-spring-cloud-zookeeper}/pom.xml          |  3 +-
 .../src/main/docs/spring-cloud-zookeeper.adoc      |  0
 .../ServiceDefinitionToZookeeperRegistration.java  |  0
 ...onToZookeeperRegistrationAutoConfiguration.java |  0
 .../ZookeeperServerToServiceDefinition.java        |  0
 ...keeperToServiceDefinitionAutoConfiguration.java |  0
 .../src/main/resources/META-INF/spring.factories   |  0
 .../CamelCloudZookeeperAutoConfigurationTest.java  |  0
 .../CamelCloudZookeeperServiceRegistryTest.java    |  0
 .../cloud/zookeeper/support/ZookeeperServer.java   |  0
 .../src/test/resources/logback.xml                 |  0
 .../camel-spring-cloud}/pom.xml                    |  3 +-
 .../src/main/docs/spring-cloud.adoc                |  0
 .../cloud/CamelSpringCloudDiscoveryClient.java     |  0
 ...pringCloudDiscoveryClientAutoConfiguration.java |  0
 .../cloud/CamelSpringCloudServiceDiscovery.java    |  0
 ...ringCloudServiceDiscoveryAutoConfiguration.java |  0
 .../cloud/CamelSpringCloudServiceLoadBalancer.java |  0
 ...gCloudServiceLoadBalancerAutoConfiguration.java |  0
 .../cloud/CamelSpringCloudServiceRegistry.java     |  0
 ...pringCloudServiceRegistryAutoConfiguration.java |  0
 .../cloud/DefaultLoadBalancerClientAdapter.java    |  0
 .../spring/cloud/DefaultServiceLoadBalancer.java   |  0
 .../src/main/resources/META-INF/spring.factories   |  0
 .../CamelSpringCloudServiceCallRibbonTest.java     |  0
 .../cloud/CamelSpringCloudServiceRegistryTest.java |  0
 .../src/test/resources/logback.xml                 |  0
 core/pom.xml                                       | 45 ++++++++++++++++++++++
 pom.xml                                            |  6 +--
 201 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/camel-spring-boot/pom.xml b/core/camel-spring-boot/pom.xml
similarity index 98%
rename from camel-spring-boot/pom.xml
rename to core/camel-spring-boot/pom.xml
index 02f7e0d..8f175cc 100644
--- a/camel-spring-boot/pom.xml
+++ b/core/camel-spring-boot/pom.xml
@@ -24,8 +24,9 @@
 
     <parent>
         <groupId>org.apache.camel.springboot</groupId>
-        <artifactId>spring-boot</artifactId>
+        <artifactId>core-modules</artifactId>
         <version>3.1.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
     <name>Camel SB :: Spring Boot Component</name>
diff --git a/camel-spring-boot/src/main/docs/spring-boot.adoc 
b/core/camel-spring-boot/src/main/docs/spring-boot.adoc
similarity index 100%
rename from camel-spring-boot/src/main/docs/spring-boot.adoc
rename to core/camel-spring-boot/src/main/docs/spring-boot.adoc
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelContextConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelContextConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelContextConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelContextConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelMainRunController.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelMainRunController.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelMainRunController.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelMainRunController.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationController.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationListener.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationListener.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationListener.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationListener.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootBeanPostProcessor.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootBeanPostProcessor.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootBeanPostProcessor.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootBeanPostProcessor.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootInitializationException.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootInitializationException.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootInitializationException.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootInitializationException.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/ComponentConfigurationProperties.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/ComponentConfigurationProperties.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/ComponentConfigurationProperties.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/ComponentConfigurationProperties.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/ComponentConfigurationPropertiesCommon.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/ComponentConfigurationPropertiesCommon.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/ComponentConfigurationPropertiesCommon.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/ComponentConfigurationPropertiesCommon.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/DataFormatConfigurationProperties.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/DataFormatConfigurationProperties.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/DataFormatConfigurationProperties.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/DataFormatConfigurationProperties.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/DataFormatConfigurationPropertiesCommon.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/DataFormatConfigurationPropertiesCommon.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/DataFormatConfigurationPropertiesCommon.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/DataFormatConfigurationPropertiesCommon.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FilePropertySource.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FilePropertySource.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FilePropertySource.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FilePropertySource.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/LanguageConfigurationProperties.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/LanguageConfigurationProperties.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/LanguageConfigurationProperties.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/LanguageConfigurationProperties.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/LanguageConfigurationPropertiesCommon.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/LanguageConfigurationPropertiesCommon.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/LanguageConfigurationPropertiesCommon.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/LanguageConfigurationPropertiesCommon.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringBootCamelContext.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringBootCamelContext.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringBootCamelContext.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringBootCamelContext.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringBootRoutesCollector.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringBootRoutesCollector.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringBootRoutesCollector.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringBootRoutesCollector.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringBootXmlCamelContextConfigurer.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringBootXmlCamelContextConfigurer.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringBootXmlCamelContextConfigurer.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringBootXmlCamelContextConfigurer.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringPropertiesParser.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringPropertiesParser.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringPropertiesParser.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringPropertiesParser.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SupervisingRouteControllerAutoConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SupervisingRouteControllerAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SupervisingRouteControllerAutoConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SupervisingRouteControllerAutoConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SupervisingRouteControllerConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SupervisingRouteControllerConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SupervisingRouteControllerConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SupervisingRouteControllerConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/TypeConversionConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/TypeConversionConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/TypeConversionConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/TypeConversionConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpoint.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpoint.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpoint.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpoint.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointAutoConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointAutoConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointAutoConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointAutoConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointAutoConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointAutoConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointProperties.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointProperties.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointProperties.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointProperties.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthAutoConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthAutoConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthAutoConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthIndicator.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthIndicator.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthIndicator.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthIndicator.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/info/CamelInfoAutoConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/info/CamelInfoAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/info/CamelInfoAutoConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/info/CamelInfoAutoConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/info/CamelInfoContributor.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/info/CamelInfoContributor.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/info/CamelInfoContributor.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/info/CamelInfoContributor.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudAutoConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudAutoConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudAutoConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudConfigurationProperties.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudConfigurationProperties.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudConfigurationProperties.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudConfigurationProperties.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationAutoConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationAutoConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationAutoConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceChooserAutoConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceChooserAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceChooserAutoConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceChooserAutoConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscovery.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscovery.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscovery.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscovery.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscoveryAutoConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscoveryAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscoveryAutoConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscoveryAutoConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilter.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilter.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilter.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilter.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilterAutoConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilterAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilterAutoConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilterAutoConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/AbstractHealthCheckConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/AbstractHealthCheckConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/AbstractHealthCheckConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/AbstractHealthCheckConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckRoutesAutoConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckRoutesAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckRoutesAutoConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckRoutesAutoConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckRoutesConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckRoutesConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckRoutesConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckRoutesConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckServiceAutoConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckServiceAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckServiceAutoConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckServiceAutoConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckServiceConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckServiceConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckServiceConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckServiceConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckVerboseConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckVerboseConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckVerboseConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckVerboseConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthConstants.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthConstants.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthConstants.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthConstants.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/model/RouteDetails.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/model/RouteDetails.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/model/RouteDetails.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/model/RouteDetails.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/model/RouteDetailsInfo.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/model/RouteDetailsInfo.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/model/RouteDetailsInfo.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/model/RouteDetailsInfo.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/model/RouteInfo.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/model/RouteInfo.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/model/RouteInfo.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/model/RouteInfo.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentAutoConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentAutoConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentAutoConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfiguration.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfiguration.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfiguration.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLConfigurationProperties.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLConfigurationProperties.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLConfigurationProperties.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLConfigurationProperties.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/CamelPropertiesHelper.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/CamelPropertiesHelper.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/CamelPropertiesHelper.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/CamelPropertiesHelper.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/CompositeConversionService.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/CompositeConversionService.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/CompositeConversionService.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/CompositeConversionService.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/ConditionalOnCamelContextAndAutoConfigurationBeans.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/ConditionalOnCamelContextAndAutoConfigurationBeans.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/ConditionalOnCamelContextAndAutoConfigurationBeans.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/ConditionalOnCamelContextAndAutoConfigurationBeans.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/GroupCondition.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/GroupCondition.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/GroupCondition.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/GroupCondition.java
diff --git 
a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/HierarchicalPropertiesEvaluator.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/HierarchicalPropertiesEvaluator.java
similarity index 100%
rename from 
camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/HierarchicalPropertiesEvaluator.java
rename to 
core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/HierarchicalPropertiesEvaluator.java
diff --git 
a/camel-spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
 
b/core/camel-spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
similarity index 100%
rename from 
camel-spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
rename to 
core/camel-spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
diff --git a/camel-spring-boot/src/main/resources/META-INF/spring.factories 
b/core/camel-spring-boot/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from camel-spring-boot/src/main/resources/META-INF/spring.factories
rename to core/camel-spring-boot/src/main/resources/META-INF/spring.factories
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAnnotationsTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAnnotationsTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAnnotationsTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAnnotationsTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationPropertiesTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationPropertiesTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationPropertiesTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationPropertiesTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelConfigurationLocationsTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelConfigurationLocationsTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelConfigurationLocationsTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelConfigurationLocationsTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelEventNotifierTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelEventNotifierTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelEventNotifierTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelEventNotifierTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelNonInvasiveCamelContextTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelNonInvasiveCamelContextTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelNonInvasiveCamelContextTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelNonInvasiveCamelContextTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootShutdownTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootShutdownTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootShutdownTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootShutdownTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootTemplateShutdownTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootTemplateShutdownTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootTemplateShutdownTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootTemplateShutdownTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelXmlRoutesTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelXmlRoutesTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelXmlRoutesTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelXmlRoutesTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomCamelCamelConfigurationTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomCamelCamelConfigurationTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomCamelCamelConfigurationTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomCamelCamelConfigurationTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomShutdownStrategyTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomShutdownStrategyTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomShutdownStrategyTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomShutdownStrategyTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ExistingConversionServiceTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ExistingConversionServiceTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ExistingConversionServiceTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ExistingConversionServiceTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/LogListenerDiscoveryTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/LogListenerDiscoveryTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/LogListenerDiscoveryTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/LogListenerDiscoveryTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/NoConvertersTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/NoConvertersTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/NoConvertersTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/NoConvertersTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/PlainTest.java 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/PlainTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/PlainTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/PlainTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/RouteConfigWithCamelContextInjected.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/RouteConfigWithCamelContextInjected.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/RouteConfigWithCamelContextInjected.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/RouteConfigWithCamelContextInjected.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringConverterDelegationTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringConverterDelegationTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringConverterDelegationTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringConverterDelegationTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/StartupShutdownOrderTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/StartupShutdownOrderTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/StartupShutdownOrderTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/StartupShutdownOrderTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/UuidGeneratorDiscoveryTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/UuidGeneratorDiscoveryTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/UuidGeneratorDiscoveryTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/UuidGeneratorDiscoveryTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/XPathPropertyPlaceholderTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/XPathPropertyPlaceholderTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/XPathPropertyPlaceholderTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/XPathPropertyPlaceholderTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/ActuatorTestRoute.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/ActuatorTestRoute.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/ActuatorTestRoute.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/ActuatorTestRoute.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelEndpointsGloballyDisabledTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelEndpointsGloballyDisabledTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelEndpointsGloballyDisabledTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelEndpointsGloballyDisabledTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointDisabledTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointDisabledTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointDisabledTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointDisabledTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointGloballyDisabledAndReenabledTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointGloballyDisabledAndReenabledTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointGloballyDisabledAndReenabledTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointGloballyDisabledAndReenabledTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointDisabledTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointDisabledTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointDisabledTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointDisabledTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointGloballyDisabledAndReenabledTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointGloballyDisabledAndReenabledTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointGloballyDisabledAndReenabledTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointGloballyDisabledAndReenabledTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointWriteOperationTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointWriteOperationTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointWriteOperationTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointWriteOperationTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/MyCamelRoute.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/MyCamelRoute.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/MyCamelRoute.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/MyCamelRoute.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/info/CamelInfoTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/info/CamelInfoTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/info/CamelInfoTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/info/CamelInfoTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallGlobalConfigurationTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallGlobalConfigurationTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallGlobalConfigurationTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallGlobalConfigurationTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallRefExpressionTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallRefExpressionTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallRefExpressionTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallRefExpressionTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallSimpleExpressionTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallSimpleExpressionTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallSimpleExpressionTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallSimpleExpressionTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/SpringBootPropertyUtil.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/SpringBootPropertyUtil.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/SpringBootPropertyUtil.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/SpringBootPropertyUtil.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/componentroute/ComponentRoute.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/componentroute/ComponentRoute.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/componentroute/ComponentRoute.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/componentroute/ComponentRoute.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/componentroute/ComponentRouteTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/componentroute/ComponentRouteTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/componentroute/ComponentRouteTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/componentroute/ComponentRouteTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/dummy/DummyComponent.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/dummy/DummyComponent.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/dummy/DummyComponent.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/dummy/DummyComponent.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/dummy/DummyConsumer.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/dummy/DummyConsumer.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/dummy/DummyConsumer.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/dummy/DummyConsumer.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/dummy/DummyEndpoint.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/dummy/DummyEndpoint.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/dummy/DummyEndpoint.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/dummy/DummyEndpoint.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/example/MyApplicationTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/example/MyApplicationTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/example/MyApplicationTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/example/MyApplicationTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/example/MyRoute.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/example/MyRoute.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/example/MyRoute.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/example/MyRoute.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/health/HealthCheckRegistryTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/health/HealthCheckRegistryTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/health/HealthCheckRegistryTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/health/HealthCheckRegistryTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/CountryPojo.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/CountryPojo.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/CountryPojo.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/CountryPojo.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/SimpleOgnlTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/SimpleOgnlTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/SimpleOgnlTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/SimpleOgnlTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/StreamCachingTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/StreamCachingTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/StreamCachingTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/StreamCachingTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/UserPojo.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/UserPojo.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/UserPojo.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/UserPojo.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsAndSkipDirtiesContextTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsAndSkipDirtiesContextTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsAndSkipDirtiesContextTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsAndSkipDirtiesContextTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MyRoute.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MyRoute.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MyRoute.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MyRoute.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/parent/SpringBootRefreshContextTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/parent/SpringBootRefreshContextTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/parent/SpringBootRefreshContextTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/parent/SpringBootRefreshContextTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/BarRoute.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/BarRoute.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/BarRoute.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/BarRoute.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/BarTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/BarTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/BarTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/BarTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/DrinkRoute.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/DrinkRoute.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/DrinkRoute.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/DrinkRoute.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooExcludeRouteAnnotationTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooExcludeRouteAnnotationTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooExcludeRouteAnnotationTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooExcludeRouteAnnotationTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooRoute.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooRoute.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooRoute.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooRoute.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/routefilter/FooTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfigurationTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfigurationTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfigurationTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfigurationTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/security/CamelSSLNoConfigTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/security/CamelSSLNoConfigTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/security/CamelSSLNoConfigTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/security/CamelSSLNoConfigTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/CamelPropertiesHelperTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/CamelPropertiesHelperTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/CamelPropertiesHelperTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/CamelPropertiesHelperTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition1Test.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition1Test.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition1Test.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition1Test.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition2Test.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition2Test.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition2Test.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition2Test.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition3Test.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition3Test.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition3Test.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition3Test.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition4Test.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition4Test.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition4Test.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition4Test.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupConditionTestBase.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupConditionTestBase.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupConditionTestBase.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupConditionTestBase.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/HierarchicalPropertiesEvaluatorTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/HierarchicalPropertiesEvaluatorTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/HierarchicalPropertiesEvaluatorTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/HierarchicalPropertiesEvaluatorTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/MyFooClass.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/MyFooClass.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/MyFooClass.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/MyFooClass.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/zlast/MixedBootAndXmlConfigurationTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/zlast/MixedBootAndXmlConfigurationTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/zlast/MixedBootAndXmlConfigurationTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/zlast/MixedBootAndXmlConfigurationTest.java
diff --git 
a/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/zlast/MixedJavaDslAndXmlTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/zlast/MixedJavaDslAndXmlTest.java
similarity index 100%
rename from 
camel-spring-boot/src/test/java/org/apache/camel/spring/boot/zlast/MixedJavaDslAndXmlTest.java
rename to 
core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/zlast/MixedJavaDslAndXmlTest.java
diff --git a/camel-spring-boot/src/test/resources/application.properties 
b/core/camel-spring-boot/src/test/resources/application.properties
similarity index 100%
rename from camel-spring-boot/src/test/resources/application.properties
rename to core/camel-spring-boot/src/test/resources/application.properties
diff --git a/camel-spring-boot/src/test/resources/camel/camelContext.xml 
b/core/camel-spring-boot/src/test/resources/camel/camelContext.xml
similarity index 100%
rename from camel-spring-boot/src/test/resources/camel/camelContext.xml
rename to core/camel-spring-boot/src/test/resources/camel/camelContext.xml
diff --git a/camel-spring-boot/src/test/resources/externalCamelContext.xml 
b/core/camel-spring-boot/src/test/resources/externalCamelContext.xml
similarity index 100%
rename from camel-spring-boot/src/test/resources/externalCamelContext.xml
rename to core/camel-spring-boot/src/test/resources/externalCamelContext.xml
diff --git a/camel-spring-boot/src/test/resources/logback.xml 
b/core/camel-spring-boot/src/test/resources/logback.xml
similarity index 100%
rename from camel-spring-boot/src/test/resources/logback.xml
rename to core/camel-spring-boot/src/test/resources/logback.xml
diff --git a/camel-spring-boot/src/test/resources/mixed-camel-context.xml 
b/core/camel-spring-boot/src/test/resources/mixed-camel-context.xml
similarity index 100%
rename from camel-spring-boot/src/test/resources/mixed-camel-context.xml
rename to core/camel-spring-boot/src/test/resources/mixed-camel-context.xml
diff --git a/camel-spring-boot/src/test/resources/routes/bar.xml 
b/core/camel-spring-boot/src/test/resources/routes/bar.xml
similarity index 100%
rename from camel-spring-boot/src/test/resources/routes/bar.xml
rename to core/camel-spring-boot/src/test/resources/routes/bar.xml
diff --git a/camel-spring-boot/src/test/resources/routes/foo.xml 
b/core/camel-spring-boot/src/test/resources/routes/foo.xml
similarity index 100%
rename from camel-spring-boot/src/test/resources/routes/foo.xml
rename to core/camel-spring-boot/src/test/resources/routes/foo.xml
diff --git a/camel-spring-boot/src/test/resources/test-camel-context.xml 
b/core/camel-spring-boot/src/test/resources/test-camel-context.xml
similarity index 100%
rename from camel-spring-boot/src/test/resources/test-camel-context.xml
rename to core/camel-spring-boot/src/test/resources/test-camel-context.xml
diff --git a/camel-spring-boot/src/test/secret/do-not-tell.properties 
b/core/camel-spring-boot/src/test/secret/do-not-tell.properties
similarity index 100%
rename from camel-spring-boot/src/test/secret/do-not-tell.properties
rename to core/camel-spring-boot/src/test/secret/do-not-tell.properties
diff --git a/camel-spring-cloud-consul/pom.xml 
b/core/camel-spring-cloud-consul/pom.xml
similarity index 98%
rename from camel-spring-cloud-consul/pom.xml
rename to core/camel-spring-cloud-consul/pom.xml
index c0de8ba..1407dfa 100644
--- a/camel-spring-cloud-consul/pom.xml
+++ b/core/camel-spring-cloud-consul/pom.xml
@@ -23,8 +23,9 @@
 
     <parent>
         <groupId>org.apache.camel.springboot</groupId>
-        <artifactId>spring-boot</artifactId>
+        <artifactId>core-modules</artifactId>
         <version>3.1.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
     <name>Camel SB :: Spring Cloud Consul</name>
diff --git a/camel-spring-cloud-consul/src/main/docs/spring-cloud-consul.adoc 
b/core/camel-spring-cloud-consul/src/main/docs/spring-cloud-consul.adoc
similarity index 100%
rename from camel-spring-cloud-consul/src/main/docs/spring-cloud-consul.adoc
rename to core/camel-spring-cloud-consul/src/main/docs/spring-cloud-consul.adoc
diff --git 
a/camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ConsulServerToServiceDefinition.java
 
b/core/camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ConsulServerToServiceDefinition.java
similarity index 100%
rename from 
camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ConsulServerToServiceDefinition.java
rename to 
core/camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ConsulServerToServiceDefinition.java
diff --git 
a/camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ConsulServerToServiceDefinitionAutoConfiguration.java
 
b/core/camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ConsulServerToServiceDefinitionAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ConsulServerToServiceDefinitionAutoConfiguration.java
rename to 
core/camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ConsulServerToServiceDefinitionAutoConfiguration.java
diff --git 
a/camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ServiceDefinitionToConsulRegistration.java
 
b/core/camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ServiceDefinitionToConsulRegistration.java
similarity index 100%
rename from 
camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ServiceDefinitionToConsulRegistration.java
rename to 
core/camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ServiceDefinitionToConsulRegistration.java
diff --git 
a/camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ServiceDefinitionToConsulRegistrationAutoConfiguration.java
 
b/core/camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ServiceDefinitionToConsulRegistrationAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ServiceDefinitionToConsulRegistrationAutoConfiguration.java
rename to 
core/camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ServiceDefinitionToConsulRegistrationAutoConfiguration.java
diff --git 
a/camel-spring-cloud-consul/src/main/resources/META-INF/spring.factories 
b/core/camel-spring-cloud-consul/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from 
camel-spring-cloud-consul/src/main/resources/META-INF/spring.factories
rename to 
core/camel-spring-cloud-consul/src/main/resources/META-INF/spring.factories
diff --git 
a/camel-spring-cloud-consul/src/test/java/org/apache/camel/spring/cloud/consul/CamelCloudConsulAutoConfigurationTest.java
 
b/core/camel-spring-cloud-consul/src/test/java/org/apache/camel/spring/cloud/consul/CamelCloudConsulAutoConfigurationTest.java
similarity index 100%
rename from 
camel-spring-cloud-consul/src/test/java/org/apache/camel/spring/cloud/consul/CamelCloudConsulAutoConfigurationTest.java
rename to 
core/camel-spring-cloud-consul/src/test/java/org/apache/camel/spring/cloud/consul/CamelCloudConsulAutoConfigurationTest.java
diff --git 
a/camel-spring-cloud-consul/src/test/java/org/apache/camel/spring/cloud/consul/CamelCloudConsulServiceRegistryTest.java
 
b/core/camel-spring-cloud-consul/src/test/java/org/apache/camel/spring/cloud/consul/CamelCloudConsulServiceRegistryTest.java
similarity index 100%
rename from 
camel-spring-cloud-consul/src/test/java/org/apache/camel/spring/cloud/consul/CamelCloudConsulServiceRegistryTest.java
rename to 
core/camel-spring-cloud-consul/src/test/java/org/apache/camel/spring/cloud/consul/CamelCloudConsulServiceRegistryTest.java
diff --git a/camel-spring-cloud-consul/src/test/resources/logback.xml 
b/core/camel-spring-cloud-consul/src/test/resources/logback.xml
similarity index 100%
rename from camel-spring-cloud-consul/src/test/resources/logback.xml
rename to core/camel-spring-cloud-consul/src/test/resources/logback.xml
diff --git a/camel-spring-cloud-netflix/pom.xml 
b/core/camel-spring-cloud-netflix/pom.xml
similarity index 98%
rename from camel-spring-cloud-netflix/pom.xml
rename to core/camel-spring-cloud-netflix/pom.xml
index 65d2c01..e182e2c 100644
--- a/camel-spring-cloud-netflix/pom.xml
+++ b/core/camel-spring-cloud-netflix/pom.xml
@@ -23,8 +23,9 @@
 
     <parent>
         <groupId>org.apache.camel.springboot</groupId>
-        <artifactId>spring-boot</artifactId>
+        <artifactId>core-modules</artifactId>
         <version>3.1.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
     <name>Camel SB :: Spring Cloud Netflix</name>
diff --git a/camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc 
b/core/camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc
similarity index 100%
rename from camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc
rename to 
core/camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc
diff --git 
a/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixAutoConfiguration.java
 
b/core/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixAutoConfiguration.java
rename to 
core/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixAutoConfiguration.java
diff --git 
a/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServerList.java
 
b/core/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServerList.java
similarity index 100%
rename from 
camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServerList.java
rename to 
core/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServerList.java
diff --git 
a/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceLoadBalancer.java
 
b/core/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceLoadBalancer.java
similarity index 100%
rename from 
camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceLoadBalancer.java
rename to 
core/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceLoadBalancer.java
diff --git 
a/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceLoadBalancerAutoConfiguration.java
 
b/core/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceLoadBalancerAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceLoadBalancerAutoConfiguration.java
rename to 
core/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceLoadBalancerAutoConfiguration.java
diff --git 
a/camel-spring-cloud-netflix/src/main/resources/META-INF/spring.factories 
b/core/camel-spring-cloud-netflix/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from 
camel-spring-cloud-netflix/src/main/resources/META-INF/spring.factories
rename to 
core/camel-spring-cloud-netflix/src/main/resources/META-INF/spring.factories
diff --git 
a/camel-spring-cloud-netflix/src/test/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceLoadBalancerAutoConfigurationTest.java
 
b/core/camel-spring-cloud-netflix/src/test/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceLoadBalancerAutoConfigurationTest.java
similarity index 100%
rename from 
camel-spring-cloud-netflix/src/test/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceLoadBalancerAutoConfigurationTest.java
rename to 
core/camel-spring-cloud-netflix/src/test/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceLoadBalancerAutoConfigurationTest.java
diff --git a/camel-spring-cloud-netflix/src/test/resources/logback.xml 
b/core/camel-spring-cloud-netflix/src/test/resources/logback.xml
similarity index 100%
rename from camel-spring-cloud-netflix/src/test/resources/logback.xml
rename to core/camel-spring-cloud-netflix/src/test/resources/logback.xml
diff --git a/camel-spring-cloud-zookeeper/pom.xml 
b/core/camel-spring-cloud-zookeeper/pom.xml
similarity index 98%
rename from camel-spring-cloud-zookeeper/pom.xml
rename to core/camel-spring-cloud-zookeeper/pom.xml
index 602d18a..277c47c 100644
--- a/camel-spring-cloud-zookeeper/pom.xml
+++ b/core/camel-spring-cloud-zookeeper/pom.xml
@@ -23,8 +23,9 @@
 
     <parent>
         <groupId>org.apache.camel.springboot</groupId>
-        <artifactId>spring-boot</artifactId>
+        <artifactId>core-modules</artifactId>
         <version>3.1.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
     <name>Camel SB :: Spring Cloud Zookeeper</name>
diff --git 
a/camel-spring-cloud-zookeeper/src/main/docs/spring-cloud-zookeeper.adoc 
b/core/camel-spring-cloud-zookeeper/src/main/docs/spring-cloud-zookeeper.adoc
similarity index 100%
rename from 
camel-spring-cloud-zookeeper/src/main/docs/spring-cloud-zookeeper.adoc
rename to 
core/camel-spring-cloud-zookeeper/src/main/docs/spring-cloud-zookeeper.adoc
diff --git 
a/camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ServiceDefinitionToZookeeperRegistration.java
 
b/core/camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ServiceDefinitionToZookeeperRegistration.java
similarity index 100%
rename from 
camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ServiceDefinitionToZookeeperRegistration.java
rename to 
core/camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ServiceDefinitionToZookeeperRegistration.java
diff --git 
a/camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ServiceDefinitionToZookeeperRegistrationAutoConfiguration.java
 
b/core/camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ServiceDefinitionToZookeeperRegistrationAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ServiceDefinitionToZookeeperRegistrationAutoConfiguration.java
rename to 
core/camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ServiceDefinitionToZookeeperRegistrationAutoConfiguration.java
diff --git 
a/camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ZookeeperServerToServiceDefinition.java
 
b/core/camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ZookeeperServerToServiceDefinition.java
similarity index 100%
rename from 
camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ZookeeperServerToServiceDefinition.java
rename to 
core/camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ZookeeperServerToServiceDefinition.java
diff --git 
a/camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ZookeeperToServiceDefinitionAutoConfiguration.java
 
b/core/camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ZookeeperToServiceDefinitionAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ZookeeperToServiceDefinitionAutoConfiguration.java
rename to 
core/camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ZookeeperToServiceDefinitionAutoConfiguration.java
diff --git 
a/camel-spring-cloud-zookeeper/src/main/resources/META-INF/spring.factories 
b/core/camel-spring-cloud-zookeeper/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from 
camel-spring-cloud-zookeeper/src/main/resources/META-INF/spring.factories
rename to 
core/camel-spring-cloud-zookeeper/src/main/resources/META-INF/spring.factories
diff --git 
a/camel-spring-cloud-zookeeper/src/test/java/org/apache/camel/spring/cloud/zookeeper/CamelCloudZookeeperAutoConfigurationTest.java
 
b/core/camel-spring-cloud-zookeeper/src/test/java/org/apache/camel/spring/cloud/zookeeper/CamelCloudZookeeperAutoConfigurationTest.java
similarity index 100%
rename from 
camel-spring-cloud-zookeeper/src/test/java/org/apache/camel/spring/cloud/zookeeper/CamelCloudZookeeperAutoConfigurationTest.java
rename to 
core/camel-spring-cloud-zookeeper/src/test/java/org/apache/camel/spring/cloud/zookeeper/CamelCloudZookeeperAutoConfigurationTest.java
diff --git 
a/camel-spring-cloud-zookeeper/src/test/java/org/apache/camel/spring/cloud/zookeeper/CamelCloudZookeeperServiceRegistryTest.java
 
b/core/camel-spring-cloud-zookeeper/src/test/java/org/apache/camel/spring/cloud/zookeeper/CamelCloudZookeeperServiceRegistryTest.java
similarity index 100%
rename from 
camel-spring-cloud-zookeeper/src/test/java/org/apache/camel/spring/cloud/zookeeper/CamelCloudZookeeperServiceRegistryTest.java
rename to 
core/camel-spring-cloud-zookeeper/src/test/java/org/apache/camel/spring/cloud/zookeeper/CamelCloudZookeeperServiceRegistryTest.java
diff --git 
a/camel-spring-cloud-zookeeper/src/test/java/org/apache/camel/spring/cloud/zookeeper/support/ZookeeperServer.java
 
b/core/camel-spring-cloud-zookeeper/src/test/java/org/apache/camel/spring/cloud/zookeeper/support/ZookeeperServer.java
similarity index 100%
rename from 
camel-spring-cloud-zookeeper/src/test/java/org/apache/camel/spring/cloud/zookeeper/support/ZookeeperServer.java
rename to 
core/camel-spring-cloud-zookeeper/src/test/java/org/apache/camel/spring/cloud/zookeeper/support/ZookeeperServer.java
diff --git a/camel-spring-cloud-zookeeper/src/test/resources/logback.xml 
b/core/camel-spring-cloud-zookeeper/src/test/resources/logback.xml
similarity index 100%
rename from camel-spring-cloud-zookeeper/src/test/resources/logback.xml
rename to core/camel-spring-cloud-zookeeper/src/test/resources/logback.xml
diff --git a/camel-spring-cloud/pom.xml b/core/camel-spring-cloud/pom.xml
similarity index 98%
rename from camel-spring-cloud/pom.xml
rename to core/camel-spring-cloud/pom.xml
index 8166f71..c39f95d 100644
--- a/camel-spring-cloud/pom.xml
+++ b/core/camel-spring-cloud/pom.xml
@@ -23,8 +23,9 @@
 
     <parent>
         <groupId>org.apache.camel.springboot</groupId>
-        <artifactId>spring-boot</artifactId>
+        <artifactId>core-modules</artifactId>
         <version>3.1.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
     <name>Camel SB :: Spring Cloud</name>
diff --git a/camel-spring-cloud/src/main/docs/spring-cloud.adoc 
b/core/camel-spring-cloud/src/main/docs/spring-cloud.adoc
similarity index 100%
rename from camel-spring-cloud/src/main/docs/spring-cloud.adoc
rename to core/camel-spring-cloud/src/main/docs/spring-cloud.adoc
diff --git 
a/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudDiscoveryClient.java
 
b/core/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudDiscoveryClient.java
similarity index 100%
rename from 
camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudDiscoveryClient.java
rename to 
core/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudDiscoveryClient.java
diff --git 
a/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudDiscoveryClientAutoConfiguration.java
 
b/core/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudDiscoveryClientAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudDiscoveryClientAutoConfiguration.java
rename to 
core/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudDiscoveryClientAutoConfiguration.java
diff --git 
a/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceDiscovery.java
 
b/core/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceDiscovery.java
similarity index 100%
rename from 
camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceDiscovery.java
rename to 
core/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceDiscovery.java
diff --git 
a/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceDiscoveryAutoConfiguration.java
 
b/core/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceDiscoveryAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceDiscoveryAutoConfiguration.java
rename to 
core/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceDiscoveryAutoConfiguration.java
diff --git 
a/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceLoadBalancer.java
 
b/core/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceLoadBalancer.java
similarity index 100%
rename from 
camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceLoadBalancer.java
rename to 
core/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceLoadBalancer.java
diff --git 
a/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceLoadBalancerAutoConfiguration.java
 
b/core/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceLoadBalancerAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceLoadBalancerAutoConfiguration.java
rename to 
core/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceLoadBalancerAutoConfiguration.java
diff --git 
a/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceRegistry.java
 
b/core/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceRegistry.java
similarity index 100%
rename from 
camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceRegistry.java
rename to 
core/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceRegistry.java
diff --git 
a/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceRegistryAutoConfiguration.java
 
b/core/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceRegistryAutoConfiguration.java
similarity index 100%
rename from 
camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceRegistryAutoConfiguration.java
rename to 
core/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceRegistryAutoConfiguration.java
diff --git 
a/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/DefaultLoadBalancerClientAdapter.java
 
b/core/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/DefaultLoadBalancerClientAdapter.java
similarity index 100%
rename from 
camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/DefaultLoadBalancerClientAdapter.java
rename to 
core/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/DefaultLoadBalancerClientAdapter.java
diff --git 
a/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/DefaultServiceLoadBalancer.java
 
b/core/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/DefaultServiceLoadBalancer.java
similarity index 100%
rename from 
camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/DefaultServiceLoadBalancer.java
rename to 
core/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/DefaultServiceLoadBalancer.java
diff --git a/camel-spring-cloud/src/main/resources/META-INF/spring.factories 
b/core/camel-spring-cloud/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from camel-spring-cloud/src/main/resources/META-INF/spring.factories
rename to core/camel-spring-cloud/src/main/resources/META-INF/spring.factories
diff --git 
a/camel-spring-cloud/src/test/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceCallRibbonTest.java
 
b/core/camel-spring-cloud/src/test/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceCallRibbonTest.java
similarity index 100%
rename from 
camel-spring-cloud/src/test/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceCallRibbonTest.java
rename to 
core/camel-spring-cloud/src/test/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceCallRibbonTest.java
diff --git 
a/camel-spring-cloud/src/test/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceRegistryTest.java
 
b/core/camel-spring-cloud/src/test/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceRegistryTest.java
similarity index 100%
rename from 
camel-spring-cloud/src/test/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceRegistryTest.java
rename to 
core/camel-spring-cloud/src/test/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceRegistryTest.java
diff --git a/camel-spring-cloud/src/test/resources/logback.xml 
b/core/camel-spring-cloud/src/test/resources/logback.xml
similarity index 100%
rename from camel-spring-cloud/src/test/resources/logback.xml
rename to core/camel-spring-cloud/src/test/resources/logback.xml
diff --git a/core/pom.xml b/core/pom.xml
new file mode 100644
index 0000000..d85a3a7
--- /dev/null
+++ b/core/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.camel.springboot</groupId>
+        <artifactId>spring-boot</artifactId>
+        <version>3.1.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <groupId>org.apache.camel.springboot</groupId>
+    <artifactId>core-modules</artifactId>
+    <name>Camel SB :: Core Modules</name>
+    <description>Camel Spring Boot Core Modules</description>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>camel-spring-boot</module>
+        <module>camel-spring-cloud</module>
+        <module>camel-spring-cloud-consul</module>
+        <module>camel-spring-cloud-netflix</module>
+        <module>camel-spring-cloud-zookeeper</module>
+    </modules>
+
+</project>
diff --git a/pom.xml b/pom.xml
index fd588cb..8690438 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,11 +73,7 @@
 
     <modules>
         <module>tooling</module>
-        <module>camel-spring-boot</module>
-        <module>camel-spring-cloud</module>
-        <module>camel-spring-cloud-consul</module>
-        <module>camel-spring-cloud-netflix</module>
-        <module>camel-spring-cloud-zookeeper</module>
+        <module>core</module>
         <module>components-starter</module>
         <module>catalog</module>
         <module>tests</module>