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

---
 _service                                    | 15 ++++++
 plexus-interactivity-1.0-alpha-6-src.tar.xz |  3 --
 plexus-interactivity-1.3.tar.xz             |  3 ++
 plexus-interactivity-build.tar.xz           |  4 +-
 plexus-interactivity-dependencies.patch     | 16 ------
 plexus-interactivity-jline2.patch           | 33 ------------
 plexus-interactivity.spec                   | 60 ++++++++-------------
 7 files changed, 41 insertions(+), 93 deletions(-)
 create mode 100644 _service
 delete mode 100644 plexus-interactivity-1.0-alpha-6-src.tar.xz
 create mode 100644 plexus-interactivity-1.3.tar.xz
 delete mode 100644 plexus-interactivity-dependencies.patch
 delete mode 100644 plexus-interactivity-jline2.patch

diff --git a/_service b/_service
new file mode 100644
index 0000000..e5aff0d
--- /dev/null
+++ b/_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>
diff --git a/plexus-interactivity-1.0-alpha-6-src.tar.xz b/plexus-interactivity-1.0-alpha-6-src.tar.xz
deleted file mode 100644
index 6fd7cce..0000000
--- a/plexus-interactivity-1.0-alpha-6-src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f3e5467e2bd4ddbac86bd5668b8b7cec2cd50c4ca32a414ae7e226ea9ab1db2
-size 4416
diff --git a/plexus-interactivity-1.3.tar.xz b/plexus-interactivity-1.3.tar.xz
new file mode 100644
index 0000000..1ec932e
--- /dev/null
+++ b/plexus-interactivity-1.3.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9fbf9f413183187c0ca031dec37ddc30b871b2190db2e2f03192af8c64cccb5a
+size 5860
diff --git a/plexus-interactivity-build.tar.xz b/plexus-interactivity-build.tar.xz
index 555dd2f..320efe9 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:4147c4df0818994b6149b9aa509278cd48bc063c417182f93017cb3d09f4cab5
-size 1848
+oid sha256:77c56f7cd92842bcaaa41bb5f5ff5104005cbf7ea61fcf6c38503aa6831ea715
+size 1644
diff --git a/plexus-interactivity-dependencies.patch b/plexus-interactivity-dependencies.patch
deleted file mode 100644
index 05035dd..0000000
--- a/plexus-interactivity-dependencies.patch
+++ /dev/null
@@ -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>
diff --git a/plexus-interactivity-jline2.patch b/plexus-interactivity-jline2.patch
deleted file mode 100644
index d2be71b..0000000
--- a/plexus-interactivity-jline2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/plexus-interactivity-jline/pom.xml b/plexus-interactivity-jline/pom.xml
-index fc9b185..afffd1d 100644
---- a/plexus-interactivity-jline/pom.xml
-+++ b/plexus-interactivity-jline/pom.xml
-@@ -12,7 +12,7 @@
-     <dependency>
-       <groupId>jline</groupId>
-       <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.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
diff --git a/plexus-interactivity.spec b/plexus-interactivity.spec
index aec8b3f..adc9c7d 100644
--- a/plexus-interactivity.spec
+++ b/plexus-interactivity.spec
@@ -16,31 +16,22 @@
 #
 
 
-%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 \
-#   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
+Source0:        %{name}-%{version}.tar.xz
 Source1:        LICENSE.MIT
 Source100:      %{name}-build.tar.xz
-Patch1:         %{name}-dependencies.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-plexus
 BuildArch:      noarch
 
 %description
@@ -60,56 +51,47 @@ 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
-%patch -P 1 -p1
-%patch -P 2 -p1
+%setup -q -a100
+
+%pom_add_dep org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M3 %{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 jline plexus-component-api plexus/utils
+build-jar-repository -s lib atinject plexus/utils
 %{ant} package javadoc
 
 %install
+
 # jar
 install -dm 0755 %{buildroot}%{_javadir}/plexus
-for i in api jline; do
-  install -pm 0644 %{name}-${i}/target/%{name}-${i}-%{namedversion}.jar %{buildroot}%{_javadir}/plexus/interactivity-${i}.jar
-done
+install -pm 0644 %{name}-api/target/%{name}-api-%{version}.jar %{buildroot}%{_javadir}/plexus/interactivity-api.jar
+
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus
-for i in api jline; do
-  %{mvn_install_pom} %{name}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/plexus/interactivity-${i}.pom
-  %add_maven_depmap plexus/interactivity-${i}.pom plexus/interactivity-${i}.jar -f ${i}
-done
+%{mvn_install_pom} %{name}-api/pom.xml %{buildroot}%{_mavenpomdir}/plexus/interactivity-api.pom
+%add_maven_depmap plexus/interactivity-api.pom plexus/interactivity-api.jar -f api
+
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
-for i in api jline; do
-  install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/${i}
-  cp -pr %{name}-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/${i}/
-done
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/api
+cp -pr %{name}-api/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/api/
+
 %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}