Merge branch '3.1.x'

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/aot-development-only-exclusions/src/main/java/org/test/SampleApplication.java

@@ -25,7 +25,6 @@ import org.springframework.util.ClassUtils;
 public class SampleApplication {
 
 	public static void main(String[] args) {
-		Assert.state(!ClassUtils.isPresent("org.springframework.boot.devtools.autoconfigure.DevToolsProperties", null), "Should not have devtools");
 		Assert.state(!ClassUtils.isPresent("org.springframework.boot.docker.compose.core.DockerCompose", null), "Should not have docker-compose");
 		SpringApplication.run(SampleApplication.class, args);
 	}

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ProcessAotMojo.java

@@ -111,8 +111,7 @@ public class ProcessAotMojo extends AbstractAotMojo {
 
 	private URL[] getClassPath() throws Exception {
 		File[] directories = new File[] { this.classesDirectory, this.generatedClasses };
-		return getClassPath(directories, new ExcludeTestScopeArtifactFilter(), DEVTOOLS_EXCLUDE_FILTER,
-				DOCKER_COMPOSE_EXCLUDE_FILTER);
+		return getClassPath(directories, new ExcludeTestScopeArtifactFilter(), DOCKER_COMPOSE_EXCLUDE_FILTER);
 	}
 
 	private RunArguments resolveArguments() {