Merge branch 'jline-jansi-replacement' into 'main'

switching jline from the jansi to jni provider See merge request weblogic-cloud/weblogic-deploy-tooling!1752
oracle · Nov 22, 2024 · 5bea6be · 5bea6be
2 parents 6e894f9 + 0741b5d
commit 5bea6be
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 22 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -65,13 +65,9 @@
             <artifactId>asn-one</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.fusesource.jansi</groupId>
-            <artifactId>jansi</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jline</groupId>
-            <artifactId>jline-terminal-jansi</artifactId>
+            <artifactId>jline-terminal-jni</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jline</groupId>
@@ -217,7 +213,7 @@
                     <archive>
                         <manifestEntries>
                             <Multi-Release>true</Multi-Release>
-                            <Class-Path>antlr4-runtime-${antlr.version}.jar snakeyaml-${snakeyaml.version}.jar picocli-${picocli.version}.jar sshj-${sshj.version}.jar asn-one-${asn.one.version}.jar eddsa-${eddsa.version}.jar slf4j-jdk14-${slf4j.version}.jar slf4j-api-${slf4j.version}.jar jzlib-${jzlib.version}.jar jline-reader-${jline.version}.jar jline-terminal-${jline.version}.jar jline-terminal-jansi-${jline.version}.jar jansi-${jansi.version}.jar</Class-Path>
+                            <Class-Path>antlr4-runtime-${antlr.version}.jar snakeyaml-${snakeyaml.version}.jar picocli-${picocli.version}.jar sshj-${sshj.version}.jar asn-one-${asn.one.version}.jar eddsa-${eddsa.version}.jar slf4j-jdk14-${slf4j.version}.jar slf4j-api-${slf4j.version}.jar jzlib-${jzlib.version}.jar jline-reader-${jline.version}.jar jline-terminal-${jline.version}.jar jline-terminal-jni-${jline.version}.jar</Class-Path>
                         </manifestEntries>
                     </archive>
                 </configuration>

diff --git a/installer/pom.xml b/installer/pom.xml
@@ -54,13 +54,9 @@
             <groupId>com.jcraft</groupId>
             <artifactId>jzlib</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.fusesource.jansi</groupId>
-            <artifactId>jansi</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jline</groupId>
-            <artifactId>jline-terminal-jansi</artifactId>
+            <artifactId>jline-terminal-jni</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jline</groupId>

diff --git a/installer/src/assembly/zip.xml b/installer/src/assembly/zip.xml
@@ -122,8 +122,7 @@
                 <include>com.jcraft:jzlib</include>
                 <include>org.jline:jline-reader</include>
                 <include>org.jline:jline-terminal</include>
-                <include>org.jline:jline-terminal-jansi</include>
-                <include>org.fusesource.jansi:jansi</include>
+                <include>org.jline:jline-terminal-jni</include>
             </includes>
         </dependencySet>
     </dependencySets>

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -38,7 +38,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>exec-maven-plugin</artifactId>
-                    <version>3.4.1</version>
+                    <version>3.5.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.gmaven</groupId>

diff --git a/pom.xml b/pom.xml
@@ -45,8 +45,7 @@
         <slf4j.version>2.0.16</slf4j.version>
         <jzlib.version>1.1.3</jzlib.version>
         <asn.one.version>0.6.0</asn.one.version>
-        <jline.version>3.26.3</jline.version>
-        <jansi.version>2.4.1</jansi.version>
+        <jline.version>3.27.1</jline.version>
         <junit.version>5.11.0</junit.version>
         <wdt.scm.repo.url>${env.WDT_SCM_REPO_URL}</wdt.scm.repo.url>
         <wdt.scm.repo.conn>${env.WDT_SCM_REPO_CONN}</wdt.scm.repo.conn>
@@ -153,14 +152,9 @@
                 <artifactId>picocli</artifactId>
                 <version>${picocli.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.fusesource.jansi</groupId>
-                <artifactId>jansi</artifactId>
-                <version>${jansi.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.jline</groupId>
-                <artifactId>jline-terminal-jansi</artifactId>
+                <artifactId>jline-terminal-jni</artifactId>
                 <version>${jline.version}</version>
             </dependency>
             <dependency>