From 55aa17eb11576532bf181b2887d049b1fa2c69ea Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 8 Jul 2022 09:55:15 +0100 Subject: [PATCH 1/5] Start building against Spring Framework 5.3.22 snapshots See gh-31613 --- .../jdbc/HikariDriverConfigurationFailureAnalyzer.java | 8 ++++---- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzer.java index 30d4d4aa58..84ab3238dd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/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 @@ import org.springframework.jdbc.CannotGetJdbcConnectionException; */ class HikariDriverConfigurationFailureAnalyzer extends AbstractFailureAnalyzer { - 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 index 8c0c69469e..f3a4ee835e 100644 --- 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" } From 292d351b16cd1ca8ee9f2964334df7f00b7369aa Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 8 Jul 2022 09:55:52 +0100 Subject: [PATCH 2/5] Start building against Reactor 2020.0.21 snapshots See gh-31608 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index f3a4ee835e..e54f5a86e7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1432,7 +1432,7 @@ bom { ] } } - library("Reactor Bom", "2020.0.20") { + library("Reactor Bom", "2020.0.21-SNAPSHOT") { group("io.projectreactor") { imports = [ "reactor-bom" From 2c74a9376a7558009260b34b64b3ed1a0744d6f9 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 8 Jul 2022 09:56:52 +0100 Subject: [PATCH 3/5] Start building against Micrometer 1.9.2 snapshots See gh-31614 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index e54f5a86e7..e125295431 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1281,7 +1281,7 @@ bom { ] } } - library("Micrometer", "1.9.1") { + library("Micrometer", "1.9.2-SNAPSHOT") { group("io.micrometer") { modules = [ "micrometer-registry-stackdriver" { From 28b4938c9b54c65067c710fdacf515d804f4e591 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 8 Jul 2022 09:57:38 +0100 Subject: [PATCH 4/5] Startin building against Spring Data 2021.2.2 snapshots See gh-31615 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index e125295431..2bf6a21f26 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1677,7 +1677,7 @@ bom { ] } } - library("Spring Data Bom", "2021.2.1") { + library("Spring Data Bom", "2021.2.2-SNAPSHOT") { prohibit("[2022.0.0-M1,)") { because "it uses Spring Framework 6" } From c6d5652dcc8feb62a4c01723605e1643bf915700 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 8 Jul 2022 09:58:24 +0100 Subject: [PATCH 5/5] Start building against Spring GraphQL 1.0.1 snapshots See gh-31616 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 2bf6a21f26..ef5e995f37 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1697,7 +1697,7 @@ bom { ] } } - library("Spring GraphQL", "1.0.0") { + library("Spring GraphQL", "1.0.1-SNAPSHOT") { group("org.springframework.graphql") { modules = [ "spring-graphql",