Skip to content

Commit 7b7f534

Browse files
committed
use maven.compiler.release instead of .target
1 parent 8f02871 commit 7b7f534

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
@@ -946,6 +946,7 @@ under the License.
946946
<javaVersion>8</javaVersion>
947947
<maven.compiler.source>${javaVersion}</maven.compiler.source>
948948
<maven.compiler.target>${javaVersion}</maven.compiler.target>
949+
<maven.compiler.release>${javaVersion}</maven.compiler.release>
949950
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
950951
<!-- in order to restore default annotation processing behaviour, please override with empty value -->
951952
<maven.compiler.proc>none</maven.compiler.proc>
@@ -1097,7 +1098,7 @@ under the License.
10971098
<artifactId>maven-pmd-plugin</artifactId>
10981099
<version>3.23.0</version>
10991100
<configuration>
1100-
<targetJdk>${maven.compiler.target}</targetJdk>
1101+
<targetJdk>${maven.compiler.release}</targetJdk>
11011102
<rulesets>
11021103
<ruleset>rulesets/maven.xml</ruleset>
11031104
</rulesets>
@@ -1177,7 +1178,7 @@ under the License.
11771178
<configuration>
11781179
<rules>
11791180
<enforceBytecodeVersion>
1180-
<maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
1181+
<maxJdkVersion>${maven.compiler.release}</maxJdkVersion>
11811182
</enforceBytecodeVersion>
11821183
</rules>
11831184
<fail>true</fail>
@@ -1454,7 +1455,7 @@ under the License.
14541455
<configuration>
14551456
<toolchains>
14561457
<jdk>
1457-
<version>${maven.compiler.target}</version>
1458+
<version>${maven.compiler.release}</version>
14581459
</jdk>
14591460
</toolchains>
14601461
</configuration>

0 commit comments

Comments
 (0)