root
/
jenkins
mirror of https://github.com/jenkinsci/jenkins.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Remove unused utility methods checking for Java 8 (#8152)
Changelog Drafter / update_draft_release (push) Has been cancelled Details
Changelog Drafter / jenkins_io_draft (push) Has been cancelled Details
Label conflicting PRs / main (push) Has been cancelled Details 

Co-authored-by: Mark Waite <mark.earl.waite@gmail.com>
This commit is contained in:
Christopher Molin 2025-10-06 09:58:55 +02:00 committed by GitHub
parent cb6bc5b1d2
commit 68e7cdec61
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/main/java/jenkins/util/java/JavaUtils.java
View File

@ -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.
*/

49
core/src/test/java/jenkins/util/java/JavaUtilsTest.java
View File

@ -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");
}
}