Skip to content

Commit

Permalink
Raise required Java version to 17
Browse files Browse the repository at this point in the history
This change moves the module descriptor of the core module to its main
sources and removes the additional compiler execution. However, the
module path is ignored when compiling and executing the test sources of
the core module.

Co-authored-by: aalmiray@users.noreply.github.com
Co-authored-by: RaphaelJenni@users.noreply.github.com
Co-authored-by: SimonHarte@users.noreply.github.com
  • Loading branch information
scordio committed Apr 25, 2024
1 parent 44a5689 commit df00b28
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 18 deletions.
17 changes: 2 additions & 15 deletions assertj-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -314,27 +314,14 @@
<configuration>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<useModulePath>false</useModulePath> <!-- FIXME #3446 -->
</configuration>
<executions>
<execution>
<id>jdk9</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>9</release>
<compileSourceRoots>
<compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
</compileSourceRoots>
<multiReleaseOutput>true</multiReleaseOutput>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<useModulePath>false</useModulePath> <!-- FIXME #3446 -->
<trimStackTrace>false</trimStackTrace>
<excludes>
<exclude>org/assertj/core/internal/objects/Objects_assertHasOnlyFields_Test*</exclude>
Expand Down
File renamed without changes.
4 changes: 1 addition & 3 deletions assertj-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,9 @@

<properties>
<additionalparam>-Xdoclint:none</additionalparam>
<java.version>8</java.version>
<java.version>17</java.version>
<maven.compiler.parameters>true</maven.compiler.parameters>
<maven.compiler.release>${java.version}</maven.compiler.release>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spotless.skip>true</spotless.skip>
Expand Down

0 comments on commit df00b28

Please sign in to comment.