diff --git a/core/src/main/java/jenkins/util/java/JavaUtils.java b/core/src/main/java/jenkins/util/java/JavaUtils.java index 9bc3aa8fa5..30d43f8ed2 100644 --- a/core/src/main/java/jenkins/util/java/JavaUtils.java +++ b/core/src/main/java/jenkins/util/java/JavaUtils.java @@ -40,24 +40,6 @@ public class JavaUtils { // Cannot construct } - /** - * Check whether the current JVM is running with Java 8 or below - * @return {@code true} if it is Java 8 or older version - */ - public static boolean isRunningWithJava8OrBelow() { - String javaVersion = getCurrentRuntimeJavaVersion(); - return javaVersion.startsWith("1."); - } - - /** - * Check whether the current JVM is running with Java 9 or above. - * @return {@code true} if it is Java 9 or above - */ - public static boolean isRunningWithPostJava8() { - String javaVersion = getCurrentRuntimeJavaVersion(); - return !javaVersion.startsWith("1."); - } - /** * Returns the JVM's current version as a {@link VersionNumber} instance. */ diff --git a/core/src/test/java/jenkins/util/java/JavaUtilsTest.java b/core/src/test/java/jenkins/util/java/JavaUtilsTest.java deleted file mode 100644 index 31a517d3fe..0000000000 --- a/core/src/test/java/jenkins/util/java/JavaUtilsTest.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2018 CloudBees, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -package jenkins.util.java; - -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assumptions.assumeFalse; -import static org.junit.jupiter.api.Assumptions.assumeTrue; - -import org.junit.jupiter.api.Test; -import org.jvnet.hudson.test.For; - -@For(JavaUtils.class) -class JavaUtilsTest { - - @Test - void verifyJava8() { - assumeTrue(System.getProperty("java.version").startsWith("1."), "Test is for Java 8 only"); - assertFalse(JavaUtils.isRunningWithPostJava8(), "isRunningWithPostJava8() should return false on Java 8 and below"); - } - - @Test - void verifyPostJava8() { - assumeFalse(System.getProperty("java.version").startsWith("1."), "Test is for Java 9+ only"); - assertTrue(JavaUtils.isRunningWithPostJava8(), "isRunningWithPostJava8() should return true on Java 9 and above"); - } -}