mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Exclude docker-compose and devtools during AOT processing
Update `ProcessAotMojo` so that `spring-boot-docker-compose` and `spring-boot-devtools` are not included on the classpath. Fixes gh-35548
This commit is contained in:
parent
f63f9c55f1
commit
c2961a1e4a
@ -176,6 +176,15 @@ class AotTests {
|
||||
});
|
||||
}
|
||||
|
||||
@TestTemplate
|
||||
void whenAotWithDevelopmentOnlyExclusions(MavenBuild mavenBuild) {
|
||||
mavenBuild.project("aot-development-only-exclusions").goals("package").execute((project) -> {
|
||||
Path aotDirectory = project.toPath().resolve("target/spring-aot/main");
|
||||
assertThat(collectRelativePaths(aotDirectory.resolve("sources")))
|
||||
.contains(Path.of("org", "test", "SampleApplication__ApplicationContextInitializer.java"));
|
||||
});
|
||||
}
|
||||
|
||||
List<Path> collectRelativePaths(Path sourceDirectory) {
|
||||
try (Stream<Path> pathStream = Files.walk(sourceDirectory)) {
|
||||
return pathStream.filter(Files::isRegularFile)
|
||||
|
@ -0,0 +1,54 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.springframework.boot.maven.it</groupId>
|
||||
<artifactId>aot-development-only-exclusions</artifactId>
|
||||
<version>0.0.1.BUILD-SNAPSHOT</version>
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<maven.compiler.source>@java.version@</maven.compiler.source>
|
||||
<maven.compiler.target>@java.version@</maven.compiler.target>
|
||||
</properties>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>@project.groupId@</groupId>
|
||||
<artifactId>@project.artifactId@</artifactId>
|
||||
<version>@project.version@</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>process-aot</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot</artifactId>
|
||||
<version>@project.version@</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jakarta.servlet</groupId>
|
||||
<artifactId>jakarta.servlet-api</artifactId>
|
||||
<version>@jakarta-servlet.version@</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-devtools</artifactId>
|
||||
<version>@project.version@</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-docker-compose</artifactId>
|
||||
<version>@project.version@</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
@ -0,0 +1,33 @@
|
||||
/*
|
||||
* Copyright 2012-2023 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.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.test;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.util.Assert;
|
||||
import org.springframework.util.ClassUtils;
|
||||
|
||||
@Configuration(proxyBeanMethods = false)
|
||||
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);
|
||||
}
|
||||
|
||||
}
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2022 the original author or authors.
|
||||
* Copyright 2012-2023 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.
|
||||
@ -46,6 +46,22 @@ import org.apache.maven.shared.artifact.filter.collection.FilterArtifacts;
|
||||
*/
|
||||
public abstract class AbstractDependencyFilterMojo extends AbstractMojo {
|
||||
|
||||
static final ExcludeFilter DEVTOOLS_EXCLUDE_FILTER;
|
||||
static {
|
||||
Exclude exclude = new Exclude();
|
||||
exclude.setGroupId("org.springframework.boot");
|
||||
exclude.setArtifactId("spring-boot-devtools");
|
||||
DEVTOOLS_EXCLUDE_FILTER = new ExcludeFilter(exclude);
|
||||
}
|
||||
|
||||
static final ExcludeFilter DOCKER_COMPOSE_EXCLUDE_FILTER;
|
||||
static {
|
||||
Exclude exclude = new Exclude();
|
||||
exclude.setGroupId("org.springframework.boot");
|
||||
exclude.setArtifactId("spring-boot-docker-compose");
|
||||
DOCKER_COMPOSE_EXCLUDE_FILTER = new ExcludeFilter(exclude);
|
||||
}
|
||||
|
||||
/**
|
||||
* The Maven project.
|
||||
* @since 3.0.0
|
||||
|
@ -198,18 +198,10 @@ public abstract class AbstractPackagerMojo extends AbstractDependencyFilterMojo
|
||||
private ArtifactsFilter[] getAdditionalFilters() {
|
||||
List<ArtifactsFilter> filters = new ArrayList<>();
|
||||
if (this.excludeDevtools) {
|
||||
Exclude exclude = new Exclude();
|
||||
exclude.setGroupId("org.springframework.boot");
|
||||
exclude.setArtifactId("spring-boot-devtools");
|
||||
ExcludeFilter filter = new ExcludeFilter(exclude);
|
||||
filters.add(filter);
|
||||
filters.add(DEVTOOLS_EXCLUDE_FILTER);
|
||||
}
|
||||
if (this.excludeDockerCompose) {
|
||||
Exclude exclude = new Exclude();
|
||||
exclude.setGroupId("org.springframework.boot");
|
||||
exclude.setArtifactId("spring-boot-docker-compose");
|
||||
ExcludeFilter filter = new ExcludeFilter(exclude);
|
||||
filters.add(filter);
|
||||
filters.add(DOCKER_COMPOSE_EXCLUDE_FILTER);
|
||||
}
|
||||
if (!this.includeSystemScope) {
|
||||
filters.add(new ScopeFilter(null, Artifact.SCOPE_SYSTEM));
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2022 the original author or authors.
|
||||
* Copyright 2012-2023 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.
|
||||
@ -111,7 +111,8 @@ public class ProcessAotMojo extends AbstractAotMojo {
|
||||
|
||||
private URL[] getClassPath() throws Exception {
|
||||
File[] directories = new File[] { this.classesDirectory, this.generatedClasses };
|
||||
return getClassPath(directories, new ExcludeTestScopeArtifactFilter());
|
||||
return getClassPath(directories, new ExcludeTestScopeArtifactFilter(), DEVTOOLS_EXCLUDE_FILTER,
|
||||
DOCKER_COMPOSE_EXCLUDE_FILTER);
|
||||
}
|
||||
|
||||
private RunArguments resolveArguments() {
|
||||
|
Loading…
Reference in New Issue
Block a user