diff --git a/spring-cloud-bindings-tests-boot-2/pom.xml b/spring-cloud-bindings-tests-boot-2/pom.xml index 71d9914..039f202 100644 --- a/spring-cloud-bindings-tests-boot-2/pom.xml +++ b/spring-cloud-bindings-tests-boot-2/pom.xml @@ -12,6 +12,8 @@ Test project to verify Spring Cloud Bindings works properly with Spring Boot 2 1.8 + ${java.version} + ${java.version} 2.5.14 diff --git a/spring-cloud-bindings-tests-boot-3/pom.xml b/spring-cloud-bindings-tests-boot-3/pom.xml index 48264b5..d9ad93e 100644 --- a/spring-cloud-bindings-tests-boot-3/pom.xml +++ b/spring-cloud-bindings-tests-boot-3/pom.xml @@ -12,6 +12,8 @@ Test project to verify Spring Cloud Bindings works properly with Spring Boot 2 17 + ${java.version} + ${java.version} 3.0.2 diff --git a/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/SpringBootVersionResolver.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/SpringBootVersionResolver.java index ba02cc9..06ccbbe 100644 --- a/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/SpringBootVersionResolver.java +++ b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/SpringBootVersionResolver.java @@ -2,19 +2,19 @@ package org.springframework.cloud.bindings.boot; import org.springframework.boot.SpringBootVersion; -public class SpringBootVersionResolver { +class SpringBootVersionResolver { - private int forcedVersion; + private int forcedVersion = -1; - public SpringBootVersionResolver() { + SpringBootVersionResolver() { } protected SpringBootVersionResolver(int forcedVersion) { this.forcedVersion = forcedVersion; } - public boolean isBootMajorVersionEnabled(int bootVersion) { - if (forcedVersion != 0) { + protected boolean isBootMajorVersionEnabled(int bootVersion) { + if (forcedVersion != -1) { return forcedVersion == bootVersion; } int major = Integer.parseInt(SpringBootVersion.getVersion().split("\\.")[0]);