Skip to content

Commit 4c87c15

Browse files
committed
use maven.compiler.release instead of .target
1 parent 7eb115c commit 4c87c15

3 files changed

Lines changed: 8 additions & 13 deletions

File tree

maven-extensions/pom.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,7 @@ under the License.
129129
<profile>
130130
<id>run-its</id>
131131
<properties>
132-
<!-- when testing with JDK9, change these values to 1.6 from cmdline -->
133-
<invoker.maven.compiler.source>${maven.compiler.source}</invoker.maven.compiler.source>
134-
<invoker.maven.compiler.target>${maven.compiler.target}</invoker.maven.compiler.target>
132+
<invoker.maven.compiler.release>${maven.compiler.release}</invoker.maven.compiler.release>
135133
</properties>
136134
<build>
137135
<plugins>
@@ -150,8 +148,7 @@ under the License.
150148
<pomInclude>*/pom.xml</pomInclude>
151149
</pomIncludes>
152150
<properties>
153-
<maven.compiler.source>${invoker.maven.compiler.source}</maven.compiler.source>
154-
<maven.compiler.target>${invoker.maven.compiler.target}</maven.compiler.target>
151+
<maven.compiler.release>${invoker.maven.compiler.release}</maven.compiler.release>
155152
</properties>
156153
</configuration>
157154
<executions>

maven-plugins/pom.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,7 @@ under the License.
176176
<profile>
177177
<id>run-its</id>
178178
<properties>
179-
<!-- when testing with JDK9, change these values to 1.6 from cmdline -->
180-
<invoker.maven.compiler.source>${maven.compiler.source}</invoker.maven.compiler.source>
181-
<invoker.maven.compiler.target>${maven.compiler.target}</invoker.maven.compiler.target>
179+
<invoker.maven.compiler.release>${maven.compiler.release}</invoker.maven.compiler.release>
182180
</properties>
183181
<build>
184182
<plugins>
@@ -197,8 +195,7 @@ under the License.
197195
<pomInclude>*/pom.xml</pomInclude>
198196
</pomIncludes>
199197
<properties>
200-
<maven.compiler.source>${invoker.maven.compiler.source}</maven.compiler.source>
201-
<maven.compiler.target>${invoker.maven.compiler.target}</maven.compiler.target>
198+
<maven.compiler.release>${invoker.maven.compiler.release}</maven.compiler.release>
202199
</properties>
203200
</configuration>
204201
<executions>

pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -961,6 +961,7 @@ under the License.
961961

962962
<properties>
963963
<javaVersion>8</javaVersion>
964+
<maven.compiler.release>${javaVersion}</maven.compiler.release>
964965
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
965966
<checkstyle.includeTestSourceDirectory>true</checkstyle.includeTestSourceDirectory>
966967
<!-- in order to restore default annotation processing behaviour, please override with empty value -->
@@ -1116,7 +1117,7 @@ under the License.</licenseText>
11161117
<artifactId>maven-pmd-plugin</artifactId>
11171118
<version>3.28.0</version>
11181119
<configuration>
1119-
<targetJdk>${javaVersion}</targetJdk>
1120+
<targetJdk>${maven.compiler.release}</targetJdk>
11201121
<rulesets>
11211122
<ruleset>rulesets/maven.xml</ruleset>
11221123
</rulesets>
@@ -1196,7 +1197,7 @@ under the License.</licenseText>
11961197
<configuration>
11971198
<rules>
11981199
<enforceBytecodeVersion>
1199-
<maxJdkVersion>${javaVersion}</maxJdkVersion>
1200+
<maxJdkVersion>${maven.compiler.release}</maxJdkVersion>
12001201
</enforceBytecodeVersion>
12011202
</rules>
12021203
<fail>true</fail>
@@ -1480,7 +1481,7 @@ under the License.</licenseText>
14801481
<configuration>
14811482
<toolchains>
14821483
<jdk>
1483-
<version>${javaVersion}</version>
1484+
<version>${maven.compiler.release}</version>
14841485
</jdk>
14851486
</toolchains>
14861487
</configuration>

0 commit comments

Comments
 (0)