Spring/spring-data-dev-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consider JVM build version in Java runtime detection.

Browse Source 
We now consider the JVM build number. Also, the SDKman discovery prepends 1. to Java versions that are 1.8 based for a consistent versioning scheme.

See #200
This commit is contained in:
Mark Paluch
2022-01-18 09:42:41 +01:00
parent 369efb7c3e
commit 79639c3791
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
release-tools/src/main/java/org/springframework/data/release/io/JavaRuntimes.java
View File

@@ -172,9 +172,19 @@ public class JavaRuntimes {
return Arrays.stream(files).map(it -> {
Matcher matcher = CANDIDATE.matcher(it.getName());
matcher.find();
if (!matcher.find()) {
throw new IllegalArgumentException("Cannot determine JVM version number from SDKman candidate name "
+ it.getName() + ". This should not happen in an ideal world, check the CANDIDATE regex.");
}
return new JdkInstallation(Version.parse(matcher.group(1)), it.getName(), it);
String candidateVersion = matcher.group(1);
Version version = Version.parse(candidateVersion);
if (version.getMajor() <= 8) {
candidateVersion = "1." + candidateVersion;
version = Version.parse(candidateVersion);
}
return new JdkInstallation(version, it.getName(), it);
}).collect(Collectors.toList());
}
@@ -210,7 +220,7 @@ public class JavaRuntimes {
private static final File javaHomeBinary = new File("/usr/libexec/java_home");
private static final Pattern VERSION = Pattern.compile("(\\d+(:?\\.\\d+)*)(:?_\\+.*)?");
private static final Pattern VERSION = Pattern.compile("((:?\\d+(:?\\.\\d+)*)(:?_+\\d+)?)");
@Override
public boolean isAvailable() {
@@ -244,7 +254,10 @@ public class JavaRuntimes {
String version = dict.get("JVMVersion").toJavaObject(String.class);
Matcher matcher = VERSION.matcher(version);
matcher.find();
if (!matcher.find()) {
throw new IllegalArgumentException("Cannot determine JVM version number from JVMVersion " + version
+ ". This should not happen in an ideal world, check the VERSION regex.");
}
return new JdkInstallation(JavaVersion.parse(matcher.group(1)), name, new File(jvmHomePath));