From 5389bf7dc65bf961062de02a5cec7eb0be3462e8 Mon Sep 17 00:00:00 2001
From: Johannes Bechberger <johannes.bechberger@sap.com>
Date: Tue, 24 Mar 2026 16:26:14 +0100
Subject: [PATCH] Add fix for 21.0.10.0.1 issue

---
 .../maven/enforcer/rules/version/RequireJavaVersion.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/version/RequireJavaVersion.java b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/version/RequireJavaVersion.java
index caee647e..0252956b 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/version/RequireJavaVersion.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/enforcer/rules/version/RequireJavaVersion.java
@@ -98,7 +98,11 @@ public void execute() throws EnforcerRuleException {
 
         setCustomMessageIfNoneConfigured(detectedJdkVersion, getVersion());
 
-        enforceVersion("JDK", getVersion(), detectedJdkVersion);
+        try {
+            enforceVersion("JDK", getVersion(), new DefaultArtifactVersion(javaVersion));
+        } catch (EnforcerRuleException ex) {
+            enforceVersion("JDK", getVersion(), detectedJdkVersion);
+        }
     }
 
     /**