diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/AotTests.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/AotTests.java index 3a6469ab5326..fa8c356b6a57 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/AotTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/AotTests.java @@ -114,6 +114,15 @@ void whenAotRunsWithJvmArgumentsSourcesAreGenerated(MavenBuild mavenBuild) { }); } + @TestTemplate + void whenAotRunsWithReleaseSourcesAreGenerated(MavenBuild mavenBuild) { + mavenBuild.project("aot-release").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")); + }); + } + @TestTemplate void whenAotRunsWithInvalidCompilerArgumentsCompileFails(MavenBuild mavenBuild) { mavenBuild.project("aot-compiler-arguments").goals("package").executeAndFail( diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/aot-release/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/aot-release/pom.xml new file mode 100644 index 000000000000..1adf8fa66eeb --- /dev/null +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/aot-release/pom.xml @@ -0,0 +1,43 @@ + + + 4.0.0 + org.springframework.boot.maven.it + aot + 0.0.1.BUILD-SNAPSHOT + + UTF-8 + @java.version@ + @java.version@ + @java.version@ + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + + process-aot + + + + + + + + + org.springframework.boot + spring-boot + @project.version@ + + + jakarta.servlet + jakarta.servlet-api + @jakarta-servlet.version@ + provided + + + diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/aot-release/src/main/java/org/test/SampleApplication.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/aot-release/src/main/java/org/test/SampleApplication.java new file mode 100644 index 000000000000..d8ccd2df1c49 --- /dev/null +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/aot-release/src/main/java/org/test/SampleApplication.java @@ -0,0 +1,30 @@ +/* + * Copyright 2012-2022 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.context.annotation.Import; + +@Configuration(proxyBeanMethods = false) +public class SampleApplication { + + public static void main(String[] args) { + SpringApplication.run(SampleApplication.class, args); + } + +} diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractAotMojo.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractAotMojo.java index 41d6038630d6..70696629deae 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractAotMojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractAotMojo.java @@ -136,15 +136,17 @@ protected final void compileSourceFiles(URL[] classPath, File sourcesDirectory, options.add(ClasspathBuilder.build(Arrays.asList(classPath))); options.add("-d"); options.add(outputDirectory.toPath().toAbsolutePath().toString()); - options.add("--source"); - options.add(compilerConfiguration.getSourceMajorVersion()); - options.add("--target"); - options.add(compilerConfiguration.getTargetMajorVersion()); String releaseVersion = compilerConfiguration.getReleaseVersion(); if (releaseVersion != null) { options.add("--release"); options.add(releaseVersion); } + else { + options.add("--source"); + options.add(compilerConfiguration.getSourceMajorVersion()); + options.add("--target"); + options.add(compilerConfiguration.getTargetMajorVersion()); + } options.addAll(new RunArguments(this.compilerArguments).getArgs()); Iterable compilationUnits = fileManager.getJavaFileObjectsFromPaths(sourceFiles); Errors errors = new Errors();