From c38a3c0da42d8001de4843a69d2617645c047dcf Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 7 Jul 2022 16:37:55 +0100 Subject: [PATCH 1/4] Start building against Reactor 2020.0.21 snapshots See gh-31607 --- 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 9e5e9a7a32..fcf6120970 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1457,7 +1457,7 @@ bom { ] } } - library("Reactor Bom", "2020.0.20") { + library("Reactor Bom", "2020.0.21-SNAPSHOT") { group("io.projectreactor") { imports = [ "reactor-bom" From ece51636fd7f255a87394bae5c2c1e3b232331e8 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 7 Jul 2022 16:38:36 +0100 Subject: [PATCH 2/4] Start building against Spring Framework 5.3.22 snapshots See gh-31610 --- .../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 fcf6120970..5dac1ef121 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1701,7 +1701,7 @@ bom { ] } } - library("Spring Framework", "5.3.21") { + library("Spring Framework", "5.3.22-SNAPSHOT") { group("org.springframework") { imports = [ "spring-framework-bom" From f417b4b9b240a924d7ebf8de9d94003ef9634f5d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 7 Jul 2022 16:39:13 +0100 Subject: [PATCH 3/4] Start building against Spring Data 2021.1.6 snapshots See gh-31611 --- 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 5dac1ef121..4420864165 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1694,7 +1694,7 @@ bom { ] } } - library("Spring Data Bom", "2021.1.5") { + library("Spring Data Bom", "2021.1.6-SNAPSHOT") { group("org.springframework.data") { imports = [ "spring-data-bom" From b94527de3b07cbcfc4cd79e8dda433dfe56ae910 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 7 Jul 2022 16:40:00 +0100 Subject: [PATCH 4/4] Start building against Micrometer 1.8.8 snapshots See gh-31612 --- 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 4420864165..e75050a8a2 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1250,7 +1250,7 @@ bom { ] } } - library("Micrometer", "1.8.7") { + library("Micrometer", "1.8.8-SNAPSHOT") { group("io.micrometer") { modules = [ "micrometer-registry-stackdriver" {