Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Spring Framework 5.3.27

Browse Source 
Closes gh-35497
This commit is contained in:
Andy Wilkinson 2023-05-17 18:43:23 +01:00
parent b00b2ea2c5
commit cf1dc6dae1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzer.java
View File

@ -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");
* 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> {
private static final String EXPECTED_MESSAGE = "Failed to obtain JDBC Connection:"
+ " cannot use driverClassName and dataSourceClassName together.";
private static final String EXPECTED_MESSAGE = "cannot use driverClassName and dataSourceClassName together.";
@Override
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 new FailureAnalysis(

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

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