Skip to content

Commit

Permalink
Work around missing graalvm internal version starting with JDK 22
Browse files Browse the repository at this point in the history
Temporarily works around
quarkusio#36246, till we have a
consensus on how to move forward in
quarkusio#34161

Closes quarkusio#36246
  • Loading branch information
zakkak authored and holly-cummins committed Feb 8, 2024
1 parent 8d7218b commit 078a930
Showing 1 changed file with 17 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -62,7 +63,7 @@ static Version parse(List<String> lines) {
String vendorVersion = secondMatcher.group(VENDOR_VERSION_GROUP);

String buildInfo = secondMatcher.group(BUILD_INFO_GROUP);
String graalVersion = graalVersion(buildInfo);
String graalVersion = graalVersion(buildInfo, v.feature());
if (vendorVersion.contains("-dev")) {
graalVersion = graalVersion + "-dev";
}
Expand Down Expand Up @@ -106,7 +107,7 @@ private static String matchVersion(String version) {
return null;
}

private static String graalVersion(String buildInfo) {
private static String graalVersion(String buildInfo, int jdkFeature) {
if (buildInfo == null) {
return null;
}
Expand All @@ -115,10 +116,23 @@ private static String graalVersion(String buildInfo) {
return null;
}
String version = buildInfo.substring(idx + JVMCI_BUILD_PREFIX.length());
return matchVersion(version);
Matcher versMatcher = VERSION_PATTERN.matcher(version);
if (versMatcher.find()) {
return matchVersion(version);
} else {
return GRAAL_MAPPING.get(jdkFeature);
}
}
}

// Temporarily work around https://github.com/quarkusio/quarkus/issues/36246,
// till we have a consensus on how to move forward in
// https://github.com/quarkusio/quarkus/issues/34161
private static final Map<Integer, String> GRAAL_MAPPING = Map.of(22, "24.0",
23, "24.1",
24, "25.0",
25, "25.1");

public static final class Version implements Comparable<Version> {

/**
Expand Down

0 comments on commit 078a930

Please sign in to comment.