From 7b7f5345d50cbea2b38b693317a5714c31b22485 Mon Sep 17 00:00:00 2001
From: Benjamin Marwell <bmarwell@apache.org>
Date: Tue, 27 Feb 2024 22:10:37 +0100
Subject: [PATCH] use maven.compiler.release instead of .target

---
 maven-extensions/pom.xml | 7 ++-----
 maven-plugins/pom.xml    | 7 ++-----
 pom.xml                  | 7 ++++---
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/maven-extensions/pom.xml b/maven-extensions/pom.xml
index 4c3f8cad..2a6dc8e3 100644
--- a/maven-extensions/pom.xml
+++ b/maven-extensions/pom.xml
@@ -129,9 +129,7 @@ under the License.
     <profile>
       <id>run-its</id>
       <properties>
-        <!-- when testing with JDK9, change these values to 1.6 from cmdline -->
-        <invoker.maven.compiler.source>${maven.compiler.source}</invoker.maven.compiler.source>
-        <invoker.maven.compiler.target>${maven.compiler.target}</invoker.maven.compiler.target>
+        <invoker.maven.compiler.release>${maven.compiler.release}</invoker.maven.compiler.release>
       </properties>
       <build>
         <plugins>
@@ -150,8 +148,7 @@ under the License.
                 <pomInclude>*/pom.xml</pomInclude>
               </pomIncludes>
               <properties>
-                <maven.compiler.source>${invoker.maven.compiler.source}</maven.compiler.source>
-                <maven.compiler.target>${invoker.maven.compiler.target}</maven.compiler.target>
+                <maven.compiler.release>${invoker.maven.compiler.release}</maven.compiler.release>
               </properties>
             </configuration>
             <executions>
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
index 0018270c..6128067a 100644
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
@@ -176,9 +176,7 @@ under the License.
     <profile>
       <id>run-its</id>
       <properties>
-        <!-- when testing with JDK9, change these values to 1.6 from cmdline -->
-        <invoker.maven.compiler.source>${maven.compiler.source}</invoker.maven.compiler.source>
-        <invoker.maven.compiler.target>${maven.compiler.target}</invoker.maven.compiler.target>
+        <invoker.maven.compiler.release>${maven.compiler.release}</invoker.maven.compiler.release>
       </properties>
       <build>
         <plugins>
@@ -197,8 +195,7 @@ under the License.
                 <pomInclude>*/pom.xml</pomInclude>
               </pomIncludes>
               <properties>
-                <maven.compiler.source>${invoker.maven.compiler.source}</maven.compiler.source>
-                <maven.compiler.target>${invoker.maven.compiler.target}</maven.compiler.target>
+                <maven.compiler.release>${invoker.maven.compiler.release}</maven.compiler.release>
               </properties>
             </configuration>
             <executions>
diff --git a/pom.xml b/pom.xml
index 58c9d44d..d2bef3af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -946,6 +946,7 @@ under the License.
     <javaVersion>8</javaVersion>
     <maven.compiler.source>${javaVersion}</maven.compiler.source>
     <maven.compiler.target>${javaVersion}</maven.compiler.target>
+    <maven.compiler.release>${javaVersion}</maven.compiler.release>
     <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
     <!-- in order to restore default annotation processing behaviour, please override with empty value -->
     <maven.compiler.proc>none</maven.compiler.proc>
@@ -1097,7 +1098,7 @@ under the License.
           <artifactId>maven-pmd-plugin</artifactId>
           <version>3.23.0</version>
           <configuration>
-            <targetJdk>${maven.compiler.target}</targetJdk>
+            <targetJdk>${maven.compiler.release}</targetJdk>
             <rulesets>
               <ruleset>rulesets/maven.xml</ruleset>
             </rulesets>
@@ -1177,7 +1178,7 @@ under the License.
               <configuration>
                 <rules>
                   <enforceBytecodeVersion>
-                    <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
+                    <maxJdkVersion>${maven.compiler.release}</maxJdkVersion>
                   </enforceBytecodeVersion>
                 </rules>
                 <fail>true</fail>
@@ -1454,7 +1455,7 @@ under the License.
             <configuration>
               <toolchains>
                 <jdk>
-                  <version>${maven.compiler.target}</version>
+                  <version>${maven.compiler.release}</version>
                 </jdk>
               </toolchains>
             </configuration>