From 20dbb88be00618a5548304e190a4439552a638fe0e2bb6f225739cd349519f91 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 13 Jun 2024 09:11:11 +0000 Subject: [PATCH 1/5] 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 @@ + + + git + https://github.com/codehaus-plexus/plexus-interactivity.git + plexus-interactivity-1.3 + plexus-interactivity-* + @PARENT_TAG@ + plexus-interactivity-(.*) + + + *.tar + xz + + + 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 @@ - - - org.codehaus.plexus -+ plexus-component-api -+ 1.0-alpha-15 -+ -+ -+ org.codehaus.plexus - plexus-utils - 1.4 - 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 @@ - - jline - jline -- 0.9.1 -+ 2.10 - - - org.codehaus.plexus -@@ -20,4 +20,4 @@ - 1.0-alpha-6 - - -- -\ No newline at end of file -+ -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} From 0a3899f14c417345ec832ad6bc7980bee2aa384b7a93561c222f28ea381d71be Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 13 Jun 2024 09:12:22 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-interactivity?expand=0&rev=9 --- plexus-interactivity.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/plexus-interactivity.spec b/plexus-interactivity.spec index adc9c7d..39fa614 100644 --- a/plexus-interactivity.spec +++ b/plexus-interactivity.spec @@ -31,7 +31,6 @@ BuildRequires: atinject BuildRequires: fdupes BuildRequires: javapackages-local >= 6 BuildRequires: plexus-utils -BuildRequires: sisu-plexus BuildArch: noarch %description From b6305bb8988b887f6d7b70ebd59fcd91220271534a990b79b9ab9af6b47bcb28 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 13 Jun 2024 09:27:56 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-interactivity?expand=0&rev=10 --- plexus-interactivity-build.tar.xz | 4 ++-- plexus-interactivity.spec | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/plexus-interactivity-build.tar.xz b/plexus-interactivity-build.tar.xz index 320efe9..f7eeb67 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:77c56f7cd92842bcaaa41bb5f5ff5104005cbf7ea61fcf6c38503aa6831ea715 -size 1644 +oid sha256:2e9f3f25098a909944c3cd6e90828808b67caa790ef9ed934a70559b2b5877a2 +size 1828 diff --git a/plexus-interactivity.spec b/plexus-interactivity.spec index 39fa614..a078ad1 100644 --- a/plexus-interactivity.spec +++ b/plexus-interactivity.spec @@ -31,6 +31,7 @@ BuildRequires: atinject BuildRequires: fdupes BuildRequires: javapackages-local >= 6 BuildRequires: plexus-utils +BuildRequires: sisu-inject BuildArch: noarch %description @@ -58,8 +59,6 @@ API module for %{name}. %prep %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 @@ -67,7 +66,7 @@ cp %{SOURCE1} . %build mkdir -p lib -build-jar-repository -s lib atinject plexus/utils +build-jar-repository -s lib atinject org.eclipse.sisu.inject plexus/utils %{ant} package javadoc %install From dfb710b6770e6a4e8b6f6994e9490912bf89d52068ff9168ebf936823e4bd2a8 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 13 Jun 2024 11:51:39 +0000 Subject: [PATCH 4/5] 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 + +- 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 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 From 47a182444741d7732c777f1cff85a27fb4861f3dd0d1892e477e6bc1ea10ce0f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 13 Jun 2024 14:41:45 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-interactivity?expand=0&rev=12 --- plexus-interactivity.changes | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plexus-interactivity.changes b/plexus-interactivity.changes index 5bd0ae4..8c28623 100644 --- a/plexus-interactivity.changes +++ b/plexus-interactivity.changes @@ -6,10 +6,14 @@ Thu Jun 13 11:04:22 UTC 2024 - Fridrich Strba + ensure prompter does not double colon + java 8 as mininum + Move off plexus -- Removed patches: +- The class previously in plexus-interactivity-jdom artifact is + folded into the main plexus-interactivity-api. +- Removed patch: * plexus-interactivity-dependencies.patch - * plexus-interactivity-jline2.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