diff --git a/plexus-interactivity-jline2.patch b/plexus-interactivity-jline2.patch new file mode 100644 index 0000000..1b7c3c2 --- /dev/null +++ b/plexus-interactivity-jline2.patch @@ -0,0 +1,33 @@ +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 b293144..474be63 100644 --- a/plexus-interactivity.spec +++ b/plexus-interactivity.spec @@ -12,9 +12,10 @@ BuildArch: noarch # plexus-interactivity-1.0-alpha-6 Source0: plexus-interactivity-1.0-alpha-6-src.tar.xz Patch1: plexus-interactivity-dependencies.patch +Patch2: plexus-interactivity-jline2.patch BuildRequires: maven-local -BuildRequires: mvn(jline:jline) +BuildRequires: mvn(jline:jline) >= 2 BuildRequires: mvn(org.codehaus.plexus:plexus-component-api) BuildRequires: mvn(org.codehaus.plexus:plexus-components) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) @@ -36,6 +37,7 @@ This package provides %{summary}. %prep %setup -q -n plexus-interactivity-1.0-alpha-6 %patch1 -p1 +%patch2 -p1 %mvn_file ":{plexus}-{*}" @1/@2 @@ -54,6 +56,7 @@ This package provides %{summary}. * Tue Oct 29 2013 Mikolaj Izdebski - 0:1.0-0.12.alpha6 - Build with XMvn - Remove %%pre javadoc scriplet +- Port to jline2, resolves: rhbz#1022978 * Sun Aug 04 2013 Fedora Release Engineering - 0:1.0-0.11.alpha6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild