From 06b081de74cfee7cf5d9338cf5076e4c0f9608a3 Mon Sep 17 00:00:00 2001
From: Stefano Cordio <stefano_cordio@epam.com>
Date: Thu, 25 Apr 2024 21:32:43 +0200
Subject: [PATCH] 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: aalmiray@users.noreply.github.com
Co-authored-by: RaphaelJenni@users.noreply.github.com
Co-authored-by: SimonHarte@users.noreply.github.com
---
 assertj-core/pom.xml                          | 20 +++++--------------
 .../src/main/{java9 => java}/module-info.java |  0
 assertj-parent/pom.xml                        |  4 +---
 3 files changed, 6 insertions(+), 18 deletions(-)
 rename assertj-core/src/main/{java9 => java}/module-info.java (100%)

diff --git a/assertj-core/pom.xml b/assertj-core/pom.xml
index e33197a47f..e08cd5bdf5 100644
--- 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 b/assertj-core/src/main/java/module-info.java
similarity index 100%
rename from assertj-core/src/main/java9/module-info.java
rename to assertj-core/src/main/java/module-info.java
diff --git a/assertj-parent/pom.xml b/assertj-parent/pom.xml
index ac75601a2b..30873df3f5 100644
--- 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>