chore: Simplify bundler CI workarounds

Avoid need for CI to be aware; just use the default bundler with whatever JRuby version we are running with

Author: chadlwilson

.github/workflows/ci.yml

@@ -21,15 +21,11 @@ jobs:
       matrix:
         java-version: [8, 21]
         ruby-version: [jruby-9.4, jruby-10]
-        bundler-version: [2.6.3, 2.7.1]
         task: ['', integration]
         exclude:
           # JRuby 10 requires Java 21 minimum
           - ruby-version: jruby-10
             java-version: 8
-          # Bundler 2.7.1 requires Ruby 3.2
-          - ruby-version: jruby-9.4
-            bundler-version: 2.7.1
 
       fail-fast: false
 
@@ -44,7 +40,7 @@ jobs:
       - name: Set up java ${{ matrix.java-version }}
         uses: actions/setup-java@v3
         with:
-          distribution: zulu
+          distribution: temurin
           java-version: ${{ matrix.java-version }}
 
       - name: Set up ${{ matrix.ruby-version }}
@@ -55,11 +51,8 @@ jobs:
       - name: Remove jruby-launcher # not sure where this is coming from but causes some specs to fail
         run: gem uninstall -a jruby-launcher
 
-      - name: Remove jruby-launcher # not sure where this is coming from but causes some specs to fail
-        run: gem install bundler -v ${{ matrix.bundler-version }}
-
       - name: Install dependencies
-        run: bundle _${{ matrix.bundler-version }}_ install --jobs=3 --retry=3
+        run: bundle install
 
       - name: Run tests
-        run: bundle _${{ matrix.bundler-version }}_ exec rake ${{ matrix.task }}
+        run: bundle exec rake ${{ matrix.task }}

Mavenfile

@@ -20,7 +20,6 @@ properties(
   'project.build.sourceEncoding' => 'UTF-8',
   'jruby.plugins.version' => '3.0.6',
   'jetty.version' => '9.4.58.v20250814',
-  'bundler.version' => '2.6.3',
 )
 
 # dependencies needed for compilation

Rakefile

@@ -6,14 +6,8 @@
 # See the file LICENSE.txt for details.
 #++
 
-begin
-  require 'bundler'
-rescue LoadError
-  warn "\nPlease `gem install bundler' and run `bundle install' to ensure you have all dependencies.\n\n"
-else
-  require 'bundler/gem_helper'
-  Bundler::GemHelper.install_tasks :dir => File.dirname(__FILE__)
-end
+require 'bundler/gem_helper'
+Bundler::GemHelper.install_tasks :dir => File.dirname(__FILE__)
 
 require 'rake/clean'
 CLEAN << "pkg" << "doc" << Dir['integration/**/target']

spec/sample_bundler/Gemfile.lock

@@ -10,6 +10,3 @@ PLATFORMS
 
 DEPENDENCIES
   rake (= 13.3.0)
-
-BUNDLED WITH
-   2.6.3

spec/warbler/bundler_spec.rb

@@ -23,7 +23,7 @@ def use_config(&block)
   end
 
   def bundle_install(*args)
-    `cd #{Dir.pwd} && #{RUBY_EXE} -S bundle _#{::Bundler::VERSION}_ install #{args.join(' ')}`
+    `cd #{Dir.pwd} && #{RUBY_EXE} -S bundle install #{args.join(' ')}`
   end
 
   let(:config) { drbclient.config(@extra_config) }