From 331d924025fd464baaf72ee640eb96075c2f1c13 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Mon, 14 Aug 2023 14:58:18 -0700 Subject: [PATCH] Simplify Java version logic --- .../connector/DockerComputerConnectorTest.java | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/test/java/io/jenkins/docker/connector/DockerComputerConnectorTest.java b/src/test/java/io/jenkins/docker/connector/DockerComputerConnectorTest.java index 3ed96e41..4abd0060 100644 --- a/src/test/java/io/jenkins/docker/connector/DockerComputerConnectorTest.java +++ b/src/test/java/io/jenkins/docker/connector/DockerComputerConnectorTest.java @@ -45,22 +45,8 @@ public abstract class DockerComputerConnectorTest { protected static final String INSTANCE_CAP = "10"; private static int getJavaVersion() { - final String systemPropertyName = "java.version"; - final String javaVersion = System.getProperty(systemPropertyName); - try { - // We're using Java 9 or higher so the syntax is x.n... - // ... but x might be multiple digits. - // e.g. 9.0 is Java 9, 11.123.4 is Java 11 etc. - // Early access builds report as "21-ea". Remove all text after "-". - final int indexOfPeriod = javaVersion.indexOf('.'); - final String firstNumber = javaVersion.replaceAll("[-.].*", ""); - return Integer.parseInt(firstNumber); - } catch (RuntimeException ex) { - throw new IllegalStateException( - "Unable to determine version of Java from system property '" + systemPropertyName + "' value '" - + javaVersion + "'.", - ex); - } + Runtime.Version runtimeVersion = Runtime.version(); + return runtimeVersion.version().get(0); } protected static String getJenkinsDockerImageVersionForThisEnvironment() {