Upgrade to Spring Framework 5.3.27

Closes gh-35497
2.5.x
Andy Wilkinson 2 years ago
parent b00b2ea2c5
commit cf1dc6dae1

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -28,12 +28,12 @@ import org.springframework.jdbc.CannotGetJdbcConnectionException;
*/ */
class HikariDriverConfigurationFailureAnalyzer extends AbstractFailureAnalyzer<CannotGetJdbcConnectionException> { class HikariDriverConfigurationFailureAnalyzer extends AbstractFailureAnalyzer<CannotGetJdbcConnectionException> {
private static final String EXPECTED_MESSAGE = "Failed to obtain JDBC Connection:" private static final String EXPECTED_MESSAGE = "cannot use driverClassName and dataSourceClassName together.";
+ " cannot use driverClassName and dataSourceClassName together.";
@Override @Override
protected FailureAnalysis analyze(Throwable rootFailure, CannotGetJdbcConnectionException cause) { protected FailureAnalysis analyze(Throwable rootFailure, CannotGetJdbcConnectionException cause) {
if (!EXPECTED_MESSAGE.equals(cause.getMessage())) { Throwable subCause = cause.getCause();
if (subCause == null || !EXPECTED_MESSAGE.equals(subCause.getMessage())) {
return null; return null;
} }
return new FailureAnalysis( return new FailureAnalysis(

@ -1716,7 +1716,7 @@ bom {
] ]
} }
} }
library("Spring Framework", "5.3.20") { library("Spring Framework", "5.3.27") {
group("org.springframework") { group("org.springframework") {
imports = [ imports = [
"spring-framework-bom" "spring-framework-bom"

Loading…
Cancel
Save