From 35bc0f9f21dfd90225c859a0e428ed45a83ef287 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 15 Mar 2024 14:29:06 +0100 Subject: [PATCH 1/2] Upgrade to MongoDB 5.0 See gh-39989 --- .../autoconfigure/mongo/MongoReactiveAutoConfiguration.java | 4 +--- .../mongo/MongoReactiveAutoConfigurationTests.java | 1 - spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java index 5426b6f17f..e369eda742 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java @@ -129,10 +129,8 @@ public class MongoReactiveAutoConfiguration { } } - @SuppressWarnings("deprecation") private boolean isCustomTransportConfiguration(MongoClientSettings settings) { - return settings != null - && (settings.getTransportSettings() != null || settings.getStreamFactoryFactory() != null); + return settings != null && settings.getTransportSettings() != null; } } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java index df46e4b459..2a7075b2b8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java @@ -230,7 +230,6 @@ class MongoReactiveAutoConfigurationTests { assertThat(settings.getApplicationName()).isEqualTo("custom-transport-settings"); assertThat(settings.getTransportSettings()) .isSameAs(SimpleTransportSettingsCustomizerConfig.transportSettings); - assertThat(settings.getStreamFactoryFactory()).isNull(); }); } diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 6b96b3c9a5..db1cf23f50 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1286,7 +1286,7 @@ bom { releaseNotes("https://github.com/mockito/mockito/releases/tag/v{version}") } } - library("MongoDB", "4.11.1") { + library("MongoDB", "5.0.0") { group("org.mongodb") { modules = [ "bson", From 5166942ce794e1841f6392d8c1fb7c3f91f4cf28 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 9 Apr 2024 10:48:53 +0100 Subject: [PATCH 2/2] Polish "Upgrade to MongoDB 5.0" See gh-39989 --- .../autoconfigure/mongo/MongoReactiveAutoConfiguration.java | 2 +- .../mongo/MongoReactiveAutoConfigurationTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java index e369eda742..746bbe4587 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 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. diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java index 2a7075b2b8..d127289452 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 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.