Skip to content

Fix detecting java version for JDK 1.8 #462

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix detecting java version for JDK 1.8 #462

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
32 changes: 19 additions & 13 deletions ...plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,18 +258,22 @@ private String getOutOfProcessJavacVersion(String executable) throws CompilerExc
* up to 21 (https://docs.oracle.com/en/java/javase/21/docs/specs/man/javac.html#standard-options)
*/
cli.addArguments(new String[] {"-version"}); //
CommandLineUtils.StringStreamConsumer out = new CommandLineUtils.StringStreamConsumer();
CommandLineUtils.StringStreamConsumer err = new CommandLineUtils.StringStreamConsumer();
List<String> out = new ArrayList<>();
List<String> err = new ArrayList<>();
try {
int exitCode = CommandLineUtils.executeCommandLine(cli, out, err);
int exitCode = CommandLineUtils.executeCommandLine(cli, out::add, err::add);
if (exitCode != 0) {
throw new CompilerException("Could not retrieve version from " + executable + ". Exit code "
+ exitCode + ", Output: " + out.getOutput() + ", Error: " + err.getOutput());
+ exitCode + ", Output: " + String.join(System.lineSeparator(), out) + ", Error: "
+ String.join(System.lineSeparator(), err));
}
} catch (CommandLineException e) {
throw new CompilerException("Error while executing the external compiler " + executable, e);
}
version = tryParseVersion(out.getOutput().trim());
version = tryParseVersion(out);
if (version == null) {
version = tryParseVersion(err);
}
VERSION_PER_EXECUTABLE.put(executable, version);
}
return version;
Expand All @@ -283,15 +287,17 @@ static String extractMajorAndMinorVersion(String text) {
return matcher.group();
}

private String tryParseVersion(String version) {
if (version.startsWith("javac ")) {
version = version.substring(6);
if (version.startsWith("1.")) {
version = version.substring(0, 3);
} else {
version = version.substring(0, 2);
private String tryParseVersion(List<String> versions) {
for (String version : versions) {
if (version.startsWith("javac ")) {
version = version.substring(6);
if (version.startsWith("1.")) {
version = version.substring(0, 3);
} else {
version = version.substring(0, 2);
}
return version;
}
return version;
}
return null;
}
Expand Down
Loading