Skip to content

fix: ensure compatibility with JRuby 10.1 #623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
chadlwilson wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

fix: ensure compatibility with JRuby 10.1 #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1f3bc4
test: test against JRuby 10.1
chadlwilson Apr 21, 2026
af051c5
build(deps): temporarily use PR jbundler to see if we can get to the …
chadlwilson Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ jobs:
strategy:
matrix:
java-version: [8, 21, 25]
ruby-version: [jruby-9.4, jruby-10.0]
ruby-version: [jruby-9.4, jruby-10.0, jruby-10.1]
task: ['', integration]
exclude:
# JRuby 10 requires Java 21 minimum
- ruby-version: jruby-10.0
- ruby-version: jruby-10.0 # JRuby 10 requires Java 21 minimum
java-version: 8
- ruby-version: jruby-10.1 # JRuby 10 requires Java 21 minimum
java-version: 8

fail-fast: false
Expand Down Expand Up @@ -50,7 +51,7 @@ jobs:
run: gem uninstall -a jruby-launcher

- name: Install dependencies
run: bundle install
run: BUNDLE_JOBS=1 bundle install

- name: Run tests
run: bundle exec rake ${{ matrix.task }}
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## 2.1.1 (UNRELEASED)

- #623: fix: ensure compatibility with JRuby 10.1
- #583: fix: Create config dir if it's missing for simpler usage
- #588: fix: NullPointerException during shutdown with executable war files
- #589: fix: Jetty wars don't have console logging enabled by default
Expand Down
2 changes: 2 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ group :development, :test do
# force jruby-jars to use current JRuby version for testing
gem 'jruby-jars', '~> ' + JRUBY_VERSION.split('.')[0..2].join('.')
end

gem 'jbundler', github: "jruby/jbundler", ref: "refs/pull/108/head" # FIXME needs jbundler 0.9.6 release
end
2 changes: 1 addition & 1 deletion warbler.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ bundle up all of your application files for deployment to a Java environment.}

gem.add_runtime_dependency 'rake', ['~> 13.0', '>= 13.0.3']
gem.add_runtime_dependency 'rexml', '~> 3.0'
gem.add_runtime_dependency 'jruby-jars', ['>= 9.4', '< 10.1']
gem.add_runtime_dependency 'jruby-jars', ['>= 9.4', '< 10.2']
gem.add_runtime_dependency 'jruby-rack', ['>= 1.2.6', '< 1.4']
gem.add_runtime_dependency 'rubyzip', ['>= 2.1.0', '< 4']
gem.add_runtime_dependency 'ostruct', '~> 0.6.2'
Expand Down
Loading