This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch GROOVY_5_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 5c174f3fecae30cf27dee70d9984074edb1db479 Author: Paul King <[email protected]> AuthorDate: Mon Mar 23 13:43:38 2026 +1000 GROOVY-11880: Bump jline to 3.30.9 --- .../org/apache/groovy/groovysh/jline/GroovyPosixCommands.java | 10 ++++++---- .../org/apache/groovy/groovysh/jline/SystemRegistryImpl.java | 5 ++--- versions.properties | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) 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 84ce50145c..537ba0f13e 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 @@ -80,10 +80,12 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; -// The following file is expected to be deleted if/when the following issues have been merged in JLine3: -// https://github.com/jline/jline3/pull/1400 -// https://github.com/jline/jline3/pull/1398 -// https://github.com/jline/jline3/pull/1390 +// This class could be deleted if/when the following differences with JLine3 are removed: +// * getSources() also supports String[] sources which allows piping in Groovy - it would be nice if jline had a protected such method +// * wc has more flexible control over totals +// * head, tail, and grep have more flexible control of when filename headers are displayed +// * the Groovy variants use Object[] for argv to allow variables to be used as sources +// * uses Ant's Glob expansion if available on the classpath for more flexible expansion public class GroovyPosixCommands extends PosixCommands { public static void cat(Context context, Object[] argv) throws Exception { diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/jline/SystemRegistryImpl.java b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/jline/SystemRegistryImpl.java index 6a3849aa4c..1eb56483b2 100644 --- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/jline/SystemRegistryImpl.java +++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/jline/SystemRegistryImpl.java @@ -48,9 +48,8 @@ import org.jline.utils.*; * Aggregate command registries. */ public class SystemRegistryImpl implements SystemRegistry { - // NOTE: This file can be deleted if the following PRs are merged: - // https://github.com/jline/jline3/pull/1392 - // https://github.com/jline/jline3/pull/1394 + // This class could be deleted if the following changes to JLine3 are removed: + // * Pipe enum had additional PIPE option (which then filters through many methods including private ones) public enum Pipe { FLIP, diff --git a/versions.properties b/versions.properties index bdd1b4c7b5..48e7dcf61b 100644 --- a/versions.properties +++ b/versions.properties @@ -37,7 +37,7 @@ jansi=2.4.2 jarjar=1.16.0 javaParser=3.28.0 jcipAnnotations=1.0 -jline=3.30.6 +jline=3.30.9 jmh=1.37 jna=5.18.1 jqwik=1.9.3
