Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <stack@apache.org>
Signed-off-by: Josh Elser <elserj@apache.org>
Signed-off-by: Sean Busbey <busbey@apache.org>
This commit is contained in:
Norbert Kalmar 2020-08-25 12:25:12 +02:00 committed by Sean Busbey
parent 6a5c928539
commit f0c430aed2
No known key found for this signature in database
GPG Key ID: A926FD051016402D
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hbase-shell/src/main/ruby/jar-bootstrap.rb
View File

@ -207,8 +207,16 @@ if interactive
$0 = File.basename(ap_path, '.rb') if ap_path $0 = File.basename(ap_path, '.rb') if ap_path
IRB.setup(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[:IRB_NAME] = 'hbase'
@CONF[:AP_NAME] = 'hbase' @CONF[:AP_NAME] = 'hbase'
@CONF[:PROMPT_MODE] = :CUSTOM
@CONF[:BACK_TRACE_LIMIT] = 0 unless $fullBackTrace @CONF[:BACK_TRACE_LIMIT] = 0 unless $fullBackTrace
hirb = if @CONF[:SCRIPT] hirb = if @CONF[:SCRIPT]

6
pom.xml
View File

@ -1617,7 +1617,7 @@
<wx.rs.api.version>2.1.1</wx.rs.api.version> <wx.rs.api.version>2.1.1</wx.rs.api.version>
<glassfish.jsp.version>2.3.2</glassfish.jsp.version> <glassfish.jsp.version>2.3.2</glassfish.jsp.version>
<glassfish.el.version>3.0.1-b08</glassfish.el.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> <junit.version>4.13</junit.version>
<hamcrest.version>1.3</hamcrest.version> <hamcrest.version>1.3</hamcrest.version>
<htrace.version>4.2.0-incubating</htrace.version> <htrace.version>4.2.0-incubating</htrace.version>
@ -1633,8 +1633,8 @@
<jamon-runtime.version>2.4.1</jamon-runtime.version> <jamon-runtime.version>2.4.1</jamon-runtime.version>
<jettison.version>1.3.8</jettison.version> <jettison.version>1.3.8</jettison.version>
<!--Make sure these joni/jcodings are compatible with the versions used by jruby--> <!--Make sure these joni/jcodings are compatible with the versions used by jruby-->
<joni.version>2.1.11</joni.version> <joni.version>2.1.31</joni.version>
<jcodings.version>1.0.18</jcodings.version> <jcodings.version>1.0.55</jcodings.version>
<spy.version>2.12.2</spy.version> <spy.version>2.12.2</spy.version>
<bouncycastle.version>1.60</bouncycastle.version> <bouncycastle.version>1.60</bouncycastle.version>
<kerby.version>1.0.1</kerby.version> <kerby.version>1.0.1</kerby.version>