Adapt to changes in Logback include processing

Fixes gh-40491

Author: scottfrederick

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringBootJoranConfigurator.java

@@ -107,6 +107,16 @@ public void addElementSelectorAndActionAssociations(RuleStore ruleStore) {
 		ruleStore.addTransparentPathPart("springProfile");
 	}
 
+	@Override
+	public void buildModelInterpretationContext() {
+		super.buildModelInterpretationContext();
+		this.modelInterpretationContext.setConfiguratorSupplier(() -> {
+			SpringBootJoranConfigurator configurator = new SpringBootJoranConfigurator(this.initializationContext);
+			configurator.setContext(this.context);
+			return configurator;
+		});
+	}
+
 	boolean configureUsingAotGeneratedArtifacts() {
 		if (!new PatternRules(getContext()).load()) {
 			return false;

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

@@ -83,6 +83,14 @@ void profileActive() throws Exception {
 		assertThat(this.output).contains("Hello");
 	}
 
+	@Test
+	void profileInIncludeActive() throws Exception {
+		this.environment.setActiveProfiles("production");
+		initialize("profile-in-include.xml");
+		this.logger.trace("Hello");
+		assertThat(this.output).contains("Hello");
+	}
+
 	@Test
 	void multipleNamesFirstProfileActive() throws Exception {
 		this.environment.setActiveProfiles("production");
@@ -203,6 +211,13 @@ void springPropertyInIfWhenFalse() throws Exception {
 		assertThat(this.context.getProperty("MYCHECK")).isNull();
 	}
 
+	@Test
+	void springPropertyInInclude() throws Exception {
+		TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.environment, "my.example-property=test");
+		initialize("property-in-include.xml");
+		assertThat(this.context.getProperty("MINE")).isEqualTo("test");
+	}
+
 	@Test
 	void addsAotContributionToContextDuringAotProcessing() throws Exception {
 		withSystemProperty("spring.aot.processing", "true", () -> {

spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/include-with-profile.xml

@@ -0,0 +1,5 @@
+<included>
+	<springProfile name="production">
+		<logger name="org.springframework.boot.logging.logback" level="TRACE" />
+	</springProfile>
+</included>

spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/include-with-property.xml

@@ -0,0 +1,3 @@
+<included>
+	<springProperty scope="context" name="MINE" source="my.example-property" defaultValue="default-test" />
+</included>

spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/profile-in-include.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<include resource="org/springframework/boot/logging/logback/base.xml" />
+	<include resource="org/springframework/boot/logging/logback/include-with-profile.xml" />
+</configuration>

spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/logging/logback/property-in-include.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<include resource="org/springframework/boot/logging/logback/base.xml" />
+	<include resource="org/springframework/boot/logging/logback/include-with-property.xml" />
+</configuration>