From a2911fcdeb28f109e6756b02f02aaf18470dab44 Mon Sep 17 00:00:00 2001
From: "Jain, Nihal" <nihaljain.cs@gmail.com>
Date: Thu, 7 Dec 2023 15:41:01 +0530
Subject: [PATCH 1/2] HBASE-28249 Bump jruby to 9.3.13.0 and related joni and
 jcodings to 2.2.1 and 1.0.58 respectively

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2b1da88e056f..a09acd4b4793 100644
--- a/pom.xml
+++ b/pom.xml
@@ -846,7 +846,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.3.9.0</jruby.version>
+    <jruby.version>9.3.13.0</jruby.version>
     <junit.version>4.13.2</junit.version>
     <hamcrest.version>1.3</hamcrest.version>
     <opentelemetry.version>1.15.0</opentelemetry.version>
@@ -863,8 +863,8 @@
     <jamon-runtime.version>2.4.1</jamon-runtime.version>
     <jettison.version>1.5.4</jettison.version>
     <!--Make sure these joni/jcodings are compatible with the versions used by jruby-->
-    <joni.version>2.1.43</joni.version>
-    <jcodings.version>1.0.57</jcodings.version>
+    <joni.version>2.2.1</joni.version>
+    <jcodings.version>1.0.58</jcodings.version>
     <spy.version>2.12.2</spy.version>
     <bouncycastle.version>1.76</bouncycastle.version>
     <skyscreamer.version>1.5.1</skyscreamer.version>

From 70eb50a203069067c73729efd936702c01212430 Mon Sep 17 00:00:00 2001
From: "Jain, Nihal" <nihaljain.cs@gmail.com>
Date: Fri, 8 Dec 2023 17:14:34 +0530
Subject: [PATCH 2/2] Fix error NoMethodError: undefined method runtime for
 JRuby:Module

---
 hbase-shell/src/main/ruby/jar-bootstrap.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/hbase-shell/src/main/ruby/jar-bootstrap.rb b/hbase-shell/src/main/ruby/jar-bootstrap.rb
index 3f0e650947cf..70da296aa99d 100644
--- a/hbase-shell/src/main/ruby/jar-bootstrap.rb
+++ b/hbase-shell/src/main/ruby/jar-bootstrap.rb
@@ -37,6 +37,14 @@
 # hbase hacking.
 include Java
 
+# Required to access JRuby-specific internal features, such as `JRuby.runtime`
+# Loading 'java' was automatically loading 'jruby' until JRuby 9.2.
+# But, it has changed since JRuby 9.3. JRuby 9.3+ needs loading 'jruby' explicitly.
+#
+# See also: https://github.com/jruby/jruby/issues/7221#issuecomment-1133646241
+#
+require 'jruby'
+
 # Some goodies for hirb. Should these be left up to the user's discretion?
 if $stdin.tty?
   require 'irb/completion'