Skip to content

Commit 5bea6be

Browse files
committed
Merge branch 'jline-jansi-replacement' into 'main'
switching jline from the jansi to jni provider See merge request weblogic-cloud/weblogic-deploy-tooling!1752
2 parents 6e894f9 + 0741b5d commit 5bea6be

File tree

5 files changed

+7
-22
lines changed

5 files changed

+7
-22
lines changed

core/pom.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,9 @@
6565
<artifactId>asn-one</artifactId>
6666
<scope>runtime</scope>
6767
</dependency>
68-
<dependency>
69-
<groupId>org.fusesource.jansi</groupId>
70-
<artifactId>jansi</artifactId>
71-
</dependency>
7268
<dependency>
7369
<groupId>org.jline</groupId>
74-
<artifactId>jline-terminal-jansi</artifactId>
70+
<artifactId>jline-terminal-jni</artifactId>
7571
</dependency>
7672
<dependency>
7773
<groupId>org.jline</groupId>
@@ -217,7 +213,7 @@
217213
<archive>
218214
<manifestEntries>
219215
<Multi-Release>true</Multi-Release>
220-
<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>
216+
<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>
221217
</manifestEntries>
222218
</archive>
223219
</configuration>

installer/pom.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,9 @@
5454
<groupId>com.jcraft</groupId>
5555
<artifactId>jzlib</artifactId>
5656
</dependency>
57-
<dependency>
58-
<groupId>org.fusesource.jansi</groupId>
59-
<artifactId>jansi</artifactId>
60-
</dependency>
6157
<dependency>
6258
<groupId>org.jline</groupId>
63-
<artifactId>jline-terminal-jansi</artifactId>
59+
<artifactId>jline-terminal-jni</artifactId>
6460
</dependency>
6561
<dependency>
6662
<groupId>org.jline</groupId>

installer/src/assembly/zip.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@
122122
<include>com.jcraft:jzlib</include>
123123
<include>org.jline:jline-reader</include>
124124
<include>org.jline:jline-terminal</include>
125-
<include>org.jline:jline-terminal-jansi</include>
126-
<include>org.fusesource.jansi:jansi</include>
125+
<include>org.jline:jline-terminal-jni</include>
127126
</includes>
128127
</dependencySet>
129128
</dependencySets>

integration-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<plugin>
3939
<groupId>org.codehaus.mojo</groupId>
4040
<artifactId>exec-maven-plugin</artifactId>
41-
<version>3.4.1</version>
41+
<version>3.5.0</version>
4242
</plugin>
4343
<plugin>
4444
<groupId>org.codehaus.gmaven</groupId>

pom.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@
4545
<slf4j.version>2.0.16</slf4j.version>
4646
<jzlib.version>1.1.3</jzlib.version>
4747
<asn.one.version>0.6.0</asn.one.version>
48-
<jline.version>3.26.3</jline.version>
49-
<jansi.version>2.4.1</jansi.version>
48+
<jline.version>3.27.1</jline.version>
5049
<junit.version>5.11.0</junit.version>
5150
<wdt.scm.repo.url>${env.WDT_SCM_REPO_URL}</wdt.scm.repo.url>
5251
<wdt.scm.repo.conn>${env.WDT_SCM_REPO_CONN}</wdt.scm.repo.conn>
@@ -153,14 +152,9 @@
153152
<artifactId>picocli</artifactId>
154153
<version>${picocli.version}</version>
155154
</dependency>
156-
<dependency>
157-
<groupId>org.fusesource.jansi</groupId>
158-
<artifactId>jansi</artifactId>
159-
<version>${jansi.version}</version>
160-
</dependency>
161155
<dependency>
162156
<groupId>org.jline</groupId>
163-
<artifactId>jline-terminal-jansi</artifactId>
157+
<artifactId>jline-terminal-jni</artifactId>
164158
<version>${jline.version}</version>
165159
</dependency>
166160
<dependency>

0 commit comments

Comments
 (0)