Browse Source

Merge branch '3.1.x'

Closes gh-36495
pull/36503/head
Andy Wilkinson 3 years ago
parent
commit
07a7ff473b
  1. 4
      spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ProcessAotMojo.java
  2. 4
      spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ProcessTestAotMojo.java

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

@ -88,6 +88,10 @@ public class ProcessAotMojo extends AbstractAotMojo { @@ -88,6 +88,10 @@ public class ProcessAotMojo extends AbstractAotMojo {
@Override
protected void executeAot() throws Exception {
if (this.project.getPackaging().equals("pom")) {
getLog().debug("process-aot goal could not be applied to pom project.");
return;
}
String applicationClass = (this.mainClass != null) ? this.mainClass
: SpringBootApplicationClassFinder.findSingleClass(this.classesDirectory);
URL[] classPath = getClassPath();

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

@ -118,6 +118,10 @@ public class ProcessTestAotMojo extends AbstractAotMojo { @@ -118,6 +118,10 @@ public class ProcessTestAotMojo extends AbstractAotMojo {
@Override
protected void executeAot() throws Exception {
if (this.project.getPackaging().equals("pom")) {
getLog().debug("process-test-aot goal could not be applied to pom project.");
return;
}
if (Boolean.getBoolean("skipTests") || Boolean.getBoolean("maven.test.skip")) {
getLog().info("Skipping AOT test processing since tests are skipped");
return;

Loading…
Cancel
Save