From 838453d01b8006e1b1e007ce4dc6582c579bdf5f Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Mon, 8 Apr 2013 22:09:16 -0700 Subject: [PATCH] Upgrade to jruby 1.7.3 --- hbase-server/src/main/ruby/hbase.rb | 6 +++--- hbase-server/src/main/ruby/irb/hirb.rb | 2 +- hbase-server/src/main/ruby/shell/formatter.rb | 2 +- pom.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git hbase-server/src/main/ruby/hbase.rb hbase-server/src/main/ruby/hbase.rb index 87512bf..f34cbe0 100644 --- hbase-server/src/main/ruby/hbase.rb +++ hbase-server/src/main/ruby/hbase.rb @@ -27,9 +27,9 @@ # whether the table exists and returns nil regardless. include Java -include_class('java.lang.Integer') {|package,name| "J#{name}" } -include_class('java.lang.Long') {|package,name| "J#{name}" } -include_class('java.lang.Boolean') {|package,name| "J#{name}" } +java_import('java.lang.Integer') {|package,name| "J#{name}" } +java_import('java.lang.Long') {|package,name| "J#{name}" } +java_import('java.lang.Boolean') {|package,name| "J#{name}" } module HBaseConstants COLUMN = "COLUMN" diff --git hbase-server/src/main/ruby/irb/hirb.rb hbase-server/src/main/ruby/irb/hirb.rb index b32e691..4d6d277 100644 --- hbase-server/src/main/ruby/irb/hirb.rb +++ hbase-server/src/main/ruby/irb/hirb.rb @@ -19,7 +19,7 @@ require 'rbconfig' module IRB - WINDOZE = Config::CONFIG['host_os'] =~ /mswin|mingw/ + WINDOZE = RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ # Subclass of IRB so can intercept methods class HIRB < Irb diff --git hbase-server/src/main/ruby/shell/formatter.rb hbase-server/src/main/ruby/shell/formatter.rb index 36aaf76..42d88eb 100644 --- hbase-server/src/main/ruby/shell/formatter.rb +++ hbase-server/src/main/ruby/shell/formatter.rb @@ -30,7 +30,7 @@ module Shell def refresh_width() if $stdout.tty? - @max_width = Java::jline.Terminal.getTerminal().getTerminalWidth() + @max_width = Java::jline.TerminalFactory.get().getWidth() else @max_width = 0 end diff --git pom.xml pom.xml index 7a40c9f..79774bd 100644 --- pom.xml +++ pom.xml @@ -885,7 +885,7 @@ 6.1.26 6.1.14 1.8 - 1.6.8 + 1.7.3 4.11 1.50 1.4.3 -- 1.7.10.2 (Apple Git-33)