Browse Source

Don't use ArgFile when using JavaCompiler

See gh-44340

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
pull/44355/head
Dmytro Nosan 10 months ago committed by Phillip Webb
parent
commit
0e81b6386e
  1. 2
      spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractAotMojo.java
  2. 3
      spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java
  3. 5
      spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ClasspathBuilder.java

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

@ -147,7 +147,7 @@ public abstract class AbstractAotMojo extends AbstractDependencyFilterMojo { @@ -147,7 +147,7 @@ public abstract class AbstractAotMojo extends AbstractDependencyFilterMojo {
JavaCompilerPluginConfiguration compilerConfiguration = new JavaCompilerPluginConfiguration(this.project);
List<String> options = new ArrayList<>();
options.add("-cp");
options.add(ClasspathBuilder.forURLs(classPath).build().argument());
options.add(ClasspathBuilder.forURLs(classPath).build().toString());
options.add("-d");
options.add(outputDirectory.toPath().toAbsolutePath().toString());
String releaseVersion = compilerConfiguration.getReleaseVersion();

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

@ -348,8 +348,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo { @@ -348,8 +348,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
try {
Classpath classpath = ClasspathBuilder.forURLs(getClassPathUrls()).build();
if (getLog().isDebugEnabled()) {
getLog().debug("Classpath for forked process: "
+ classpath.elements().map(Object::toString).collect(Collectors.joining(File.separator)));
getLog().debug("Classpath for forked process: " + classpath);
}
args.add("-cp");
args.add(classpath.argument());

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

@ -186,6 +186,11 @@ class ClasspathBuilder { @@ -186,6 +186,11 @@ class ClasspathBuilder {
return this.elements.stream();
}
@Override
public String toString() {
return elements().map(Path::toString).collect(Collectors.joining(File.pathSeparator));
}
}
}

Loading…
Cancel
Save