root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Include 'classesDirectory' in ProcessTestAotMojo classpath 

Update `ProcessTestAotMojo` so that the classesDirectory and
the testClassesDirectory are on the classpath when compiling
code.

See gh-32191
This commit is contained in:
Phillip Webb 2022-09-12 13:31:33 -07:00
parent db89ee6904
commit 20b91c5ae2
3 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractAotMojo.java
View File

@ -137,11 +137,10 @@ public abstract class AbstractAotMojo extends AbstractDependencyFilterMojo {
} }
} }
protected final URL[] getClassPath(File classesDirectory, File generatedClassesDirectory, protected final URL[] getClassPath(File[] directories, ArtifactsFilter... artifactFilters)
ArtifactsFilter... artifactFilters) throws MojoExecutionException { throws MojoExecutionException {
List<URL> urls = new ArrayList<>(); List<URL> urls = new ArrayList<>();
urls.add(toURL(classesDirectory)); Arrays.stream(directories).map(this::toURL).forEach(urls::add);
urls.add(toURL(generatedClassesDirectory));
urls.addAll(getDependencyURLs(artifactFilters)); urls.addAll(getDependencyURLs(artifactFilters));
return urls.toArray(URL[]::new); return urls.toArray(URL[]::new);
} }

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

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

31
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ProcessTestAotMojo.java
View File

@ -60,15 +60,22 @@ public class ProcessTestAotMojo extends AbstractAotMojo {
private static final String AOT_PROCESSOR_CLASS_NAME = "org.springframework.test.context.aot.TestAotProcessor"; private static final String AOT_PROCESSOR_CLASS_NAME = "org.springframework.test.context.aot.TestAotProcessor";
/**
* Directory containing the classes and resource files that should be packaged into
* the archive.
*/
@Parameter(defaultValue = "${project.build.testOutputDirectory}", required = true)
private File testClassesDirectory;
/** /**
* Directory containing the classes and resource files that should be used to run the * Directory containing the classes and resource files that should be used to run the
* tests. * tests.
*/ */
@Parameter(defaultValue = "${project.build.testOutputDirectory}", required = true) @Parameter(defaultValue = "${project.build.outputDirectory}", required = true)
private File classesDirectory; private File classesDirectory;
/** /**
* Directory containing the generated test sources. * Directory containing the generated sources.
*/ */
@Parameter(defaultValue = "${project.build.directory}/spring-aot/test/sources", required = true) @Parameter(defaultValue = "${project.build.directory}/spring-aot/test/sources", required = true)
private File generatedSources; private File generatedSources;
@ -83,6 +90,12 @@ public class ProcessTestAotMojo extends AbstractAotMojo {
* Directory containing the generated test classes. * Directory containing the generated test classes.
*/ */
@Parameter(defaultValue = "${project.build.directory}/spring-aot/test/classes", required = true) @Parameter(defaultValue = "${project.build.directory}/spring-aot/test/classes", required = true)
private File generatedTestClasses;
/**
* Directory containing the generated test classes.
*/
@Parameter(defaultValue = "${project.build.directory}/spring-aot/main/classes", required = true)
private File generatedClasses; private File generatedClasses;
/** /**
@ -115,25 +128,27 @@ public class ProcessTestAotMojo extends AbstractAotMojo {
return; return;
} }
generateAotAssets(getClassPath(true), AOT_PROCESSOR_CLASS_NAME, getAotArguments()); generateAotAssets(getClassPath(true), AOT_PROCESSOR_CLASS_NAME, getAotArguments());
compileSourceFiles(getClassPath(false), this.generatedSources, this.classesDirectory); compileSourceFiles(getClassPath(false), this.generatedSources, this.testClassesDirectory);
copyAll(this.generatedResources.toPath().resolve("META-INF/native-image"), copyAll(this.generatedResources.toPath().resolve("META-INF/native-image"),
this.classesDirectory.toPath().resolve("META-INF/native-image")); this.testClassesDirectory.toPath().resolve("META-INF/native-image"));
copyAll(this.generatedClasses.toPath(), this.classesDirectory.toPath()); copyAll(this.generatedTestClasses.toPath(), this.testClassesDirectory.toPath());
} }
private String[] getAotArguments() { private String[] getAotArguments() {
List<String> aotArguments = new ArrayList<>(); List<String> aotArguments = new ArrayList<>();
aotArguments.add(this.classesDirectory.toPath().toAbsolutePath().normalize().toString()); aotArguments.add(this.testClassesDirectory.toPath().toAbsolutePath().normalize().toString());
aotArguments.add(this.generatedSources.toString()); aotArguments.add(this.generatedSources.toString());
aotArguments.add(this.generatedResources.toString()); aotArguments.add(this.generatedResources.toString());
aotArguments.add(this.generatedClasses.toString()); aotArguments.add(this.generatedTestClasses.toString());
aotArguments.add(this.project.getGroupId()); aotArguments.add(this.project.getGroupId());
aotArguments.add(this.project.getArtifactId()); aotArguments.add(this.project.getArtifactId());
return aotArguments.toArray(String[]::new); return aotArguments.toArray(String[]::new);
} }
protected URL[] getClassPath(boolean includeJUnitPlatformLauncher) throws Exception { protected URL[] getClassPath(boolean includeJUnitPlatformLauncher) throws Exception {
URL[] classPath = getClassPath(this.classesDirectory, this.generatedClasses); File[] directories = new File[] { this.testClassesDirectory, this.generatedTestClasses, this.classesDirectory,
this.generatedClasses };
URL[] classPath = getClassPath(directories);
if (!includeJUnitPlatformLauncher || this.project.getArtifactMap() if (!includeJUnitPlatformLauncher || this.project.getArtifactMap()
.containsKey(JUNIT_PLATFORM_GROUP_ID + ":" + JUNIT_PLATFORM_LAUNCHER_ARTIFACT_ID)) { .containsKey(JUNIT_PLATFORM_GROUP_ID + ":" + JUNIT_PLATFORM_LAUNCHER_ARTIFACT_ID)) {
return classPath; return classPath;