Start building against Spring Framework 5.3.22 snapshots

See gh-31613
spring-projects · Jul 8, 2022 · 55aa17e · 55aa17e
1 parent 5716018
commit 55aa17e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzer.java b/...org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2022 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 @@
  */
 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(

diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1687,7 +1687,7 @@ bom {
 			]
 		}
 	}
-	library("Spring Framework", "5.3.21") {
+	library("Spring Framework", "5.3.22-SNAPSHOT") {
 		prohibit("[6.0.0-M1,)") {
 			because "we upgrade in Spring Boot 3.x"
 		}