Start building against Spring Framework 5.3.22 snapshots

See gh-31613
pull/31660/head
Andy Wilkinson 2 years ago
parent 57160180cb
commit 55aa17eb11

@ -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(

@ -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"
} }

Loading…
Cancel
Save