Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions maven-extensions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Comment on lines -133 to -134
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please also preserver here

<invoker.maven.compiler.release>${maven.compiler.release}</invoker.maven.compiler.release>
</properties>
<build>
<plugins>
Expand All @@ -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>
Comment on lines -153 to -154
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please also preserver here

<maven.compiler.release>${invoker.maven.compiler.release}</maven.compiler.release>
</properties>
</configuration>
<executions>
Expand Down
7 changes: 2 additions & 5 deletions maven-plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Comment on lines -180 to -181
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please also preserver here

<invoker.maven.compiler.release>${maven.compiler.release}</invoker.maven.compiler.release>
</properties>
<build>
<plugins>
Expand All @@ -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>
Comment on lines -200 to -201
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please also preserver here

<maven.compiler.release>${invoker.maven.compiler.release}</maven.compiler.release>
</properties>
</configuration>
<executions>
Expand Down
7 changes: 4 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -946,6 +946,7 @@ under the License.
<javaVersion>8</javaVersion>
<maven.compiler.source>${javaVersion}</maven.compiler.source>
<maven.compiler.target>${javaVersion}</maven.compiler.target>
<maven.compiler.release>${javaVersion}</maven.compiler.release>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we left old properties and allow to m-compiler-p to use proper one?

What java version will be used by m-compiler-p when we have only maven.compiler.release and build on JDK 8?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since version 3.13.0 of the Compiler Plugin together with the default javac compilerId you don't need conditional parametrisation of release. The release parameter will only be effective for Java 9 or above, otherwise the source and target will be passed to the compiler.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, leave original .source and .target properties.

Copy link
Contributor Author

@bmarwell bmarwell Jan 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done for main properties, not sure whether we need them in other places, too

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in ale place should be the same

<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
<!-- in order to restore default annotation processing behaviour, please override with empty value -->
<maven.compiler.proc>none</maven.compiler.proc>
Expand Down Expand Up @@ -1097,7 +1098,7 @@ under the License.
<artifactId>maven-pmd-plugin</artifactId>
<version>3.23.0</version>
<configuration>
<targetJdk>${maven.compiler.target}</targetJdk>
<targetJdk>${maven.compiler.release}</targetJdk>
<rulesets>
<ruleset>rulesets/maven.xml</ruleset>
</rulesets>
Expand Down Expand Up @@ -1177,7 +1178,7 @@ under the License.
<configuration>
<rules>
<enforceBytecodeVersion>
<maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
<maxJdkVersion>${maven.compiler.release}</maxJdkVersion>
</enforceBytecodeVersion>
</rules>
<fail>true</fail>
Expand Down Expand Up @@ -1454,7 +1455,7 @@ under the License.
<configuration>
<toolchains>
<jdk>
<version>${maven.compiler.target}</version>
<version>${maven.compiler.release}</version>
</jdk>
</toolchains>
</configuration>
Expand Down
Loading