You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2026/05/08 19:42:19 UTC
(groovy) 02/02: GROOVY-12001: Bump jline to 4.1.0
This is an automated email from the ASF dual-hosted git repository.
paulk-asert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit bc4caccca68b8d95b6bae95df4e91d00d404458c
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat May 9 05:42:00 2026 +1000
GROOVY-12001: Bump jline to 4.1.0
---
gradle/verification-metadata.xml | 10 ----------
subprojects/groovy-groovysh/build.gradle | 1 -
.../org/apache/groovy/groovysh/jline/GroovyPosixCommands.java | 2 +-
versions.properties | 2 +-
4 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index ee9616d258..7ff145845a 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -218,10 +218,6 @@
<trusted-key id="E3A9F95079E84CE201F7CF60BEDE11EAF1164480" group="org.hamcrest"/>
<trusted-key id="E5C3B1929191DF06136CCB2B164779204E106A76" group="org.javassist" name="javassist"/>
<trusted-key id="EA022560A81E5BD48DB3D18B54AC8E2D98CFEAC6" group="org.ysb33r.gradle"/>
- <trusted-key id="EA23DB1360D9029481E7F2EFECDFEA3CB4493B94">
- <trusting group="jline" name="jline" version="2.14.6"/>
- <trusting group="org.jline"/>
- </trusted-key>
<trusted-key id="EA313384CA0EBA950EA017E937890E298D9A2BFA" group="com.eed3si9n.jarjar"/>
<trusted-key id="EAFC1F3B2FCED6AFD046C7D5734AEF3D43509290" group="org.osgi"/>
<trusted-key id="EC23FD5875DFF32547D5257F631ECF66932B28BA">
@@ -1148,12 +1144,6 @@
<sha512 value="dc4d2686c65bfb0c2936e8c0eb4d517152aa284ed28a7880165a4247564823f34e1e9f06785a9dbad7b4cbe90486d3e9aed4c32c75d485d29bd15b8d7642b6f9" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
</artifact>
</component>
- <component group="jline" name="jline" version="2.14.6">
- <artifact name="jline-2.14.6.jar">
- <pgp value="EA23DB1360D9029481E7F2EFECDFEA3CB4493B94"/>
- <sha512 value="27f6e2523e539383cede51d8eae7e97d49038c5a66cb4a94a9ce85165f16e7382b937a238cdb0c92e1136af56c5f57bcc6c04435a370c5d49f7e4bd32f0d9194" origin="Generated by Gradle"/>
- </artifact>
- </component>
<component group="joda-time" name="joda-time" version="2.12.7">
<artifact name="joda-time-2.12.7.jar">
<pgp value="B41089A2DA79B0FA5810252872385FF0AF338D52"/>
diff --git a/subprojects/groovy-groovysh/build.gradle b/subprojects/groovy-groovysh/build.gradle
index 843da2b8cc..dc23b9eb44 100644
--- a/subprojects/groovy-groovysh/build.gradle
+++ b/subprojects/groovy-groovysh/build.gradle
@@ -56,6 +56,5 @@ tasks.named('rat') {
excludes << '**/jline/ObjectInspector.groovy' // BSD license as per NOTICE/LICENSE files
excludes << '**/jline/Utils.groovy' // BSD license as per NOTICE/LICENSE files
excludes << '**/jline/JrtJavaBasePackages.java' // BSD license as per NOTICE/LICENSE files
- excludes << '**/jline/SystemRegistryImpl.java' // BSD license as per NOTICE/LICENSE files
excludes << '**/jline/PackageHelper.java' // BSD license as per NOTICE/LICENSE files
}
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/jline/GroovyPosixCommands.java b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/jline/GroovyPosixCommands.java
index 4b0664e56c..a8442c8528 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/jline/GroovyPosixCommands.java
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/jline/GroovyPosixCommands.java
@@ -743,7 +743,7 @@ public class GroovyPosixCommands {
private static void toColumn(Context context, PrintStream out, Stream<String> ansi, boolean horizontal) {
Terminal terminal = context.terminal();
- int width = context.isTty() ? terminal.getWidth() : 80;
+ int width = context.isTty() ? terminal.getColumns() : 80;
List<AttributedString> strings = ansi.map(AttributedString::fromAnsi).collect(Collectors.toList());
if (!strings.isEmpty()) {
int max = strings.stream()
diff --git a/versions.properties b/versions.properties
index fb5a4a7d82..872af344a5 100644
--- a/versions.properties
+++ b/versions.properties
@@ -38,7 +38,7 @@ jansi=2.4.2
jarjar=1.16.0
javaParser=3.28.1
jcipAnnotations=1.0
-jline=4.0.14
+jline=4.1.0
jmh=1.37
jna=5.18.1
jqwik=1.9.3