This is an automated email from the ASF dual-hosted git repository. bmarwell pushed a commit to branch MNG-8061_java17 in repository https://gitbox.apache.org/repos/asf/maven-parent.git
commit 259e8b4ef87e97f53594a934ea87d555e48fe507 Author: Benjamin Marwell <[email protected]> AuthorDate: Tue Feb 27 22:10:37 2024 +0100 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 21cef74..09dcb43 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 bda97e8..d957c80 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 c23e07f..a8ca1a8 100644 --- a/pom.xml +++ b/pom.xml @@ -961,6 +961,7 @@ under the License. <properties> <javaVersion>8</javaVersion> + <maven.compiler.release>${javaVersion}</maven.compiler.release> <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation> <checkstyle.includeTestSourceDirectory>true</checkstyle.includeTestSourceDirectory> <!-- in order to restore default annotation processing behaviour, please override with empty value --> @@ -1116,7 +1117,7 @@ under the License.</licenseText> <artifactId>maven-pmd-plugin</artifactId> <version>3.28.0</version> <configuration> - <targetJdk>${javaVersion}</targetJdk> + <targetJdk>${maven.compiler.release}</targetJdk> <rulesets> <ruleset>rulesets/maven.xml</ruleset> </rulesets> @@ -1196,7 +1197,7 @@ under the License.</licenseText> <configuration> <rules> <enforceBytecodeVersion> - <maxJdkVersion>${javaVersion}</maxJdkVersion> + <maxJdkVersion>${maven.compiler.release}</maxJdkVersion> </enforceBytecodeVersion> </rules> <fail>true</fail> @@ -1480,7 +1481,7 @@ under the License.</licenseText> <configuration> <toolchains> <jdk> - <version>${javaVersion}</version> + <version>${maven.compiler.release}</version> </jdk> </toolchains> </configuration>
