From bcedfe0c244b262cb9a519bf166cfd832cd08993 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Wed, 11 Sep 2024 11:30:36 +0200
Subject: [PATCH] Remove jline-terminal-ffm direct dependency

---
 apache-maven/pom.xml   | 10 +++++++++-
 maven-embedder/pom.xml |  2 +-
 maven-jline/pom.xml    | 15 ++++++++++++++-
 pom.xml                | 19 +++++++++++++++++--
 4 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 22395d9ef61..5648338578a 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -99,7 +99,15 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.jline</groupId>
-      <artifactId>jline</artifactId>
+      <artifactId>jline-reader</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jline</groupId>
+      <artifactId>jline-terminal-jni</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jline</groupId>
+      <artifactId>jline-terminal-ffm</artifactId>
     </dependency>
 
     <!-- DI Runtime -->
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 284d4e3d157..79bea30fcfa 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -123,7 +123,7 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.jline</groupId>
-      <artifactId>jline</artifactId>
+      <artifactId>jansi-core</artifactId>
     </dependency>
 
     <dependency>
diff --git a/maven-jline/pom.xml b/maven-jline/pom.xml
index a63ae613aa9..683143c56d5 100644
--- a/maven-jline/pom.xml
+++ b/maven-jline/pom.xml
@@ -40,7 +40,20 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.jline</groupId>
-      <artifactId>jline</artifactId>
+      <artifactId>jline-reader</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jline</groupId>
+      <artifactId>jline-terminal-jni</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jline</groupId>
+      <artifactId>jline-terminal-ffm</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.jline</groupId>
+      <artifactId>jansi-core</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.inject</groupId>
diff --git a/pom.xml b/pom.xml
index 586b859116d..23f0a799492 100644
--- a/pom.xml
+++ b/pom.xml
@@ -461,7 +461,22 @@ under the License.
       </dependency>
       <dependency>
         <groupId>org.jline</groupId>
-        <artifactId>jline</artifactId>
+        <artifactId>jline-reader</artifactId>
+        <version>${jlineVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-terminal-ffm</artifactId>
+        <version>${jlineVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jline</groupId>
+        <artifactId>jline-terminal-jni</artifactId>
+        <version>${jlineVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jline</groupId>
+        <artifactId>jansi-core</artifactId>
         <version>${jlineVersion}</version>
       </dependency>
       <dependency>
@@ -818,7 +833,7 @@ under the License.</licenseText>
                     <ignoredScope>test</ignoredScope>
                   </ignoredScopes>
                   <excludes>
-                    <exclude>org.jline:jline</exclude>
+                    <exclude>org.jline:jline-terminal-ffm</exclude>
                   </excludes>
                 </enforceBytecodeVersion>
               </rules>