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, when executing its tests and when generating the Javadoc. Co-authored-by: aalmiray@users.noreply.github.com Co-authored-by: RaphaelJenni@users.noreply.github.com Co-authored-by: SimonHarte@users.noreply.github.com
assertj · Apr 25, 2024 · 46aeddf · 46aeddf
1 parent 44a5689
commit 46aeddf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/assertj-core/pom.xml b/assertj-core/pom.xml
@@ -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>
@@ -417,6 +404,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,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>