Skip to content
Open
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>
<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>
<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>
<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>
<maven.compiler.release>${invoker.maven.compiler.release}</maven.compiler.release>
</properties>
</configuration>
<executions>
Expand Down
9 changes: 5 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -960,7 +960,8 @@ under the License.
</distributionManagement>

<properties>
<javaVersion>8</javaVersion>
<javaVersion>17</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 -->
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -1196,7 +1197,7 @@ under the License.</licenseText>
<configuration>
<rules>
<enforceBytecodeVersion>
<maxJdkVersion>${javaVersion}</maxJdkVersion>
<maxJdkVersion>${maven.compiler.release}</maxJdkVersion>
</enforceBytecodeVersion>
</rules>
<fail>true</fail>
Expand Down Expand Up @@ -1480,7 +1481,7 @@ under the License.</licenseText>
<configuration>
<toolchains>
<jdk>
<version>${javaVersion}</version>
<version>${maven.compiler.release}</version>
</jdk>
</toolchains>
</configuration>
Expand Down
Loading