[bookkeeper] BZ1049900: Update to latest rawhide dependencies jline1 -> jline (2.10) netty -> netty3 (compat)
tstclair
tstclair at fedoraproject.org
Fri Jan 24 20:44:19 UTC 2014
commit ed184764ff6558f3b08d21a6bb4ef902fed6a406
Author: Timothy St. Clair <tstclair at redhat.com>
Date: Fri Jan 24 14:43:06 2014 -0600
BZ1049900: Update to latest rawhide dependencies
jline1 -> jline (2.10)
netty -> netty3 (compat)
bookkeeper-4.2.1-depmap | 2 +-
bookkeeper-4.2.1-jline2.patch | 125 +++++++++++++++++++++++++++++++++++++++++
bookkeeper-4.2.1-netty.patch | 66 +++++++++++++++++++++
bookkeeper.spec | 13 +++-
4 files changed, 202 insertions(+), 4 deletions(-)
---
diff --git a/bookkeeper-4.2.1-depmap b/bookkeeper-4.2.1-depmap
index d737c52..ff86a38 100644
--- a/bookkeeper-4.2.1-depmap
+++ b/bookkeeper-4.2.1-depmap
@@ -3,7 +3,7 @@
<maven>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
- <version>0.9.94</version>
+ <version>2.10</version>
</maven>
<jpp>
<groupId>JPP</groupId>
diff --git a/bookkeeper-4.2.1-jline2.patch b/bookkeeper-4.2.1-jline2.patch
new file mode 100644
index 0000000..ae50f21
--- /dev/null
+++ b/bookkeeper-4.2.1-jline2.patch
@@ -0,0 +1,125 @@
+diff --git a/hedwig-server/pom.xml b/hedwig-server/pom.xml
+index 56b1a32..ea38ff9 100644
+--- a/hedwig-server/pom.xml
++++ b/hedwig-server/pom.xml
+@@ -121,7 +121,7 @@
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+- <version>0.9.94</version>
++ <version>2.10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bookkeeper</groupId>
+diff --git a/hedwig-server/src/main/java/org/apache/hedwig/admin/console/HedwigConsole.java b/hedwig-server/src/main/java/org/apache/hedwig/admin/console/HedwigConsole.java
+index 0c0438f..6e704f3 100644
+--- a/hedwig-server/src/main/java/org/apache/hedwig/admin/console/HedwigConsole.java
++++ b/hedwig-server/src/main/java/org/apache/hedwig/admin/console/HedwigConsole.java
+@@ -18,9 +18,9 @@
+
+ package org.apache.hedwig.admin.console;
+
+-import jline.ConsoleReader;
+-import jline.History;
+-import jline.Terminal;
++import jline.console.ConsoleReader;
++import jline.console.history.FileHistory;
++import jline.*;
+
+ import java.io.BufferedReader;
+ import java.io.File;
+@@ -98,7 +98,6 @@ public class HedwigConsole {
+ protected Subscriber subscriber;
+ protected ConsoleMessageHandler consoleHandler =
+ new ConsoleMessageHandler();
+- protected Terminal terminal;
+
+ protected String myRegion;
+
+@@ -839,7 +838,9 @@ public class HedwigConsole {
+ */
+ public HedwigConsole(String[] args) throws IOException, InterruptedException {
+ // Setup Terminal
+- terminal = Terminal.setupTerminal();
++ TerminalFactory.configure(TerminalFactory.AUTO);
++ TerminalFactory.reset();
++
+ HedwigCommands.init();
+ cl.parseOptions(args);
+
+@@ -906,14 +907,10 @@ public class HedwigConsole {
+
+ protected boolean continueOrQuit() throws IOException {
+ System.out.println("Press <Return> to continue, or Q to cancel ...");
+- int ch;
++ int ch='q';
+ if (null != console) {
+ ch = console.readCharacter(CONTINUE_OR_QUIT);
+- } else {
+- do {
+- ch = terminal.readCharacter(System.in);
+- } while (ch != 'q' && ch != 'Q' && ch != '\n');
+- }
++ }
+ if (ch == 'q' ||
+ ch == 'Q') {
+ return false;
+@@ -987,23 +984,23 @@ public class HedwigConsole {
+
+ console = new ConsoleReader();
+ JLineHedwigCompletor completor = new JLineHedwigCompletor(admin);
+- console.addCompletor(completor);
++ console.addCompleter(completor);
+
+ // load history file
+- History history = new History();
+ File file = new File(System.getProperty("hw.history",
+ new File(System.getProperty("user.home"), HW_HISTORY_FILE).toString()));
++ FileHistory history = new FileHistory(file);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("History file is " + file.toString());
+ }
+- history.setHistoryFile(file);
++
+ // set history to console reader
+ console.setHistory(history);
+ // load history from history file
+- history.moveToFirstEntry();
++ history.moveToFirst();
+
+ while (history.next()) {
+- String entry = history.current();
++ String entry = (String)history.current();
+ if (!entry.equals("")) {
+ addToHistory(commandCount, entry);
+ }
+@@ -1014,7 +1011,7 @@ public class HedwigConsole {
+ String line;
+ while ((line = console.readLine(getPrompt())) != null) {
+ executeLine(line);
+- history.addToHistory(line);
++ history.add(line);
+ }
+ }
+
+diff --git a/hedwig-server/src/main/java/org/apache/hedwig/admin/console/JLineHedwigCompletor.java b/hedwig-server/src/main/java/org/apache/hedwig/admin/console/JLineHedwigCompletor.java
+index e2da628..fe64341 100644
+--- a/hedwig-server/src/main/java/org/apache/hedwig/admin/console/JLineHedwigCompletor.java
++++ b/hedwig-server/src/main/java/org/apache/hedwig/admin/console/JLineHedwigCompletor.java
+@@ -26,14 +26,14 @@ import org.apache.hedwig.admin.HedwigAdmin;
+
+ import com.google.protobuf.ByteString;
+
+-import jline.Completor;
++import jline.console.completer.Completer;
+
+ import static org.apache.hedwig.admin.console.HedwigCommands.*;
+
+ /**
+ * A jline completor for hedwig console
+ */
+-public class JLineHedwigCompletor implements Completor {
++public class JLineHedwigCompletor implements Completer {
+ // for topic completion
+ static final int MAX_TOPICS_TO_SEARCH = 1000;
+
diff --git a/bookkeeper-4.2.1-netty.patch b/bookkeeper-4.2.1-netty.patch
new file mode 100644
index 0000000..25a34b5
--- /dev/null
+++ b/bookkeeper-4.2.1-netty.patch
@@ -0,0 +1,66 @@
+diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml
+index 1512a16..8e2fd43 100644
+--- a/bookkeeper-benchmark/pom.xml
++++ b/bookkeeper-benchmark/pom.xml
+@@ -83,9 +83,9 @@
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+- <groupId>org.jboss.netty</groupId>
++ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+- <version>3.2.4.Final</version>
++ <version>3.6.6.Final</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml
+index 1c7ebf8..8b11129 100644
+--- a/bookkeeper-server/pom.xml
++++ b/bookkeeper-server/pom.xml
+@@ -73,9 +73,9 @@
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+- <groupId>org.jboss.netty</groupId>
++ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+- <version>3.2.4.Final</version>
++ <version>3.6.6.Final</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+diff --git a/hedwig-client/pom.xml b/hedwig-client/pom.xml
+index b23ae2e..228b107 100644
+--- a/hedwig-client/pom.xml
++++ b/hedwig-client/pom.xml
+@@ -57,9 +57,9 @@
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+- <groupId>org.jboss.netty</groupId>
++ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+- <version>3.2.4.Final</version>
++ <version>3.6.6.Final</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+diff --git a/hedwig-server/src/test/java/org/apache/hedwig/server/netty/WriteRecordingChannel.java b/hedwig-server/src/test/java/org/apache/hedwig/server/netty/WriteRecordingChannel.java
+index 7ea9aff..ad415fd 100644
+--- a/hedwig-server/src/test/java/org/apache/hedwig/server/netty/WriteRecordingChannel.java
++++ b/hedwig-server/src/test/java/org/apache/hedwig/server/netty/WriteRecordingChannel.java
+@@ -166,5 +166,13 @@ public class WriteRecordingChannel implements Channel {
+ public int compareTo(Channel o) {
+ throw new RuntimeException("Not intended");
+ }
++
++ public Object getAttachment() {
++ return null;
++ }
++
++ public void setAttachment(Object attachment) {
++
++ }
+
+ }
diff --git a/bookkeeper.spec b/bookkeeper.spec
index 57ba00c..fe5ee05 100644
--- a/bookkeeper.spec
+++ b/bookkeeper.spec
@@ -1,7 +1,7 @@
%global _hardened_build 1
Name: bookkeeper
Version: 4.2.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Apache BookKeeper sub-project of ZooKeeper
Group: Development/Libraries
License: ASL 2.0
@@ -19,6 +19,8 @@ Patch2: bookkeeper-4.2.1-test-add-PIE-and-RELRO.patch
# thanks to Björn Esser bjoern.esser at gmail.com
# Fix build with boost >= 1.40.0
Patch3: bookkeeper-4.2.1-boost153.patch
+Patch4: bookkeeper-4.2.1-jline2.patch
+Patch5: bookkeeper-4.2.1-netty.patch
BuildRequires: java-devel
@@ -29,11 +31,11 @@ BuildRequires: apache-commons-configuration
BuildRequires: apache-commons-io
BuildRequires: derby
BuildRequires: guava
-BuildRequires: jline1
+BuildRequires: jline
BuildRequires: log4j
# BuildRequires: mvn(org.apache.hadoop:hadoop-common) >= 0.23.1
# BuildRequires: mvn(org.apache.hadoop:hadoop-hdfs)
-BuildRequires: netty
+BuildRequires: netty3
BuildRequires: protobuf-java
BuildRequires: slf4j
BuildRequires: zookeeper-java
@@ -108,6 +110,8 @@ This package contains javadoc for %{name}.
%patch1 -p0
%patch2 -p0
%patch3 -p0
+%patch4 -p1
+%patch5 -p1
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin bookkeeper-server
@@ -192,6 +196,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%doc LICENSE NOTICE
%changelog
+* Fri Jan 24 2014 Timothy St. Clair<tstclair at redhat.com> - 4.2.1-6
+- Update jline dependency to 2.10 and netty3
+
* Tue Jul 30 2013 Petr Machata <pmachata at redhat.com> - 4.2.1-5
- Rebuild for boost 1.54.0
More information about the scm-commits
mailing list