From 8c5875a0bd37927675ec994a99fc39146db3affe Mon Sep 17 00:00:00 2001
From: Michael Osipov <michaelo@apache.org>
Date: Wed, 10 May 2023 15:13:36 +0200
Subject: [PATCH] [MPMD-373] System property java.version is overwritten in ITs
 as model property

---
 src/it/MPMD-270-325-JDK11/pom.xml         |  8 ++++----
 src/it/MPMD-280-JDK12/pom.xml             |  8 ++++----
 src/it/MPMD-295-JDK13/pom.xml             |  8 ++++----
 src/it/MPMD-302-JDK14/pom.xml             |  8 ++++----
 src/it/MPMD-302-JDK15/pom.xml             |  8 ++++----
 src/it/MPMD-304-toolchain-support/pom.xml | 10 +++++-----
 src/it/MPMD-312-JDK16/pom.xml             |  8 ++++----
 src/it/MPMD-312-JDK17/pom.xml             |  8 ++++----
 src/it/MPMD-332-JDK18/pom.xml             |  8 ++++----
 src/it/MPMD-348-JDK19/pom.xml             | 10 +++++-----
 src/it/MPMD-365-JDK20/pom.xml             | 10 +++++-----
 11 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/src/it/MPMD-270-325-JDK11/pom.xml b/src/it/MPMD-270-325-JDK11/pom.xml
index dfcd8e95..ac210b63 100644
--- a/src/it/MPMD-270-325-JDK11/pom.xml
+++ b/src/it/MPMD-270-325-JDK11/pom.xml
@@ -28,7 +28,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>11</java.version>
+    <javaVersion>11</javaVersion>
   </properties>
 
   <build>
@@ -39,8 +39,8 @@ under the License.
           <artifactId>maven-compiler-plugin</artifactId>
           <version>@compilerPluginVersion@</version>
           <configuration>
-            <target>${java.version}</target>
-            <source>${java.version}</source>
+            <target>${javaVersion}</target>
+            <source>${javaVersion}</source>
           </configuration>
         </plugin>
       </plugins>
@@ -57,7 +57,7 @@ under the License.
           <failOnViolation>true</failOnViolation>
           <failurePriority>4</failurePriority>
           <printFailingErrors>true</printFailingErrors>
-          <targetJdk>${java.version}</targetJdk>
+          <targetJdk>${javaVersion}</targetJdk>
           <minimumTokens>100</minimumTokens>
         </configuration>
         <executions>
diff --git a/src/it/MPMD-280-JDK12/pom.xml b/src/it/MPMD-280-JDK12/pom.xml
index 2e3e1130..7dcc733f 100644
--- a/src/it/MPMD-280-JDK12/pom.xml
+++ b/src/it/MPMD-280-JDK12/pom.xml
@@ -28,7 +28,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>12</java.version>
+    <javaVersion>12</javaVersion>
   </properties>
 
   <build>
@@ -39,8 +39,8 @@ under the License.
           <artifactId>maven-compiler-plugin</artifactId>
           <version>@compilerPluginVersion@</version>
           <configuration>
-            <target>${java.version}</target>
-            <source>${java.version}</source>
+            <target>${javaVersion}</target>
+            <source>${javaVersion}</source>
           </configuration>
         </plugin>
       </plugins>
@@ -57,7 +57,7 @@ under the License.
           <failOnViolation>true</failOnViolation>
           <failurePriority>4</failurePriority>
           <printFailingErrors>true</printFailingErrors>
-          <targetJdk>${java.version}</targetJdk>
+          <targetJdk>${javaVersion}</targetJdk>
           <minimumTokens>100</minimumTokens>
         </configuration>
         <executions>
diff --git a/src/it/MPMD-295-JDK13/pom.xml b/src/it/MPMD-295-JDK13/pom.xml
index ef34ae25..e3b58e4a 100644
--- a/src/it/MPMD-295-JDK13/pom.xml
+++ b/src/it/MPMD-295-JDK13/pom.xml
@@ -28,7 +28,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>14</java.version>
+    <javaVersion>14</javaVersion>
   </properties>
 
   <build>
@@ -39,8 +39,8 @@ under the License.
           <artifactId>maven-compiler-plugin</artifactId>
           <version>@compilerPluginVersion@</version>
           <configuration>
-            <target>${java.version}</target>
-            <source>${java.version}</source>
+            <target>${javaVersion}</target>
+            <source>${javaVersion}</source>
           </configuration>
         </plugin>
       </plugins>
@@ -57,7 +57,7 @@ under the License.
           <failOnViolation>true</failOnViolation>
           <failurePriority>4</failurePriority>
           <printFailingErrors>true</printFailingErrors>
-          <targetJdk>${java.version}</targetJdk>
+          <targetJdk>${javaVersion}</targetJdk>
           <minimumTokens>100</minimumTokens>
         </configuration>
         <executions>
diff --git a/src/it/MPMD-302-JDK14/pom.xml b/src/it/MPMD-302-JDK14/pom.xml
index 9631b05f..556f9f5e 100644
--- a/src/it/MPMD-302-JDK14/pom.xml
+++ b/src/it/MPMD-302-JDK14/pom.xml
@@ -28,7 +28,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>14</java.version>
+    <javaVersion>14</javaVersion>
   </properties>
 
   <build>
@@ -39,8 +39,8 @@ under the License.
           <artifactId>maven-compiler-plugin</artifactId>
           <version>@compilerPluginVersion@</version>
           <configuration>
-            <target>${java.version}</target>
-            <source>${java.version}</source>
+            <target>${javaVersion}</target>
+            <source>${javaVersion}</source>
           </configuration>
         </plugin>
       </plugins>
@@ -57,7 +57,7 @@ under the License.
           <failOnViolation>true</failOnViolation>
           <failurePriority>4</failurePriority>
           <printFailingErrors>true</printFailingErrors>
-          <targetJdk>${java.version}</targetJdk>
+          <targetJdk>${javaVersion}</targetJdk>
           <minimumTokens>100</minimumTokens>
         </configuration>
         <executions>
diff --git a/src/it/MPMD-302-JDK15/pom.xml b/src/it/MPMD-302-JDK15/pom.xml
index be97107b..119c1a0c 100644
--- a/src/it/MPMD-302-JDK15/pom.xml
+++ b/src/it/MPMD-302-JDK15/pom.xml
@@ -28,7 +28,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>15</java.version>
+    <javaVersion>15</javaVersion>
   </properties>
 
   <build>
@@ -39,8 +39,8 @@ under the License.
           <artifactId>maven-compiler-plugin</artifactId>
           <version>@compilerPluginVersion@</version>
           <configuration>
-            <target>${java.version}</target>
-            <source>${java.version}</source>
+            <target>${javaVersion}</target>
+            <source>${javaVersion}</source>
           </configuration>
         </plugin>
       </plugins>
@@ -57,7 +57,7 @@ under the License.
           <failOnViolation>true</failOnViolation>
           <failurePriority>4</failurePriority>
           <printFailingErrors>true</printFailingErrors>
-          <targetJdk>${java.version}</targetJdk>
+          <targetJdk>${javaVersion}</targetJdk>
           <minimumTokens>100</minimumTokens>
         </configuration>
         <executions>
diff --git a/src/it/MPMD-304-toolchain-support/pom.xml b/src/it/MPMD-304-toolchain-support/pom.xml
index 2cfd20ea..f4c9aac8 100644
--- a/src/it/MPMD-304-toolchain-support/pom.xml
+++ b/src/it/MPMD-304-toolchain-support/pom.xml
@@ -28,7 +28,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>11</java.version>
+    <javaVersion>11</javaVersion>
   </properties>
 
   <build>
@@ -39,8 +39,8 @@ under the License.
           <artifactId>maven-compiler-plugin</artifactId>
           <version>@compilerPluginVersion@</version>
           <configuration>
-            <target>${java.version}</target>
-            <source>${java.version}</source>
+            <target>${javaVersion}</target>
+            <source>${javaVersion}</source>
           </configuration>
         </plugin>
       </plugins>
@@ -53,7 +53,7 @@ under the License.
         <configuration>
           <failOnViolation>false</failOnViolation>
           <printFailingErrors>true</printFailingErrors>
-          <targetJdk>${java.version}</targetJdk>
+          <targetJdk>${javaVersion}</targetJdk>
           <minimumTokens>10</minimumTokens>
         </configuration>
         <executions>
@@ -81,7 +81,7 @@ under the License.
         <configuration>
           <toolchains>
             <jdk>
-              <version>${java.version}</version>
+              <version>${javaVersion}</version>
               <vendor>oracle</vendor>
             </jdk>
           </toolchains>
diff --git a/src/it/MPMD-312-JDK16/pom.xml b/src/it/MPMD-312-JDK16/pom.xml
index 342be2d6..06f97b07 100644
--- a/src/it/MPMD-312-JDK16/pom.xml
+++ b/src/it/MPMD-312-JDK16/pom.xml
@@ -28,7 +28,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>16</java.version>
+    <javaVersion>16</javaVersion>
   </properties>
 
   <build>
@@ -39,8 +39,8 @@ under the License.
           <artifactId>maven-compiler-plugin</artifactId>
           <version>@compilerPluginVersion@</version>
           <configuration>
-            <target>${java.version}</target>
-            <source>${java.version}</source>
+            <target>${javaVersion}</target>
+            <source>${javaVersion}</source>
           </configuration>
         </plugin>
       </plugins>
@@ -57,7 +57,7 @@ under the License.
           <failOnViolation>true</failOnViolation>
           <failurePriority>4</failurePriority>
           <printFailingErrors>true</printFailingErrors>
-          <targetJdk>${java.version}</targetJdk>
+          <targetJdk>${javaVersion}</targetJdk>
           <minimumTokens>100</minimumTokens>
         </configuration>
         <executions>
diff --git a/src/it/MPMD-312-JDK17/pom.xml b/src/it/MPMD-312-JDK17/pom.xml
index 36ff6fb8..b519c9b4 100644
--- a/src/it/MPMD-312-JDK17/pom.xml
+++ b/src/it/MPMD-312-JDK17/pom.xml
@@ -28,7 +28,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>17</java.version>
+    <javaVersion>17</javaVersion>
   </properties>
 
   <build>
@@ -39,8 +39,8 @@ under the License.
           <artifactId>maven-compiler-plugin</artifactId>
           <version>@compilerPluginVersion@</version>
           <configuration>
-            <target>${java.version}</target>
-            <source>${java.version}</source>
+            <target>${javaVersion}</target>
+            <source>${javaVersion}</source>
           </configuration>
         </plugin>
       </plugins>
@@ -57,7 +57,7 @@ under the License.
           <failOnViolation>true</failOnViolation>
           <failurePriority>4</failurePriority>
           <printFailingErrors>true</printFailingErrors>
-          <targetJdk>${java.version}</targetJdk>
+          <targetJdk>${javaVersion}</targetJdk>
           <minimumTokens>100</minimumTokens>
         </configuration>
         <executions>
diff --git a/src/it/MPMD-332-JDK18/pom.xml b/src/it/MPMD-332-JDK18/pom.xml
index 17a67883..76ff3fc7 100644
--- a/src/it/MPMD-332-JDK18/pom.xml
+++ b/src/it/MPMD-332-JDK18/pom.xml
@@ -28,7 +28,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>18</java.version>
+    <javaVersion>18</javaVersion>
   </properties>
 
   <build>
@@ -39,8 +39,8 @@ under the License.
           <artifactId>maven-compiler-plugin</artifactId>
           <version>@compilerPluginVersion@</version>
           <configuration>
-            <target>${java.version}</target>
-            <source>${java.version}</source>
+            <target>${javaVersion}</target>
+            <source>${javaVersion}</source>
           </configuration>
         </plugin>
       </plugins>
@@ -57,7 +57,7 @@ under the License.
           <failOnViolation>true</failOnViolation>
           <failurePriority>4</failurePriority>
           <printFailingErrors>true</printFailingErrors>
-          <targetJdk>${java.version}</targetJdk>
+          <targetJdk>${javaVersion}</targetJdk>
           <minimumTokens>100</minimumTokens>
         </configuration>
         <executions>
diff --git a/src/it/MPMD-348-JDK19/pom.xml b/src/it/MPMD-348-JDK19/pom.xml
index a45886ca..693e2e4c 100644
--- a/src/it/MPMD-348-JDK19/pom.xml
+++ b/src/it/MPMD-348-JDK19/pom.xml
@@ -28,7 +28,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>19</java.version>
+    <javaVersion>19</javaVersion>
   </properties>
 
   <build>
@@ -39,8 +39,8 @@ under the License.
           <artifactId>maven-compiler-plugin</artifactId>
           <version>@compilerPluginVersion@</version>
           <configuration>
-            <target>${java.version}</target>
-            <source>${java.version}</source>
+            <target>${javaVersion}</target>
+            <source>${javaVersion}</source>
           </configuration>
         </plugin>
       </plugins>
@@ -57,7 +57,7 @@ under the License.
           <failOnViolation>true</failOnViolation>
           <failurePriority>4</failurePriority>
           <printFailingErrors>true</printFailingErrors>
-          <targetJdk>${java.version}</targetJdk>
+          <targetJdk>${javaVersion}</targetJdk>
           <minimumTokens>100</minimumTokens>
         </configuration>
         <executions>
@@ -84,7 +84,7 @@ under the License.
         <configuration>
           <toolchains>
             <jdk>
-              <version>${java.version}</version>
+              <version>${javaVersion}</version>
               <vendor>openjdk</vendor>
             </jdk>
           </toolchains>
diff --git a/src/it/MPMD-365-JDK20/pom.xml b/src/it/MPMD-365-JDK20/pom.xml
index 99131f97..ccd918e7 100644
--- a/src/it/MPMD-365-JDK20/pom.xml
+++ b/src/it/MPMD-365-JDK20/pom.xml
@@ -28,7 +28,7 @@ under the License.
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>20</java.version>
+    <javaVersion>20</javaVersion>
   </properties>
 
   <build>
@@ -39,8 +39,8 @@ under the License.
           <artifactId>maven-compiler-plugin</artifactId>
           <version>@compilerPluginVersion@</version>
           <configuration>
-            <target>${java.version}</target>
-            <source>${java.version}</source>
+            <target>${javaVersion}</target>
+            <source>${javaVersion}</source>
           </configuration>
         </plugin>
       </plugins>
@@ -57,7 +57,7 @@ under the License.
           <failOnViolation>true</failOnViolation>
           <failurePriority>4</failurePriority>
           <printFailingErrors>true</printFailingErrors>
-          <targetJdk>${java.version}</targetJdk>
+          <targetJdk>${javaVersion}</targetJdk>
           <minimumTokens>100</minimumTokens>
         </configuration>
         <executions>
@@ -84,7 +84,7 @@ under the License.
         <configuration>
           <toolchains>
             <jdk>
-              <version>${java.version}</version>
+              <version>${javaVersion}</version>
               <vendor>openjdk</vendor>
             </jdk>
           </toolchains>