diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java index 4eb20a8d5d..9739fd25f7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java @@ -204,9 +204,11 @@ public class EmbeddedMongoAutoConfiguration { RuntimeConfig embeddedMongoRuntimeConfig( ObjectProvider downloadConfigBuilderCustomizers) { Logger logger = LoggerFactory.getLogger(getClass().getPackage().getName() + ".EmbeddedMongo"); - ProcessOutput processOutput = new ProcessOutput(Processors.logTo(logger, Slf4jLevel.INFO), - Processors.logTo(logger, Slf4jLevel.ERROR), - Processors.named("[console>]", Processors.logTo(logger, Slf4jLevel.DEBUG))); + ProcessOutput processOutput = ProcessOutput.builder() + .output(Processors.logTo(logger, Slf4jLevel.INFO)) + .error(Processors.logTo(logger, Slf4jLevel.ERROR)) + .commands(Processors.named("[console>]", Processors.logTo(logger, Slf4jLevel.DEBUG))) + .build(); return Defaults.runtimeConfigFor(Command.MongoD, logger).processOutput(processOutput) .artifactStore(getArtifactStore(logger, downloadConfigBuilderCustomizers.orderedStream())) .isDaemonProcess(false).build(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java index f0d577d4af..ebeed2c635 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java @@ -98,11 +98,7 @@ class EmbeddedMongoAutoConfigurationTests { @Test void customFeatures() { - EnumSet features = EnumSet.of(Feature.TEXT_SEARCH, Feature.SYNC_DELAY, Feature.ONLY_WITH_SSL, - Feature.NO_HTTP_INTERFACE_ARG); - if (isWindows()) { - features.add(Feature.ONLY_WINDOWS_2008_SERVER); - } + EnumSet features = EnumSet.of(Feature.TEXT_SEARCH, Feature.SYNC_DELAY, Feature.NO_HTTP_INTERFACE_ARG); loadWithValidVersion("spring.mongodb.embedded.features=" + features.stream().map(Feature::name).collect(Collectors.joining(", "))); assertThat(this.context.getBean(EmbeddedMongoProperties.class).getFeatures()) @@ -242,10 +238,6 @@ class EmbeddedMongoAutoConfigurationTests { this.context = ctx; } - private boolean isWindows() { - return File.separatorChar == '\\'; - } - private int getPort(MongoClient client) { return client.getClusterDescription().getClusterSettings().getHosts().get(0).getPort(); } diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 2159ab2eee..c1ceeebada 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -307,7 +307,7 @@ bom { ] } } - library("Embedded Mongo", "3.0.0") { + library("Embedded Mongo", "3.2.0") { group("de.flapdoodle.embed") { modules = [ "de.flapdoodle.embed.mongo"