This is an automated email from the ASF dual-hosted git repository. fmariani pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit d91c474b367f3cea133763339c0038a00578a2d6 Author: Croway <[email protected]> AuthorDate: Thu Oct 16 15:35:08 2025 +0200 Fix Camel Spring Boot itest after spring-boot-version removal from thie project --- .../java/org/apache/camel/itest/springboot/ITestConfig.java | 2 +- .../camel/itest/springboot/util/DependencyResolver.java | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfig.java b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfig.java index 01e09fc5d24..3240ee371fd 100644 --- a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfig.java +++ b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfig.java @@ -25,7 +25,7 @@ import java.util.Set; */ public class ITestConfig implements Serializable { - private static final int DEFAULT_SPRING_BOOT_MAJOR_VERSION = 2; + private static final int DEFAULT_SPRING_BOOT_MAJOR_VERSION = 3; private static final long serialVersionUID = -3641997669166217595L; diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java index 9ef76d249c5..ae37292d5eb 100644 --- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java +++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java @@ -88,6 +88,17 @@ public final class DependencyResolver { if (property != null && !isResolved(property)) { property = resolveCamelProperty(property); } + if (property != null && !isResolved(property)) { + property = resolveSpringBootSystemProperty(property); + } + + return property; + } + + private static String resolveSpringBootSystemProperty(String property) { + if (property.contains("spring-boot-version")) { + return System.getProperty("itest.springboot.springBootVersion"); + } return property; }
