Skip to content

[MJAR-310] - fixed toolchain version detection when toolchain paths contain white spaces #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slawekjaranowski merged 1 commit into from
Jun 1, 2024
Merged

[MJAR-310] - fixed toolchain version detection when toolchain paths contain white spaces #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,6 @@
</dependency>

<!-- plexus -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
Expand Down
45 changes: 28 additions & 17 deletions src/main/java/org/apache/maven/plugins/jar/ToolchainsJdkSpecification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@
import javax.inject.Named;
import javax.inject.Singleton;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UncheckedIOException;
import java.nio.file.Path;
import java.nio.file.Paths;
Expand All @@ -30,9 +33,6 @@
import java.util.Optional;

import org.apache.maven.toolchain.Toolchain;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -70,15 +70,12 @@ private Path getCanonicalPath(Path path) {

private String getSpecForPath(Path path) {
try {
Commandline cl = new Commandline(path.toString());
cl.createArg().setValue("-version");
CommandLineUtils.StringStreamConsumer out = new CommandLineUtils.StringStreamConsumer();
CommandLineUtils.StringStreamConsumer err = new CommandLineUtils.StringStreamConsumer();
CommandLineUtils.executeCommandLine(cl, out, err);
String version = out.getOutput().trim();
if (version.isEmpty()) {
version = err.getOutput().trim();
}
ProcessBuilder processBuilder = new ProcessBuilder(path.toString(), "-version");
processBuilder.redirectErrorStream(true);
Process process = processBuilder.start();
String version = readOutput(process.getInputStream()).trim();
process.waitFor();

if (version.startsWith("javac ")) {
version = version.substring(6);
if (version.startsWith("1.")) {
Expand All @@ -88,12 +85,26 @@ private String getSpecForPath(Path path) {
}
return version;
} else {
logger.warn("Unrecognized output form " + path + " -version - " + version);
return null;
logger.warn("Unrecognized output from {}: {}", processBuilder.command(), version);
}
} catch (CommandLineException | IndexOutOfBoundsException e) {
logger.warn("Failed to execute: " + path + " - " + e.getMessage());
return null;
} catch (IndexOutOfBoundsException | IOException e) {
logger.warn("Failed to execute: {} - {}", path, e.getMessage());
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}

return null;
}

private String readOutput(InputStream inputstream) throws IOException {
BufferedReader br = new BufferedReader(new InputStreamReader(inputstream));

StringBuilder output = new StringBuilder();
String line;
while ((line = br.readLine()) != null) {
output.append(line + System.lineSeparator());
}

return output.toString();
}
}