.gitignore

@@ -0,0 +1 @@
+.osc

_service

@@ -0,0 +1,15 @@
+<services>
+	<service name="tar_scm" mode="disabled">
+		<param name="scm">git</param>
+		<param name="url">https://github.com/codehaus-plexus/plexus-interactivity.git</param>
+		<param name="revision">plexus-interactivity-1.3</param>
+		<param name="match-tag">plexus-interactivity-*</param>
+		<param name="versionformat">@PARENT_TAG@</param>
+		<param name="versionrewrite-pattern">plexus-interactivity-(.*)</param>
+	</service>
+	<service name="recompress" mode="disabled">
+		<param name="file">*.tar</param>
+		<param name="compression">xz</param>
+	</service>
+	<service name="set_version" mode="disabled"/>
+</services>

plexus-interactivity-dependencies.patch

@@ -1,16 +0,0 @@
-diff --git a/plexus-interactivity-api/pom.xml b/plexus-interactivity-api/pom.xml
-index 84e659e..943d7e4 100644
---- a/plexus-interactivity-api/pom.xml
-+++ b/plexus-interactivity-api/pom.xml
-@@ -11,6 +11,11 @@
-   <dependencies>
-     <dependency>
-       <groupId>org.codehaus.plexus</groupId>
-+      <artifactId>plexus-component-api</artifactId>
-+      <version>1.0-alpha-15</version>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.codehaus.plexus</groupId>
-       <artifactId>plexus-utils</artifactId>
-       <version>1.4</version>
-     </dependency>

plexus-interactivity-jline2.patch

@@ -1,33 +1,33 @@
-diff --git a/plexus-interactivity-jline/pom.xml b/plexus-interactivity-jline/pom.xml
+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 fc9b185..afffd1d 100644
+index 93c8bd6..068a6e4 100644
---- a/plexus-interactivity-jline/pom.xml
+--- a/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/jline/JLineInputHandler.java
-+++ b/plexus-interactivity-jline/pom.xml
++++ b/plexus-interactivity-api/src/main/java/org/codehaus/plexus/components/interactivity/jline/JLineInputHandler.java
-@@ -12,7 +12,7 @@
+@@ -28,9 +28,8 @@ import javax.inject.Named;
-     <dependency>
+ 
-       <groupId>jline</groupId>
+ import java.io.IOException;
-       <artifactId>jline</artifactId>
--      <version>0.9.1</version>
-+      <version>2.10</version>
-     </dependency>
-     <dependency>
-       <groupId>org.codehaus.plexus</groupId>
-@@ -20,4 +20,4 @@
-       <version>1.0-alpha-6</version>
-     </dependency>
-   </dependencies>
--</project>
-\ No newline at end of file
-+</project>
-diff --git a/plexus-interactivity-jline/src/main/java/org/codehaus/plexus/components/interactivity/jline/JLineInputHandler.java b/plexus-interactivity-jline/src/main/java/org/codehaus/plexus/components/interactivity/jline/JLineInputHandler.java
-index 69e7b78..2a23942 100755
---- a/plexus-interactivity-jline/src/main/java/org/codehaus/plexus/components/interactivity/jline/JLineInputHandler.java
-+++ b/plexus-interactivity-jline/src/main/java/org/codehaus/plexus/components/interactivity/jline/JLineInputHandler.java
-@@ -24,7 +24,7 @@ package org.codehaus.plexus.components.interactivity.jline;
-  * SOFTWARE.
-  */
  
--import jline.ConsoleReader;
 +import jline.console.ConsoleReader;
  import org.codehaus.plexus.components.interactivity.AbstractInputHandler;
- import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
+-import org.jline.reader.LineReader;
- import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+-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,20 @@
+-------------------------------------------------------------------
+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
+- The class previously in plexus-interactivity-jdom artifact is
+  folded into the main plexus-interactivity-api.
+- Removed patch:
+  * plexus-interactivity-dependencies.patch
+    + not needed any more
+- Modified patch:
+  * plexus-interactivity-jline2.patch
+    + port from jline3 to jline2
+
 -------------------------------------------------------------------
 Tue Feb 20 15:00:51 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

plexus-interactivity.spec

@@ -16,31 +16,24 @@
 #
 
 
-%global base_ver 1.0
-%global alpha_ver 6
-%global namedversion %{base_ver}-alpha-%{alpha_ver}
 Name:           plexus-interactivity
-Version:        %{base_ver}~alpha%{alpha_ver}
+Version:        1.3
 Release:        0
 Summary:        Plexus Interactivity Handler Component
 License:        MIT
 Group:          Development/Libraries/Java
 URL:            https://github.com/codehaus-plexus/plexus-interactivity
-# svn export \
+Source0:        %{name}-%{version}.tar.xz
-#   http://svn.codehaus.org/plexus/plexus-components/tags/plexus-interactivity-1.0-alpha-6/
-# tar caf plexus-interactivity-1.0-alpha-6-src.tar.xz \
-#   plexus-interactivity-1.0-alpha-6
-Source0:        %{name}-%{namedversion}-src.tar.xz
 Source1:        LICENSE.MIT
 Source100:      %{name}-build.tar.xz
-Patch1:         %{name}-dependencies.patch
+Patch0:         %{name}-jline2.patch
-Patch2:         %{name}-jline2.patch
 BuildRequires:  ant
+BuildRequires:  atinject
 BuildRequires:  fdupes
 BuildRequires:  javapackages-local >= 6
 BuildRequires:  jline >= 2
-BuildRequires:  plexus-component-api
 BuildRequires:  plexus-utils
+BuildRequires:  sisu-inject
 BuildArch:      noarch
 
 %description
@@ -60,56 +53,45 @@ This package provides %{summary}.
 %package api
 Summary:        API for %{name}
 Group:          Development/Libraries/Java
+Obsoletes:      %{name}-jline
 
 %description api
 API module for %{name}.
 
-%package jline
-Summary:        jline module for %{name}
-Group:          Development/Libraries/Java
-Requires:       %{name}-api = %{version}
-
-%description jline
-jline module for %{name}.
-
 %prep
-%setup -q -n %{name}-%{namedversion} -a100
+%setup -q -a100
-%patch -P 1 -p1
+
-%patch -P 2 -p1
+%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 jline plexus-component-api plexus/utils
+build-jar-repository -s lib atinject jline org.eclipse.sisu.inject plexus/utils
 %{ant} package javadoc
 
 %install
+
 # jar
 install -dm 0755 %{buildroot}%{_javadir}/plexus
-for i in api jline; do
+install -pm 0644 %{name}-api/target/%{name}-api-%{version}.jar %{buildroot}%{_javadir}/plexus/interactivity-api.jar
-  install -pm 0644 %{name}-${i}/target/%{name}-${i}-%{namedversion}.jar %{buildroot}%{_javadir}/plexus/interactivity-${i}.jar
+
-done
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus
-for i in api jline; do
+%{mvn_install_pom} %{name}-api/pom.xml %{buildroot}%{_mavenpomdir}/plexus/interactivity-api.pom
-  %{mvn_install_pom} %{name}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/plexus/interactivity-${i}.pom
+%add_maven_depmap plexus/interactivity-api.pom plexus/interactivity-api.jar -f api
-  %add_maven_depmap plexus/interactivity-${i}.pom plexus/interactivity-${i}.jar -f ${i}
+
-done
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
-for i in api jline; do
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/api
-  install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/${i}
+cp -pr %{name}-api/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/api/
-  cp -pr %{name}-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/${i}/
+
-done
 %fdupes -s %{buildroot}%{_javadocdir}
 
 %files api -f .mfiles-api
 %license LICENSE.MIT
 
-%files jline -f .mfiles-jline
-%license LICENSE.MIT
-
 %files javadoc
 %license LICENSE.MIT
 %{_javadocdir}/%{name}