separate jruby and mri lockfile

Signed-off-by: Jimmy Tanagra <[email protected]>

Gemfile

@@ -9,9 +9,7 @@ return unless Plugin.installed?("bundler-multilock")
 
 Plugin.send(:load_plugin, "bundler-multilock")
 
-lockfile active: RUBY_VERSION >= "2.7" &&
-                 (!Object.const_defined?(:JRUBY_VERSION) ||
-                  Gem::Version.new(JRUBY_VERSION) >= Gem::Version.new("9.4.11.0")) do
+lockfile active: RUBY_VERSION >= "2.7" && !Object.const_defined?(:JRUBY_VERSION) do
   # these gems are not compatible with Ruby 2.6/JRuby 9.3, but we don't need them to actually
   # run tests
 
@@ -23,14 +21,7 @@ lockfile active: RUBY_VERSION >= "2.7" &&
   gem "rubocop-rspec", "~> 2.11"
 end
 
-lockfile "pre-jruby-9.4.11",
-         active: RUBY_VERSION >= "2.7" &&
-                 Object.const_defined?(:JRUBY_VERSION) &&
-                 Gem::Version.new(JRUBY_VERSION) < Gem::Version.new("9.4.11.0") do
-  # JRuby 9.4.11.0 requires a newer version of psych 5.2.3 and jar-dependencies 0.5.3
-  # However, prior JRuby versions came bundled psych 5.1.2 and jar-dependencies 0.4.1
-  # So we need a separate lockfile for JRuby < 9.4.11.0 that doesn't bring in newer psych packages
-  # One of the gems above requires psych 5.2.3. They are omitted here to avoid bringing in the newer psych
+lockfile "jruby", active: RUBY_VERSION >= "2.7" && Object.const_defined?(:JRUBY_VERSION) do
   gem "nokogiri", "~> 1.15"
 end