This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new f0c430a HBASE-20598 Upgrade to JRuby 9.2
f0c430a is described below
commit f0c430aed226b7404bcc4d23b0ec164e5071276b
Author: Norbert Kalmar <[email protected]>
AuthorDate: Tue Aug 25 12:25:12 2020 +0200
HBASE-20598 Upgrade to JRuby 9.2
- upgrade our default jruby to 9.2.13.0
- this major JRuby version update changes the Ruby compatibility from Ruby
2.3 to Ruby 2.5
- use a custom IRB prompt to convey similar information to before
- update the joni and jcoding dependencies to match this version of
jruby-complete
closes #2308
Signed-off-by: stack <[email protected]>
Signed-off-by: Josh Elser <[email protected]>
Signed-off-by: Sean Busbey <[email protected]>
---
hbase-shell/src/main/ruby/jar-bootstrap.rb | 8 ++++++++
pom.xml | 6 +++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/hbase-shell/src/main/ruby/jar-bootstrap.rb
b/hbase-shell/src/main/ruby/jar-bootstrap.rb
index de602bf..ef3727d 100644
--- a/hbase-shell/src/main/ruby/jar-bootstrap.rb
+++ b/hbase-shell/src/main/ruby/jar-bootstrap.rb
@@ -207,8 +207,16 @@ if interactive
$0 = File.basename(ap_path, '.rb') if ap_path
IRB.setup(ap_path)
+ IRB.conf[:PROMPT][:CUSTOM] = {
+ :PROMPT_I => "%N:%03n:%i> ",
+ :PROMPT_S => "%N:%03n:%i%l ",
+ :PROMPT_C => "%N:%03n:%i* ",
+ :RETURN => "=> %s\n"
+ }
+
@CONF[:IRB_NAME] = 'hbase'
@CONF[:AP_NAME] = 'hbase'
+ @CONF[:PROMPT_MODE] = :CUSTOM
@CONF[:BACK_TRACE_LIMIT] = 0 unless $fullBackTrace
hirb = if @CONF[:SCRIPT]
diff --git a/pom.xml b/pom.xml
index fc008cb..cd76195 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1617,7 +1617,7 @@
<wx.rs.api.version>2.1.1</wx.rs.api.version>
<glassfish.jsp.version>2.3.2</glassfish.jsp.version>
<glassfish.el.version>3.0.1-b08</glassfish.el.version>
- <jruby.version>9.1.17.0</jruby.version>
+ <jruby.version>9.2.13.0</jruby.version>
<junit.version>4.13</junit.version>
<hamcrest.version>1.3</hamcrest.version>
<htrace.version>4.2.0-incubating</htrace.version>
@@ -1633,8 +1633,8 @@
<jamon-runtime.version>2.4.1</jamon-runtime.version>
<jettison.version>1.3.8</jettison.version>
<!--Make sure these joni/jcodings are compatible with the versions used by
jruby-->
- <joni.version>2.1.11</joni.version>
- <jcodings.version>1.0.18</jcodings.version>
+ <joni.version>2.1.31</joni.version>
+ <jcodings.version>1.0.55</jcodings.version>
<spy.version>2.12.2</spy.version>
<bouncycastle.version>1.60</bouncycastle.version>
<kerby.version>1.0.1</kerby.version>
