You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2026/08/06 08:53:22 UTC

(maven) 06/14: Fix auto-toolchain selection: compiler plugin config, compat layer, and JDK discovery

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch fix-module-name-strategy
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 209791942bb89fb7218102b4ea9c5159e0c9952a
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 31 11:56:06 2026 +0200

    Fix auto-toolchain selection: compiler plugin config, compat layer, and JDK discovery
    
    Three fixes for automatic JDK toolchain selection:
    
    1. Read source level from compiler plugin configuration: many projects set
       <source> and <release> directly in the maven-compiler-plugin <configuration>
       block rather than as properties. Added getSourceLevelFromCompilerPlugin()
       to check both <release> and <source> elements.
    
    2. Pass JdkToolchainDiscoverer to compat layer: ToolchainManagerFactory was
       creating DefaultToolchainManager without the discoverer, so old plugins
       going through the compat layer could detect incompatibility but had no
       discoverer to find alternative JDKs.
    
    3. Scan JAVA_HOME parent directory for sibling JDKs: in CI and container
       environments, multiple JDKs are often installed as siblings (e.g.
       /toolchain/jdk-8, /toolchain/jdk-11, /toolchain/jdk-21). Added parent
       directory scanning from each JAVA*_HOME env var.
    
    Co-Authored-By: Claude Opus 4.6 <no...@anthropic.com>
---
 .../maven/toolchain/ToolchainManagerFactory.java   |  5 +-
 .../apache/maven/impl/DefaultToolchainManager.java | 53 ++++++++++++++++++++++
 .../apache/maven/impl/JdkToolchainDiscoverer.java  | 13 +++++-
 3 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/compat/maven-compat/src/main/java/org/apache/maven/toolchain/ToolchainManagerFactory.java b/compat/maven-compat/src/main/java/org/apache/maven/toolchain/ToolchainManagerFactory.java
index 5123ff11d0..153cfd0384 100644
--- a/compat/maven-compat/src/main/java/org/apache/maven/toolchain/ToolchainManagerFactory.java
+++ b/compat/maven-compat/src/main/java/org/apache/maven/toolchain/ToolchainManagerFactory.java
@@ -155,7 +155,10 @@ public Optional<org.apache.maven.api.Toolchain> createDefaultToolchain()
             });
         }
         allFactories.putAll(v4Factories);
-        return new org.apache.maven.impl.DefaultToolchainManager(allFactories, logger) {};
+        org.apache.maven.impl.JdkToolchainDiscoverer discoverer = lookup.lookupOptional(
+                        org.apache.maven.impl.JdkToolchainDiscoverer.class)
+                .orElse(null);
+        return new org.apache.maven.impl.DefaultToolchainManager(allFactories, discoverer, logger) {};
     }
 
     public class DefaultToolchainManagerV4 implements org.apache.maven.api.services.ToolchainManager {
diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultToolchainManager.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultToolchainManager.java
index 9169252983..890d0f5d15 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultToolchainManager.java
+++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultToolchainManager.java
@@ -37,6 +37,7 @@
 import org.apache.maven.api.di.Named;
 import org.apache.maven.api.di.Singleton;
 import org.apache.maven.api.model.Build;
+import org.apache.maven.api.model.Plugin;
 import org.apache.maven.api.model.Source;
 import org.apache.maven.api.services.Lookup;
 import org.apache.maven.api.services.ToolchainFactory;
@@ -44,6 +45,7 @@
 import org.apache.maven.api.services.ToolchainManager;
 import org.apache.maven.api.services.ToolchainManagerException;
 import org.apache.maven.api.toolchain.ToolchainModel;
+import org.apache.maven.api.xml.XmlNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -264,6 +266,57 @@ int getProjectRequiredSourceLevel(Session session) {
             }
         }
 
+        // Fall back to compiler plugin configuration (<release>, <source>)
+        int pluginLevel = getSourceLevelFromCompilerPlugin(build);
+        if (pluginLevel > 0) {
+            return pluginLevel;
+        }
+
+        return -1;
+    }
+
+    /**
+     * Reads the source level from the maven-compiler-plugin configuration.
+     * Checks both {@code <release>} and {@code <source>} elements in the plugin's
+     * {@code <configuration>} block.
+     *
+     * @return the source level, or {@code -1} if not configured
+     */
+    private int getSourceLevelFromCompilerPlugin(Build build) {
+        if (build == null) {
+            return -1;
+        }
+        for (Plugin plugin : build.getPlugins()) {
+            if ("maven-compiler-plugin".equals(plugin.getArtifactId())
+                    && (plugin.getGroupId() == null
+                            || plugin.getGroupId().isEmpty()
+                            || "org.apache.maven.plugins".equals(plugin.getGroupId()))) {
+                XmlNode config = plugin.getConfiguration();
+                if (config != null) {
+                    // <release> takes precedence over <source>
+                    XmlNode releaseNode = config.child("release");
+                    if (releaseNode != null
+                            && releaseNode.value() != null
+                            && !releaseNode.value().isBlank()) {
+                        int level = JdkSourceLevelSupport.normalizeSourceLevel(
+                                releaseNode.value().trim());
+                        if (level > 0) {
+                            return level;
+                        }
+                    }
+                    XmlNode sourceNode = config.child("source");
+                    if (sourceNode != null
+                            && sourceNode.value() != null
+                            && !sourceNode.value().isBlank()) {
+                        int level = JdkSourceLevelSupport.normalizeSourceLevel(
+                                sourceNode.value().trim());
+                        if (level > 0) {
+                            return level;
+                        }
+                    }
+                }
+            }
+        }
         return -1;
     }
 
diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/JdkToolchainDiscoverer.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/JdkToolchainDiscoverer.java
index 1d7dfe767b..964441a1ed 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/JdkToolchainDiscoverer.java
+++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/JdkToolchainDiscoverer.java
@@ -111,6 +111,9 @@ private List<ToolchainModel> doDiscover(Map<String, String> properties) {
     /**
      * Collects JDK candidates from environment variables matching {@code JAVA*_HOME}.
      * Environment variables are read from the properties map as {@code env.VAR_NAME} entries.
+     * Also scans the parent directory of {@code JAVA_HOME} for sibling JDK installations
+     * (common in CI environments and container images where multiple JDKs are installed
+     * under the same parent directory).
      */
     void collectFromEnvironment(Set<Path> candidates, Map<String, String> properties) {
         // Current JDK (from java.home system property)
@@ -123,7 +126,15 @@ void collectFromEnvironment(Set<Path> candidates, Map<String, String> properties
         for (Map.Entry<String, String> entry : properties.entrySet()) {
             String name = entry.getKey();
             if (name.startsWith("env.JAVA") && name.endsWith("_HOME")) {
-                addCandidate(candidates, Paths.get(entry.getValue()));
+                Path jdkPath = Paths.get(entry.getValue());
+                addCandidate(candidates, jdkPath);
+                // Also scan sibling directories — in CI and container environments,
+                // multiple JDKs are often installed under the same parent directory
+                // (e.g. /toolchain/jdk-8, /toolchain/jdk-11, /toolchain/jdk-21)
+                Path parent = jdkPath.getParent();
+                if (parent != null) {
+                    scanSubdirectories(candidates, parent);
+                }
             }
         }
     }