From b327ec2dfad346a69c8fdc85f847368c6c112b44 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Fri, 10 Oct 2025 17:59:37 +0200
Subject: [PATCH 1/2] Enhance target JDK definition for JDK >= 1

Defining maven.compiler.source and maven.compiler.target properties when
running on JDK >= 9 has some side effects.

Fixes #503

Follow-up to https://github.com/apache/maven-apache-parent/pull/543 and https://github.com/apache/maven-apache-parent/pull/550
---
 pom.xml | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 58f94872..3bc7e431 100644
--- a/pom.xml
+++ b/pom.xml
@@ -961,8 +961,6 @@ under the License.
 
   <properties>
     <javaVersion>8</javaVersion>
-    <maven.compiler.source>${javaVersion}</maven.compiler.source>
-    <maven.compiler.target>${javaVersion}</maven.compiler.target>
     <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
     <checkstyle.includeTestSourceDirectory>true</checkstyle.includeTestSourceDirectory>
     <!-- in order to restore default annotation processing behaviour, please override with empty value -->
@@ -1118,7 +1116,7 @@ under the License.</licenseText>
           <artifactId>maven-pmd-plugin</artifactId>
           <version>3.28.0</version>
           <configuration>
-            <targetJdk>${maven.compiler.target}</targetJdk>
+            <targetJdk>${maven.pmd.jdk}</targetJdk>
             <rulesets>
               <ruleset>rulesets/maven.xml</ruleset>
             </rulesets>
@@ -1198,7 +1196,7 @@ under the License.</licenseText>
               <configuration>
                 <rules>
                   <enforceBytecodeVersion>
-                    <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
+                    <maxJdkVersion>${maven.enforcer.jdk}</maxJdkVersion>
                   </enforceBytecodeVersion>
                 </rules>
                 <fail>true</fail>
@@ -1362,6 +1360,28 @@ under the License.</licenseText>
   </reporting>
 
   <profiles>
+    <profile>
+      <id>java8</id>
+      <activation>
+        <jdk>[,9)</jdk>
+      </activation>
+      <properties>
+        <maven.toolchains.jdk>${maven.compiler.target}</maven.toolchains.jdk>
+        <maven.enforcer.jdk>${maven.compiler.target}</maven.enforcer.jdk>
+        <maven.pmd.jdk>${maven.compiler.target}</maven.pmd.jdk>
+      </properties>
+    </profile>
+    <profile>
+      <id>java9+</id>
+      <activation>
+        <jdk>[9,)</jdk>
+      </activation>
+      <properties>
+        <maven.toolchains.jdk>${maven.compiler.release}</maven.toolchains.jdk>
+        <maven.enforcer.jdk>${maven.compiler.release}</maven.enforcer.jdk>
+        <maven.pmd.jdk>${maven.compiler.release}</maven.pmd.jdk>
+      </properties>
+    </profile>
     <profile>
       <id>java17+</id>
       <activation>
@@ -1482,7 +1502,7 @@ under the License.</licenseText>
             <configuration>
               <toolchains>
                 <jdk>
-                  <version>${maven.compiler.target}</version>
+                  <version>${maven.toolchains.jdk}</version>
                 </jdk>
               </toolchains>
             </configuration>

From 36d24bae53aba402def0b7ce755f5f38bc07f65a Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Fri, 14 Nov 2025 08:20:00 +0100
Subject: [PATCH 2/2] use javaVersion property

---
 pom.xml | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3bc7e431..8bc1e871 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1116,7 +1116,7 @@ under the License.</licenseText>
           <artifactId>maven-pmd-plugin</artifactId>
           <version>3.28.0</version>
           <configuration>
-            <targetJdk>${maven.pmd.jdk}</targetJdk>
+            <targetJdk>${javaVersion}</targetJdk>
             <rulesets>
               <ruleset>rulesets/maven.xml</ruleset>
             </rulesets>
@@ -1196,7 +1196,7 @@ under the License.</licenseText>
               <configuration>
                 <rules>
                   <enforceBytecodeVersion>
-                    <maxJdkVersion>${maven.enforcer.jdk}</maxJdkVersion>
+                    <maxJdkVersion>${javaVersion}</maxJdkVersion>
                   </enforceBytecodeVersion>
                 </rules>
                 <fail>true</fail>
@@ -1360,28 +1360,6 @@ under the License.</licenseText>
   </reporting>
 
   <profiles>
-    <profile>
-      <id>java8</id>
-      <activation>
-        <jdk>[,9)</jdk>
-      </activation>
-      <properties>
-        <maven.toolchains.jdk>${maven.compiler.target}</maven.toolchains.jdk>
-        <maven.enforcer.jdk>${maven.compiler.target}</maven.enforcer.jdk>
-        <maven.pmd.jdk>${maven.compiler.target}</maven.pmd.jdk>
-      </properties>
-    </profile>
-    <profile>
-      <id>java9+</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <properties>
-        <maven.toolchains.jdk>${maven.compiler.release}</maven.toolchains.jdk>
-        <maven.enforcer.jdk>${maven.compiler.release}</maven.enforcer.jdk>
-        <maven.pmd.jdk>${maven.compiler.release}</maven.pmd.jdk>
-      </properties>
-    </profile>
     <profile>
       <id>java17+</id>
       <activation>
@@ -1502,7 +1480,7 @@ under the License.</licenseText>
             <configuration>
               <toolchains>
                 <jdk>
-                  <version>${maven.toolchains.jdk}</version>
+                  <version>${javaVersion}</version>
                 </jdk>
               </toolchains>
             </configuration>