diff --git a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.properties b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.properties index 2c1eb8d01ba6..741a06a7387f 100644 --- a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.properties +++ b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- # the name of Camel -camel.springboot.name = MyCamel +camel.main.name = MyCamel # what to say greeting = Hello World diff --git a/core/camel-spring-boot-xml/src/test/java/org/apache/camel/spring/boot/xml/MixedBootAndXmlConfigurationTest.java b/core/camel-spring-boot-xml/src/test/java/org/apache/camel/spring/boot/xml/MixedBootAndXmlConfigurationTest.java index 287cb3e058e7..538a9b669807 100644 --- a/core/camel-spring-boot-xml/src/test/java/org/apache/camel/spring/boot/xml/MixedBootAndXmlConfigurationTest.java +++ b/core/camel-spring-boot-xml/src/test/java/org/apache/camel/spring/boot/xml/MixedBootAndXmlConfigurationTest.java @@ -29,7 +29,7 @@ @DirtiesContext @CamelSpringBootTest -@SpringBootTest(properties = { "camel.springboot.name = camel-spring-boot", "camel.springboot.tracing = true", +@SpringBootTest(properties = { "camel.main.name = camel-spring-boot", "camel.springboot.tracing = true", "camel.springboot.shutdownTimeout = 5" }) public class MixedBootAndXmlConfigurationTest { diff --git a/core/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 index 436b49827365..c6147b3480a1 100644 --- a/core/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 @@ -48,7 +48,7 @@ @EnableAutoConfiguration @SpringBootTest(classes = { CamelAutoConfigurationTest.TestConfig.class, CamelAutoConfigurationTest.class, RouteConfigWithCamelContextInjected.class }, properties = { "camel.springboot.consumerTemplateCacheSize=100", - "camel.springboot.jmxEnabled=true", "camel.springboot.name=customName", + "camel.springboot.jmxEnabled=true", "camel.main.name=customName", "camel.springboot.typeConversion=true", "camel.springboot.threadNamePattern=customThreadName #counter#" }) public class CamelAutoConfigurationTest extends org.junit.jupiter.api.Assertions { diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationWithCompatPrefixTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationWithCompatPrefixTest.java index ec2a81a5d952..96351f8033dd 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationWithCompatPrefixTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationWithCompatPrefixTest.java @@ -34,7 +34,7 @@ @DirtiesContext @CamelSpringBootTest @EnableAutoConfiguration -@SpringBootTest(properties = { "camel.springboot.consumerTemplateCacheSize=100", "camel.springboot.name=customName" }) +@SpringBootTest(properties = { "camel.springboot.consumerTemplateCacheSize=100", "camel.main.name=customName" }) public class CamelAutoConfigurationWithCompatPrefixTest { // Collaborators fixtures