This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new f85f23946f build(deps-dev): bump org.jline:jline from 4.0.15 to 4.1.0
(#2645)
f85f23946f is described below
commit f85f23946fb3dbe876f193e3cbfea9aa11f22eae
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Fri May 8 06:21:07 2026 +0200
build(deps-dev): bump org.jline:jline from 4.0.15 to 4.1.0 (#2645)
* build(deps-dev): bump org.jline:jline from 4.0.15 to 4.1.0
Bumps [org.jline:jline](https://github.com/jline/jline3) from 4.0.15 to
4.1.0.
- [Release notes](https://github.com/jline/jline3/releases)
- [Commits](https://github.com/jline/jline3/compare/4.0.15...4.1.0)
---
updated-dependencies:
- dependency-name: org.jline:jline
dependency-version: 4.1.0
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <[email protected]>
* Fix compilation errors with JLine 4.1.0 Sized interface
JLine 4.1.0 introduced Sized interface and made setSize(Sized) the abstract
method on Terminal, with setSize(Size) becoming a default bridge. Implement
setSize(Sized) in JLineTerminal and KarafTerminal to satisfy the contract.
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: JB Onofré <[email protected]>
---
pom.xml | 2 +-
.../java/org/apache/karaf/shell/impl/console/JLineTerminal.java | 6 ++++++
.../java/org/apache/karaf/shell/impl/console/KarafTerminal.java | 6 ++++++
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ec4c28d7b2..bb42c50670 100644
--- a/pom.xml
+++ b/pom.xml
@@ -283,7 +283,7 @@
<httpclient.version>4.5.14</httpclient.version>
<jansi.version>2.4.3</jansi.version>
<javassist.version>3.9.0.GA</javassist.version>
- <jline.version>4.0.15</jline.version>
+ <jline.version>4.1.0</jline.version>
<junit.version>4.13.2</junit.version>
<jsw.version>3.2.3</jsw.version>
<log4j.version>2.25.4</log4j.version>
diff --git
a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java
b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java
index 58641681ef..2460181948 100644
---
a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java
+++
b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java
@@ -38,6 +38,7 @@ import org.jline.terminal.Attributes;
import org.jline.terminal.Cursor;
import org.jline.terminal.MouseEvent;
import org.jline.terminal.Size;
+import org.jline.terminal.Sized;
import org.jline.utils.ColorPalette;
import org.jline.utils.InfoCmp.Capability;
import org.jline.utils.NonBlockingReader;
@@ -185,6 +186,11 @@ public class JLineTerminal implements Terminal,
org.jline.terminal.Terminal {
terminal.setSize(size);
}
+ @Override
+ public void setSize(Sized size) {
+ terminal.setSize(size);
+ }
+
@Override
public void raise(Signal signal) {
terminal.raise(signal);
diff --git
a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/KarafTerminal.java
b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/KarafTerminal.java
index b3ec09c386..fcae4dac6f 100644
---
a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/KarafTerminal.java
+++
b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/KarafTerminal.java
@@ -26,6 +26,7 @@ import java.io.PrintWriter;
import org.apache.karaf.shell.api.console.Terminal;
import org.jline.terminal.Attributes;
import org.jline.terminal.Size;
+import org.jline.terminal.Sized;
import org.jline.terminal.impl.AbstractTerminal;
import org.jline.terminal.spi.SystemStream;
import org.jline.terminal.spi.TerminalProvider;
@@ -103,6 +104,11 @@ public class KarafTerminal extends AbstractTerminal {
throw new UnsupportedOperationException();
}
+ @Override
+ public void setSize(Sized size) {
+ throw new UnsupportedOperationException();
+ }
+
@Override
public SystemStream getSystemStream() {
return null;