OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-10-28 12:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Introduce method to fetch java.specification.version

Browse Source
This commit is contained in:
Baptiste Mathus committed 2019-01-09 18:12:02 +01:00
1 parent 2225631b19
commit 1afa724313
3 files changed
+23 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/PluginWrapper.java
+2 -2
View File
@@ -35,6 +35,7 @@ import hudson.model.UpdateSite;
import hudson.util.VersionNumber;
import jenkins.YesNoMaybe;
import jenkins.model.Jenkins;
import jenkins.util.java.JavaUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.LogFactory;
import org.kohsuke.accmod.Restricted;
@@ -762,8 +763,7 @@ public class PluginWrapper implements Comparable<PluginWrapper>, ModelObject {
String minimumJavaVersion = getMinimumJavaVersion();
if (minimumJavaVersion != null) {
// TODO replace with calls to Runtime.version() once we're on Java 9+
VersionNumber actualVersion = new VersionNumber(System.getProperty("java.specification.version"));
VersionNumber actualVersion = JavaUtils.getCurrentJavaRuntimeVersionNumber();
if (actualVersion.isOlderThan(new VersionNumber(minimumJavaVersion))) {
versionDependencyError(Messages.PluginWrapper_obsoleteJava(actualVersion.toString(), minimumJavaVersion), actualVersion.toString(), minimumJavaVersion);
}