Merge branch '3.2.x'

settings.gradle

@@ -75,7 +75,6 @@ include "spring-boot-project:spring-boot-test"
 include "spring-boot-project:spring-boot-testcontainers"
 include "spring-boot-project:spring-boot-test-autoconfigure"
 include "spring-boot-tests:spring-boot-integration-tests:spring-boot-configuration-processor-tests"
-include "spring-boot-tests:spring-boot-integration-tests:spring-boot-console-tests"
 include "spring-boot-tests:spring-boot-integration-tests:spring-boot-launch-script-tests"
 include "spring-boot-tests:spring-boot-integration-tests:spring-boot-loader-tests"
 include "spring-boot-tests:spring-boot-integration-tests:spring-boot-loader-classic-tests"

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/AbstractLoggingSystemTests.java

@@ -25,8 +25,6 @@
 import org.junit.jupiter.api.io.TempDir;
 import org.slf4j.MDC;
 
-import org.springframework.boot.ansi.AnsiOutput;
-import org.springframework.boot.ansi.AnsiOutput.Enabled;
 import org.springframework.util.StringUtils;
 
 import static org.assertj.core.api.Assertions.contentOf;
@@ -44,39 +42,18 @@ public abstract class AbstractLoggingSystemTests {
 
 	private String originalTempDirectory;
 
-	private AnsiOutput.Enabled ansiOutputEnabled;
-
 	@BeforeEach
-	void beforeEach(@TempDir Path temp) {
-		disableAnsiOutput();
-		configureTempDir(temp);
-	}
-
-	private void disableAnsiOutput() {
-		this.ansiOutputEnabled = AnsiOutput.getEnabled();
-		AnsiOutput.setEnabled(Enabled.NEVER);
-	}
-
-	private void configureTempDir(@TempDir Path temp) {
+	void configureTempDir(@TempDir Path temp) {
 		this.originalTempDirectory = System.getProperty(JAVA_IO_TMPDIR);
 		System.setProperty(JAVA_IO_TMPDIR, temp.toAbsolutePath().toString());
 		MDC.clear();
 	}
 
 	@AfterEach
-	void afterEach() {
-		reinstateTempDir();
-		restoreAnsiOutputEnabled();
-	}
-
-	private void reinstateTempDir() {
+	void reinstateTempDir() {
 		System.setProperty(JAVA_IO_TMPDIR, this.originalTempDirectory);
 	}
 
-	private void restoreAnsiOutputEnabled() {
-		AnsiOutput.setEnabled(this.ansiOutputEnabled);
-	}
-
 	@AfterEach
 	void clear() {
 		for (LoggingSystemProperty property : LoggingSystemProperty.values()) {

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java

@@ -185,4 +185,12 @@ void getLoggerConfiguration() {
 			.isEqualTo(new LoggerConfiguration(getClass().getName(), LogLevel.DEBUG, LogLevel.DEBUG));
 	}
 
+	@Test
+	void shouldNotContainAnsiEscapeCodes(CapturedOutput output) {
+		this.loggingSystem.beforeInitialize();
+		this.loggingSystem.initialize(null, null, null);
+		this.logger.info("Hello world");
+		assertThat(output).doesNotContain("\033[");
+	}
+
 }

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java

@@ -651,6 +651,14 @@ void applicationNameLoggingToFileWhenDisabled() {
 			.doesNotContain("myapp");
 	}
 
+	@Test
+	void shouldNotContainAnsiEscapeCodes(CapturedOutput output) {
+		this.loggingSystem.beforeInitialize();
+		this.loggingSystem.initialize(this.initializationContext, null, null);
+		this.logger.info("Hello world");
+		assertThat(output).doesNotContain("\033[");
+	}
+
 	private String getRelativeClasspathLocation(String fileName) {
 		String defaultPath = ClassUtils.getPackageName(getClass());
 		defaultPath = defaultPath.replace('.', '/');

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java

@@ -876,6 +876,14 @@ void applyingSystemPropertiesDoesNotCauseUnwantedStatusWarnings(CapturedOutput o
 		assertThat(output).doesNotContain("WARN");
 	}
 
+	@Test
+	void shouldNotContainAnsiEscapeCodes(CapturedOutput output) {
+		this.loggingSystem.beforeInitialize();
+		initialize(this.initializationContext, null, null);
+		this.logger.info("Hello world");
+		assertThat(output).doesNotContain("\033[");
+	}
+
 	private void initialize(LoggingInitializationContext context, String configLocation, LogFile logFile) {
 		this.loggingSystem.getSystemProperties((ConfigurableEnvironment) context.getEnvironment()).apply(logFile);
 		this.loggingSystem.beforeInitialize();