Skip to content

Commit

Permalink
[MPMD-373] System property java.version is overwritten in ITs as mode…
Browse files Browse the repository at this point in the history 
…l property
  • Loading branch information
@michael-o
michael-o committed May 10, 2023
1 parent fbd8644 commit 8c5875a
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 47 deletions.
8 changes: 4 additions & 4 deletions src/it/MPMD-270-325-JDK11/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions src/it/MPMD-280-JDK12/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions src/it/MPMD-295-JDK13/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions src/it/MPMD-302-JDK14/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions src/it/MPMD-302-JDK15/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions src/it/MPMD-304-toolchain-support/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -81,7 +81,7 @@ under the License.
<configuration>
<toolchains>
<jdk>
<version>${java.version}</version>
<version>${javaVersion}</version>
<vendor>oracle</vendor>
</jdk>
</toolchains>
Expand Down
8 changes: 4 additions & 4 deletions src/it/MPMD-312-JDK16/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions src/it/MPMD-312-JDK17/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions src/it/MPMD-332-JDK18/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions src/it/MPMD-348-JDK19/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -84,7 +84,7 @@ under the License.
<configuration>
<toolchains>
<jdk>
<version>${java.version}</version>
<version>${javaVersion}</version>
<vendor>openjdk</vendor>
</jdk>
</toolchains>
Expand Down
10 changes: 5 additions & 5 deletions src/it/MPMD-365-JDK20/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -84,7 +84,7 @@ under the License.
<configuration>
<toolchains>
<jdk>
<version>${java.version}</version>
<version>${javaVersion}</version>
<vendor>openjdk</vendor>
</jdk>
</toolchains>
Expand Down

0 comments on commit 8c5875a

Please sign in to comment.