Fix default Java 21 to run OpenRewrite

Author: jonesbusy

plugin-modernizer-cli/src/test/java/io/jenkins/tools/pluginmodernizer/cli/CommandLineITCase.java

@@ -680,6 +680,7 @@ private InvocationRequest buildRequest(String args, Path logFile) {
             properties.put("set.changelist", "true");
         }
         properties.put("exec.executable", javaHome.resolve("bin/java").toString());
+        LOG.debug("Using java executable: {}", properties.get("exec.executable"));
         properties.put("test.cliArgs", args);
         request.setProperties(properties);
 

plugin-modernizer-core/src/main/java/io/jenkins/tools/pluginmodernizer/core/impl/PluginModernizer.java

@@ -159,6 +159,7 @@ public void start() {
         LOG.debug("Plugin Health Score Url: {}", config.getPluginHealthScore());
         LOG.debug("Installation Stats Url: {}", config.getPluginStatsInstallations());
         LOG.debug("Cache Path: {}", config.getCachePath());
+        LOG.debug("Java Version: {}", getJavaVersion());
         LOG.debug("Maven Home: {}", config.getMavenHome());
         LOG.debug("Maven Local Repository: {}", config.getMavenLocalRepo());
         LOG.debug("Dry Run: {}", config.isDryRun());
@@ -237,7 +238,7 @@ private void process(Plugin plugin) {
             plugin.checkoutBranch(ghService);
 
             // Minimum JDK to run openrewrite
-            plugin.withJDK(JDK.JAVA_17);
+            plugin.withJDK(JDK.JAVA_21);
 
             // Collect metadata and move metadata from the target directory of the plugin to the common cache
             if (!plugin.hasMetadata() || config.isFetchMetadataOnly()) {
@@ -348,7 +349,7 @@ private void process(Plugin plugin) {
 
             // Recollect metadata after modernization
             if (!config.isFetchMetadataOnly()) {
-                plugin.withJDK(JDK.JAVA_17);
+                plugin.withJDK(JDK.JAVA_21);
                 plugin.clean(mavenInvoker);
                 collectMetadata(plugin, false);
                 LOG.debug(
@@ -416,7 +417,7 @@ private void process(Plugin plugin) {
      */
     private void collectMetadata(Plugin plugin, boolean retryAfterFirstCompile) {
         LOG.trace("Collecting metadata for plugin {}... Please be patient", plugin.getName());
-        plugin.withJDK(JDK.JAVA_17);
+        plugin.withJDK(JDK.JAVA_21);
         try {
             plugin.collectMetadata(mavenInvoker);
             if (plugin.hasErrors()) {
@@ -435,7 +436,7 @@ private void collectMetadata(Plugin plugin, boolean retryAfterFirstCompile) {
                             plugin.getName());
                     plugin.raiseLastError();
                 }
-                plugin.withJDK(JDK.JAVA_17);
+                plugin.withJDK(JDK.JAVA_21);
                 plugin.collectMetadata(mavenInvoker);
             } else {
                 LOG.info("Failed to collect metadata for plugin {}. Not retrying.", plugin.getName());
@@ -539,7 +540,7 @@ private JDK verifyPlugin(Plugin plugin) {
         // Determine the JDK
         JDK jdk;
         if (metadata.getJdks() == null || metadata.getJdks().isEmpty()) {
-            jdk = JDK.JAVA_17;
+            jdk = JDK.JAVA_21;
             LOG.info(
                     "No JDKs found in metadata for plugin {}. Using same JDK as rewrite for verification",
                     plugin.getName());

plugin-modernizer-core/src/main/java/io/jenkins/tools/pluginmodernizer/core/model/Plugin.java

@@ -788,7 +788,7 @@ public void collectMetadata(MavenInvoker maven) {
      * @param maven The maven invoker instance
      */
     public void runOpenRewrite(MavenInvoker maven) {
-        withJDK(JDK.JAVA_17);
+        withJDK(JDK.JAVA_21);
         if (config.isFetchMetadataOnly()) {
             LOG.info("Skipping OpenRewrite recipe application for plugin {} as only metadata is required", name);
             return;