OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-interactivity?expand=0&rev=11

plexus-interactivity-jline2.patch

@@ -0,0 +1,33 @@
+diff --git a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/jline/JLineInputHandler.java b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/jline/JLineInputHandler.java
+index 93c8bd6..068a6e4 100644
+--- a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/jline/JLineInputHandler.java
++++ b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/jline/JLineInputHandler.java
+@@ -28,9 +28,8 @@ import javax.inject.Named;
+ 
+ import java.io.IOException;
+ 
++import jline.console.ConsoleReader;
+ import org.codehaus.plexus.components.interactivity.AbstractInputHandler;
+-import org.jline.reader.LineReader;
+-import org.jline.reader.LineReaderBuilder;
+ 
+ /**
+  * Default input handler, that uses the console.
+@@ -39,7 +38,16 @@ import org.jline.reader.LineReaderBuilder;
+  */
+ @Named("jline")
+ public class JLineInputHandler extends AbstractInputHandler {
+-    private final LineReader consoleReader = LineReaderBuilder.builder().build();
++    private final ConsoleReader consoleReader;
++
++    public JLineInputHandler() {
++        ConsoleReader cr = null;
++        try {
++            cr = new ConsoleReader();
++        } catch (IOException e) {
++        }
++        this.consoleReader = cr;
++    }
+ 
+     public String readLine() throws IOException {
+         return consoleReader.readLine();

plexus-interactivity.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Jun 13 11:04:22 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 1.3
+  * New features and improvements
+    + ensure prompter does not double colon
+    + java 8 as mininum
+    + Move off plexus
+- Removed patches:
+  * plexus-interactivity-dependencies.patch
+  * plexus-interactivity-jline2.patch
+    + not needed any more
+
 -------------------------------------------------------------------
 Tue Feb 20 15:00:51 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

plexus-interactivity.spec

@@ -26,10 +26,12 @@ URL:            https://github.com/codehaus-plexus/plexus-interactivity
 Source0:        %{name}-%{version}.tar.xz
 Source1:        LICENSE.MIT
 Source100:      %{name}-build.tar.xz
+Patch0:         %{name}-jline2.patch
 BuildRequires:  ant
 BuildRequires:  atinject
 BuildRequires:  fdupes
 BuildRequires:  javapackages-local >= 6
+BuildRequires:  jline >= 2
 BuildRequires:  plexus-utils
 BuildRequires:  sisu-inject
 BuildArch:      noarch
@@ -59,14 +61,14 @@ API module for %{name}.
 %prep
 %setup -q -a100
 
-%pom_remove_dep :jline-reader %{name}-api
+%patch -P 0 -p1
-rm -rf %{name}-api/src/main/java/org/codehaus/plexus/components/interactivity/jline
+%pom_change_dep :jline-reader jline:jline:2.10 %{name}-api
 
 cp %{SOURCE1} .
 
 %build
 mkdir -p lib
-build-jar-repository -s lib atinject org.eclipse.sisu.inject plexus/utils
+build-jar-repository -s lib atinject jline org.eclipse.sisu.inject plexus/utils
 %{ant} package javadoc
 
 %install