[JENKINS-68147] Support Java 17

pom.xml

@@ -58,6 +58,11 @@
         </dependencies>
     </dependencyManagement>
     <dependencies>
+        <dependency>
+            <groupId>org.jenkins-ci</groupId>
+            <artifactId>version-number</artifactId>
+            <version>1.10</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

src/main/java/hudson/plugin/versioncolumn/JVMVersionComparator.java

@@ -25,6 +25,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import hudson.util.VersionNumber;
+import io.jenkins.lib.versionnumber.JavaSpecificationVersion;
 import jenkins.model.Jenkins;
 import org.apache.commons.codec.binary.Hex;
 
@@ -38,7 +39,6 @@
 import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 
-import static hudson.plugin.versioncolumn.JVMConstants.JDK_VERSION_NUMBER_TO_BYTECODE_LEVEL_MAPPING;
 
 /**
  * Responsible for master and agent jvm versions comparisons, and notions of "compatibility".
@@ -90,17 +90,25 @@ private int getMasterBytecodeMajorVersionNumber() {
     }
 
     private boolean isAgentRuntimeCompatibleWithJenkinsBytecodeLevel(String agentMajorMinorVersion) {
-        Integer masterBytecodeLevel = getMasterBytecodeMajorVersionNumber();
-        Integer agentVMMaxBytecodeLevel = JDK_VERSION_NUMBER_TO_BYTECODE_LEVEL_MAPPING.get(agentMajorMinorVersion);
-        if (agentVMMaxBytecodeLevel != null) {
-            return masterBytecodeLevel <= agentVMMaxBytecodeLevel;
+        int masterBytecodeLevel = getMasterBytecodeMajorVersionNumber();
+        int releaseVersion;
+        if (agentMajorMinorVersion.startsWith("1.")) {
+            releaseVersion = Integer.parseInt(agentMajorMinorVersion.split("\\.")[1]);
         } else {
+            releaseVersion = Integer.parseInt(agentMajorMinorVersion.split("\\.")[0]);
+        }
+        try {
+            int agentVMMaxBytecodeLevel = JavaSpecificationVersion.fromReleaseVersion(releaseVersion).toClassVersion();
+            return masterBytecodeLevel <= agentVMMaxBytecodeLevel;
+        } catch (NullPointerException e) {
             LOGGER.log(Level.WARNING, Messages.JVMVersionMonitor_UnrecognizedAgentJVM(agentMajorMinorVersion));
             /*
              * Even if the version might be compatible, we still mark the node as incompatible to prevent potential issues.
              */
             return false;
+
         }
+
     }
 
     public boolean isCompatible() {
@@ -164,13 +172,13 @@ public int get() {
             // So Jenkins started with Java 1.4 (or less?) reading the *old* changelog (like around ~1.100)
             // but well not sure I'll bother
             if (jenkinsVersion.isOlderThan(new VersionNumber("1.520"))) {
-                return JVMConstants.JAVA_5;
+                return JavaSpecificationVersion.JAVA_5.toClassVersion();
             } else if (jenkinsVersion.isOlderThan(new VersionNumber("1.612"))) {
-                return JVMConstants.JAVA_6;
+                return JavaSpecificationVersion.JAVA_6.toClassVersion();
             } else if (jenkinsVersion.isOlderThan(new VersionNumber("2.54"))) {
-                return JVMConstants.JAVA_7;
+                return JavaSpecificationVersion.JAVA_7.toClassVersion();
             } else if (jenkinsVersion.isNewerThan(new VersionNumber("2.54"))) {
-                return JVMConstants.JAVA_8;
+                return JavaSpecificationVersion.JAVA_8.toClassVersion();
             }
 
             throw new IllegalStateException("Jenkins Bytecode Level could not be inferred");

src/test/java/hudson/plugin/versioncolumn/JVMVersionComparatorTest.java

@@ -1,6 +1,7 @@
 package hudson.plugin.versioncolumn;
 
 
+import io.jenkins.lib.versionnumber.JavaSpecificationVersion;
 import junitparams.JUnitParamsRunner;
 import junitparams.Parameters;
 import org.junit.Test;
@@ -23,20 +24,25 @@ public void computeMajorMinor() {
         assertEquals("1.8", JVMVersionComparator.computeMajorMinor("1.8.1-blah_whatever$wat"));
     }
 
+    @SuppressWarnings("unused")
     private Object[] parametersForCompatible() {
         return new Object[][]{
                 {"1.8.0", "1.8.0", true},
+                {"11.0.11", "11.0.11", true},
                 {"1.8.0", "1.8.0", false},
                 {"1.6.0", "1.6.0", true},
                 {"1.6.0", "1.6.1_ublah_whatever", false},
                 {"1.8.066", "1.8.0110", false},
         };
     }
 
+    @SuppressWarnings("unused")
     private Object[] parametersForIncompatible() {
         return new Object[][]{
                 {"1.5.0", "1.5.1", true},
                 {"1.7.0", "1.6.0", true},
+                {"1.7.0", "11.0.2", true},
+                {"17.0.3", "11.0.2", true},
                 {"1.8.0_66", "1.8.0_110", true},
                 {"1.6.0", "1.6.1", true},
         };
@@ -64,19 +70,23 @@ private JVMVersionComparator.ComparisonMode toExactMatch(boolean exactMatch) {
         }
     }
 
+    @SuppressWarnings("unused")
     private Object[] parametersForCompatibleBytecodeLevel() {
         return new Object[][]{
-                {"1.8.0", JVMConstants.JAVA_8},
-                {"1.8.0", JVMConstants.JAVA_7},
-                {"1.8.0", JVMConstants.JAVA_6},
+                {"1.8.0", JavaSpecificationVersion.JAVA_8.toClassVersion()},
+                {"1.8.0", JavaSpecificationVersion.JAVA_7.toClassVersion()},
+                {"1.8.0", JavaSpecificationVersion.JAVA_6.toReleaseVersion()},
+                {"11.0.1", JavaSpecificationVersion.JAVA_11.toReleaseVersion()},
         };
     }
 
+    @SuppressWarnings("unused")
     private Object[] parametersForIncompatibleBytecodeLevel() {
         return new Object[][]{
-                {"1.7.0", JVMConstants.JAVA_8},
-                {"1.6.1", JVMConstants.JAVA_7},
-                {"1.5.3", JVMConstants.JAVA_6},
+                {"1.7.0", JavaSpecificationVersion.JAVA_8.toClassVersion()},
+                {"1.6.1", JavaSpecificationVersion.JAVA_7.toClassVersion()},
+                {"1.5.3", JavaSpecificationVersion.JAVA_6.toClassVersion()},
+                {"11.0.3", JavaSpecificationVersion.JAVA_12.toClassVersion()},
         };
     }
 
@@ -85,34 +95,34 @@ private Object[] parametersForIncompatibleBytecodeLevel() {
     @Parameters
     public void compatibleBytecodeLevel(String agentVMVersion, final int masterBytecodeMajorVersion) {
         assertTrue(new JVMVersionComparator("whatever", agentVMVersion,
-                                            JVMVersionComparator.ComparisonMode.RUNTIME_GREATER_OR_EQUAL_MASTER_BYTECODE,
-                                            new JVMVersionComparator.MasterBytecodeMajorVersionNumberGetter() {
-                                                @Override
-                                                public int get() {
-                                                    return masterBytecodeMajorVersion;
-                                                }
-                                            }).isCompatible());
+                JVMVersionComparator.ComparisonMode.RUNTIME_GREATER_OR_EQUAL_MASTER_BYTECODE,
+                new JVMVersionComparator.MasterBytecodeMajorVersionNumberGetter() {
+                    @Override
+                    public int get() {
+                        return masterBytecodeMajorVersion;
+                    }
+                }).isCompatible());
     }
 
     @Test
     @Parameters
     public void incompatibleBytecodeLevel(String agentVMVersion, final int masterBytecodeMajorVersion) {
         assertTrue(new JVMVersionComparator("whatever", agentVMVersion,
-                                            JVMVersionComparator.ComparisonMode.RUNTIME_GREATER_OR_EQUAL_MASTER_BYTECODE,
-                                            new JVMVersionComparator.MasterBytecodeMajorVersionNumberGetter() {
-                                                @Override
-                                                public int get() {
-                                                    return masterBytecodeMajorVersion;
-                                                }
-                                            }).isNotCompatible());
+                JVMVersionComparator.ComparisonMode.RUNTIME_GREATER_OR_EQUAL_MASTER_BYTECODE,
+                new JVMVersionComparator.MasterBytecodeMajorVersionNumberGetter() {
+                    @Override
+                    public int get() {
+                        return masterBytecodeMajorVersion;
+                    }
+                }).isNotCompatible());
     }
 
     @Issue("JENKINS-53445")
     @Test
     public void shouldNotThrowNPEWhenJVMVersionIsNotRecognized() {
         JVMVersionComparator jvmVersionComparator =
-              new JVMVersionComparator("99.9", "99.9",
-                    JVMVersionComparator.ComparisonMode.RUNTIME_GREATER_OR_EQUAL_MASTER_BYTECODE);
+                new JVMVersionComparator("99.9", "99.9",
+                        JVMVersionComparator.ComparisonMode.RUNTIME_GREATER_OR_EQUAL_MASTER_BYTECODE);
         assertNotNull(jvmVersionComparator);
         assertFalse(jvmVersionComparator.isCompatible());
     }