Merge branch '3.3.x' into 3.4.x

Closes gh-43713

Author: wilkinsona

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

@@ -168,13 +168,13 @@ void overrideConfigLocation() {
 	}
 
 	@Test
-	@ClassPathExclusions("janino-*.jar")
-	void tryingToUseJaninoWhenItIsNotOnTheClasspathFailsGracefully(CapturedOutput output) {
-		addPropertiesToEnvironment(this.context, "logging.config=classpath:logback-janino.xml");
+	void throwableFromInitializeResultsInGracefulFailure(CapturedOutput output) {
+		System.setProperty(LoggingSystem.SYSTEM_PROPERTY, BrokenInitializationLoggingSystem.class.getName());
+		multicastEvent(this.listener,
+				new ApplicationStartingEvent(this.bootstrapContext, new SpringApplication(), NO_ARGS));
 		assertThatIllegalStateException()
 			.isThrownBy(() -> this.listener.initialize(this.context.getEnvironment(), this.context.getClassLoader()));
-		assertThat(output)
-			.contains("Logging system failed to initialize using configuration from 'classpath:logback-janino.xml'");
+		assertThat(output).contains("Deliberately broken");
 	}
 
 	@Test
@@ -712,6 +712,38 @@ public void cleanUp() {
 
 	}
 
+	static final class BrokenInitializationLoggingSystem extends LoggingSystem {
+
+		BrokenInitializationLoggingSystem(ClassLoader classLoader) {
+
+		}
+
+		@Override
+		public void beforeInitialize() {
+		}
+
+		@Override
+		public void initialize(LoggingInitializationContext initializationContext, String configLocation,
+				LogFile logFile) {
+			throw new Error("Deliberately broken");
+		}
+
+		@Override
+		public void setLogLevel(String loggerName, LogLevel level) {
+		}
+
+		@Override
+		public List<LoggerConfiguration> getLoggerConfigurations() {
+			return null;
+		}
+
+		@Override
+		public LoggerConfiguration getLoggerConfiguration(String loggerName) {
+			return null;
+		}
+
+	}
+
 	@Configuration
 	@Import(WebServerStyleLifecycle.class)
 	static class TestConfiguration {