Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
strategy:
matrix:
java-version: [8, 21, 25]
ruby-version: [jruby-9.4, jruby-10]
ruby-version: [jruby-9.4, jruby-10.0]
task: ['', integration]
exclude:
# JRuby 10 requires Java 21 minimum
- ruby-version: jruby-10
- ruby-version: jruby-10.0
java-version: 8

fail-fast: false
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- #591: chore: clean up obsolete & deprecated code from 2.0.x and old Bundler versions
- #592: chore: relax rubyzip requirement to allow rubyzip 2.x
- #593: chore: relax jruby-rack requirement to allow compatibility with upcoming 1.3.x
- #624: chore: remove use of deprecated JRuby methods removed in JRuby 10.1

## 2.1.0

Expand Down
2 changes: 1 addition & 1 deletion ext/WarMain.java
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ protected int launchJRuby(final URL[] jars) throws Exception {

invokeMethod(rubyInstanceConfig, "processArguments", (Object) arguments);

Object runtime = invokeMethod(scriptingContainer, "getRuntime");
Object runtime = invokeMethod(provider, "getRuntime");

debug("loading resource: " + executablePath);
Object executableInput =
Expand Down