Skip to content

Commit ece5163

Browse files
committed
Start building against Spring Framework 5.3.22 snapshots
See gh-31610
1 parent c38a3c0 commit ece5163

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -28,12 +28,12 @@
2828
*/
2929
class HikariDriverConfigurationFailureAnalyzer extends AbstractFailureAnalyzer<CannotGetJdbcConnectionException> {
3030

31-
private static final String EXPECTED_MESSAGE = "Failed to obtain JDBC Connection:"
32-
+ " cannot use driverClassName and dataSourceClassName together.";
31+
private static final String EXPECTED_MESSAGE = "cannot use driverClassName and dataSourceClassName together.";
3332

3433
@Override
3534
protected FailureAnalysis analyze(Throwable rootFailure, CannotGetJdbcConnectionException cause) {
36-
if (!EXPECTED_MESSAGE.equals(cause.getMessage())) {
35+
Throwable subCause = cause.getCause();
36+
if (subCause == null || !EXPECTED_MESSAGE.equals(subCause.getMessage())) {
3737
return null;
3838
}
3939
return new FailureAnalysis(

spring-boot-project/spring-boot-dependencies/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1701,7 +1701,7 @@ bom {
17011701
]
17021702
}
17031703
}
1704-
library("Spring Framework", "5.3.21") {
1704+
library("Spring Framework", "5.3.22-SNAPSHOT") {
17051705
group("org.springframework") {
17061706
imports = [
17071707
"spring-framework-bom"

0 commit comments

Comments
 (0)