You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by xe...@apache.org on 2012/04/09 23:40:03 UTC
git commit: (CLI) jline version is bumped to 1.0 to properly support
'delete' key function patch by Dave Brosius;
reviewed by Pavel Yaskevich for CASSANDRA-4132
Updated Branches:
refs/heads/trunk 372708461 -> 9bdacf7df
(CLI) jline version is bumped to 1.0 to properly support 'delete' key function
patch by Dave Brosius; reviewed by Pavel Yaskevich for CASSANDRA-4132
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9bdacf7d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9bdacf7d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9bdacf7d
Branch: refs/heads/trunk
Commit: 9bdacf7df139e6fe39318fae8f5bf38fc098e6d6
Parents: 3727084
Author: Pavel Yaskevich <xe...@apache.org>
Authored: Tue Apr 10 00:38:07 2012 +0300
Committer: Pavel Yaskevich <xe...@apache.org>
Committed: Tue Apr 10 00:38:52 2012 +0300
----------------------------------------------------------------------
CHANGES.txt | 2 ++
build.xml | 2 +-
lib/jline-0.9.94.jar | Bin 87325 -> 0 bytes
lib/jline-1.0.jar | Bin 0 -> 91183 bytes
lib/licenses/jline-0.9.94.txt | 33 ---------------------------------
lib/licenses/jline-1.0.txt | 33 +++++++++++++++++++++++++++++++++
6 files changed, 36 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bdacf7d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4db7613..0ab6f7a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,8 @@
higher than a configurable threshold, default 20% (CASSANDRA-3442)
* update MurmurHash to version 3 (CASSANDRA-2975)
* (CLI) track elapsed time for `delete' operation (CASSANDRA-4060)
+ * (CLI) jline version is bumped to 1.0 to properly support
+ 'delete' key function (CASSANDRA-4132)
1.1.1-dev
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bdacf7d/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 02a68ae..3b7f90a 100644
--- a/build.xml
+++ b/build.xml
@@ -332,7 +332,7 @@
<dependency groupId="org.slf4j" artifactId="slf4j-log4j12" version="1.6.1"/>
<dependency groupId="org.codehaus.jackson" artifactId="jackson-core-asl" version="1.4.0"/>
<dependency groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl" version="1.4.0"/>
- <dependency groupId="jline" artifactId="jline" version="0.9.94">
+ <dependency groupId="jline" artifactId="jline" version="1.0">
<exclusion groupId="junit" artifactId="junit"/>
</dependency>
<dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bdacf7d/lib/jline-0.9.94.jar
----------------------------------------------------------------------
diff --git a/lib/jline-0.9.94.jar b/lib/jline-0.9.94.jar
deleted file mode 100644
index dede372..0000000
Binary files a/lib/jline-0.9.94.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bdacf7d/lib/jline-1.0.jar
----------------------------------------------------------------------
diff --git a/lib/jline-1.0.jar b/lib/jline-1.0.jar
new file mode 100644
index 0000000..6c949b2
Binary files /dev/null and b/lib/jline-1.0.jar differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bdacf7d/lib/licenses/jline-0.9.94.txt
----------------------------------------------------------------------
diff --git a/lib/licenses/jline-0.9.94.txt b/lib/licenses/jline-0.9.94.txt
deleted file mode 100644
index 1cdc44c..0000000
--- a/lib/licenses/jline-0.9.94.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the following
-conditions are met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with
-the distribution.
-
-Neither the name of JLine nor the names of its contributors
-may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bdacf7d/lib/licenses/jline-1.0.txt
----------------------------------------------------------------------
diff --git a/lib/licenses/jline-1.0.txt b/lib/licenses/jline-1.0.txt
new file mode 100644
index 0000000..1cdc44c
--- /dev/null
+++ b/lib/licenses/jline-1.0.txt
@@ -0,0 +1,33 @@
+Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the following
+conditions are met:
+
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with
+the distribution.
+
+Neither the name of JLine nor the names of its contributors
+may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+