SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updates to support boot 3.5.0-SNAPSHOT

Browse Source
This commit is contained in:
spencergibb
2025-01-16 12:57:49 -05:00
parent 6bf064c1a3
commit bb2936d86d
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierProperties.java
View File

@@ -34,9 +34,9 @@ public class CompatibilityVerifierProperties {
/**
* Default accepted versions for the Spring Boot dependency. You can set {@code x} for
* the patch version if you don't want to specify a concrete value. Example:
* {@code 3.4.x}
* {@code 3.5.x}
*/
private List<String> compatibleBootVersions = List.of("3.4.x");
private List<String> compatibleBootVersions = List.of("3.5.x");
public boolean isEnabled() {
return this.enabled;

20
spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SpringBootVersionVerifier.java
View File

@@ -35,7 +35,7 @@ class SpringBootVersionVerifier implements CompatibilityVerifier {
final Map<String, CompatibilityPredicate> ACCEPTED_VERSIONS = new HashMap<>() {
{
this.put("3.4", is3_4());
this.put("3.5", is3_5());
}
};
@@ -70,23 +70,23 @@ class SpringBootVersionVerifier implements CompatibilityVerifier {
return SpringBootVersion.getVersion();
}
CompatibilityPredicate is3_4() {
CompatibilityPredicate is3_5() {
return new CompatibilityPredicate() {
@Override
public String toString() {
return "Predicate for Boot 3.4";
return "Predicate for Boot 3.5";
}
@Override
public boolean isCompatible() {
try {
Class.forName("org.springframework.boot.autoconfigure.web.client.RestClientSsl");
return true;
}
catch (ClassNotFoundException e) {
return false;
}
// try {
// Class.forName("org.springframework.boot.autoconfigure.web.client.RestClientSsl");
return true;
// }
// catch (ClassNotFoundException e) {
// return false;
// }
}
};
}

8
spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SpringBootDependencyTests.java
View File

@@ -176,8 +176,8 @@ public class SpringBootDependencyTests {
@Test
public void should_match_against_current_manifest() {
try {
verifyCurrentVersionFromManifest("3.4");
verifyCurrentVersionFromManifest("3.4.x");
verifyCurrentVersionFromManifest("3.5");
verifyCurrentVersionFromManifest("3.5.x");
}
catch (AssertionError e) {
// if (e.getMessage() != null && e.getMessage().contains("3.3.")) {
@@ -212,7 +212,7 @@ public class SpringBootDependencyTests {
}
};
versionVerifier.ACCEPTED_VERSIONS.clear();
versionVerifier.ACCEPTED_VERSIONS.put("3.0", versionVerifier.is3_4());
versionVerifier.ACCEPTED_VERSIONS.put("3.0", versionVerifier.is3_5());
VerificationResult verificationResult = versionVerifier.verify();
@@ -230,7 +230,7 @@ public class SpringBootDependencyTests {
}
};
versionVerifier.ACCEPTED_VERSIONS.clear();
versionVerifier.ACCEPTED_VERSIONS.put("3.0", versionVerifier.is3_4());
versionVerifier.ACCEPTED_VERSIONS.put("3.0", versionVerifier.is3_5());
VerificationResult verificationResult = versionVerifier.verify();