Accepting request 1283733 from Java:packages

1.4

OBS-URL: https://build.opensuse.org/request/show/1283733
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-interactivity?expand=0&rev=6

_service

@@ -2,7 +2,7 @@
 	<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="revision">plexus-interactivity-1.4</param>
 		<param name="match-tag">plexus-interactivity-*</param>
 		<param name="versionformat">@PARENT_TAG@</param>
 		<param name="versionrewrite-pattern">plexus-interactivity-(.*)</param>

plexus-interactivity-1.4.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3fc1c008337e761a8641518d899c7ee255a23886952c363214ec65daea0dfb11
+size 5972

plexus-interactivity-build.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77c56f7cd92842bcaaa41bb5f5ff5104005cbf7ea61fcf6c38503aa6831ea715
+oid sha256:8b0d93ef02444fd7fe07e2052a0831fd12f75e7fd3a019a410dac66b3f672148
-size 1644
+size 1804

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,37 @@
+-------------------------------------------------------------------
+Fri Jun  6 15:04:00 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 1.4
+  * Changes
+    + Bump org.jline:jline-reader from 3.25.1 to 3.29.0
+    + Bump org.eclipse.sisu:org.eclipse.sisu.inject from 0.9.0.M2
+      to 0.9.0.M3
+    + Apply spotless re-formatting
+    + Bump org.codehaus.plexus:plexus from 16 to 20
+    + Bump release-drafter/release-drafter from 5 to 6
+
+-------------------------------------------------------------------
+Tue Jun  3 08:24:37 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Add dependency on objectweb-asm to build with sisu 0.9.0.M4
+
+-------------------------------------------------------------------
+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

@@ -1,7 +1,7 @@
 #
 # spec file for package plexus-interactivity
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           plexus-interactivity
-Version:        1.3
+Version:        1.4
 Release:        0
 Summary:        Plexus Interactivity Handler Component
 License:        MIT
@@ -26,12 +26,15 @@ 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:  objectweb-asm
 BuildRequires:  plexus-utils
-BuildRequires:  sisu-plexus
+BuildRequires:  sisu-inject
 BuildArch:      noarch
 
 %description
@@ -59,16 +62,19 @@ API module for %{name}.
 %prep
 %setup -q -a100
 
-%pom_add_dep org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M3 %{name}-api
+%patch -P 0 -p1
-
+%pom_change_dep :jline-reader jline:jline:2.10 %{name}-api
-%pom_remove_dep :jline-reader %{name}-api
-rm -rf %{name}-api/src/main/java/org/codehaus/plexus/components/interactivity/jline
 
 cp %{SOURCE1} .
 
 %build
 mkdir -p lib
-build-jar-repository -s lib atinject plexus/utils
+build-jar-repository -s lib \
+    atinject \
+    jline \
+    objectweb-asm/asm \
+    org.eclipse.sisu.inject \
+    plexus/utils
 %{ant} package javadoc
 
 %install