From dfb710b6770e6a4e8b6f6994e9490912bf89d52068ff9168ebf936823e4bd2a8 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 13 Jun 2024 11:51:39 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/plexus-interactivity?expand=0&rev=11

---
 plexus-interactivity-build.tar.xz |  2 +-
 plexus-interactivity-jline2.patch | 33 +++++++++++++++++++++++++++++++
 plexus-interactivity.changes      | 13 ++++++++++++
 plexus-interactivity.spec         |  8 +++++---
 4 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 plexus-interactivity-jline2.patch

diff --git a/plexus-interactivity-build.tar.xz b/plexus-interactivity-build.tar.xz
index f7eeb67..dc10bf7 100644
--- a/plexus-interactivity-build.tar.xz
+++ b/plexus-interactivity-build.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e9f3f25098a909944c3cd6e90828808b67caa790ef9ed934a70559b2b5877a2
+oid sha256:2c016f1c2fdba96a264a4c3fe773cf56e49e87f6cb7122b4a3b0c1b617f7aead
 size 1828
diff --git a/plexus-interactivity-jline2.patch b/plexus-interactivity-jline2.patch
new file mode 100644
index 0000000..04bc884
--- /dev/null
+++ b/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();
diff --git a/plexus-interactivity.changes b/plexus-interactivity.changes
index df3a120..5bd0ae4 100644
--- a/plexus-interactivity.changes
+++ b/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>
 
diff --git a/plexus-interactivity.spec b/plexus-interactivity.spec
index a078ad1..53a60f8 100644
--- a/plexus-interactivity.spec
+++ b/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
-rm -rf %{name}-api/src/main/java/org/codehaus/plexus/components/interactivity/jline
+%patch -P 0 -p1
+%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