root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Start building against Spring Framework 5.3.22 snapshots 

See gh-31613
This commit is contained in:
Andy Wilkinson 2022-07-08 09:55:15 +01:00
parent 57160180cb
commit 55aa17eb11
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-2022 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(

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

@ -1687,7 +1687,7 @@ bom {
] ]
} }
} }
library("Spring Framework", "5.3.21") { library("Spring Framework", "5.3.22-SNAPSHOT") {
prohibit("[6.0.0-M1,)") { prohibit("[6.0.0-M1,)") {
because "we upgrade in Spring Boot 3.x" because "we upgrade in Spring Boot 3.x"
} }