Raise required Java version to 17

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 the core module, executing its tests, and generating the Javadoc. Co-authored-by: Andres Almiray <aalmiray@users.noreply.github.com> Co-authored-by: Raphael Jenni <RaphaelJenni@users.noreply.github.com> Co-authored-by: Simon Harte <SimonHarte@users.noreply.github.com>
assertj · May 15, 2024 · 2c695fc · 2c695fc
1 parent 4f072c9
commit 2c695fc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/assertj-core/pom.xml b/assertj-core/pom.xml
@@ -317,26 +317,15 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <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>
+        <configuration>
+          <useModulePath>false</useModulePath> <!-- FIXME #3446 -->
+        </configuration>
       </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>
@@ -419,6 +408,9 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <legacyMode>true</legacyMode> <!-- FIXME #3446 -->
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

diff --git a/assertj-core/src/main/java9/module-info.java → assertj-core/src/main/java/module-info.java b/assertj-core/src/main/java9/module-info.java → assertj-core/src/main/java/module-info.java
diff --git a/assertj-parent/pom.xml b/assertj-parent/pom.xml
@@ -16,7 +16,7 @@
 
   <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>