Merge pull request #28543 from juherr

* pr/28543:
  Polish "Upgrade to Embedded Mongo 3.2.5"
  Upgrade to Embedded Mongo 3.2.5

Closes gh-28543

Author: snicoll

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 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.
@@ -37,7 +37,7 @@
 import de.flapdoodle.embed.mongo.distribution.Version;
 import de.flapdoodle.embed.mongo.distribution.Versions;
 import de.flapdoodle.embed.process.config.RuntimeConfig;
-import de.flapdoodle.embed.process.config.io.ProcessOutput;
+import de.flapdoodle.embed.process.config.process.ProcessOutput;
 import de.flapdoodle.embed.process.config.store.DownloadConfig;
 import de.flapdoodle.embed.process.config.store.ImmutableDownloadConfig;
 import de.flapdoodle.embed.process.distribution.Version.GenericVersion;
@@ -138,8 +138,8 @@ public MongodConfig embeddedMongoConfiguration(EmbeddedMongoProperties embeddedP
 			builder.net(new Net(getHost().getHostAddress(), configuredPort, Network.localhostIsIPv6()));
 		}
 		else {
-			builder.net(new Net(getHost().getHostAddress(), Network.getFreeServerPort(getHost()),
-					Network.localhostIsIPv6()));
+			builder.net(
+					new Net(getHost().getHostAddress(), Network.freeServerPort(getHost()), Network.localhostIsIPv6()));
 		}
 		return builder.build();
 	}
@@ -204,9 +204,9 @@ static class RuntimeConfigConfiguration {
 		RuntimeConfig embeddedMongoRuntimeConfig(
 				ObjectProvider<DownloadConfigBuilderCustomizer> 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();

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 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.
@@ -98,11 +98,7 @@ void customUnknownVersion() {
 
 	@Test
 	void customFeatures() {
-		EnumSet<Feature> 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<Feature> 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 @@ private void loadWithValidVersion(Class<?> config, String... environment) {
 		this.context = ctx;
 	}
 
-	private boolean isWindows() {
-		return File.separatorChar == '\\';
-	}
-
 	private int getPort(MongoClient client) {
 		return client.getClusterDescription().getClusterSettings().getHosts().get(0).getPort();
 	}

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -307,7 +307,7 @@ bom {
 			]
 		}
 	}
-	library("Embedded Mongo", "3.0.0") {
+	library("Embedded Mongo", "3.2.5") {
 		group("de.flapdoodle.embed") {
 			modules = [
 				"de.flapdoodle.embed.mongo"