From 61789702e1a368d3396c890e6da22d8db16cf784 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Sun, 22 Oct 2023 11:31:34 -0400
Subject: [PATCH 1/2] dep: revert 59e4981a and remove psych

psych 5.1.1.1 fixes the issues for jruby
---
 Gemfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 24aaecd9841..db985594459 100644
--- a/Gemfile
+++ b/Gemfile
@@ -43,5 +43,3 @@ end
 group :rdoc do
   gem "rdoc", "6.5.0"
 end
-
-gem "psych", "!= 5.1.1", "!= 5.1.0" # https://github.com/ruby/psych/issues/655

From 89c109a47912bffcd5ef20940b59630c3798b68c Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Sun, 22 Oct 2023 12:19:15 -0400
Subject: [PATCH 2/2] test: ensure jruby doesn't use minitest-parallel_fork

---
 test/helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/helper.rb b/test/helper.rb
index 8bafc170d3a..1421ae23ff4 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -50,7 +50,7 @@
 
 require "minitest/autorun"
 require "minitest/benchmark"
-if ENV["NCPU"]
+if ENV["NCPU"] && !Nokogiri.jruby?
   require "minitest/parallel_fork"
   warn "Running parallel tests with NCPU=#{ENV["NCPU"].inspect}"
 end