Skip to content

Commit 017d2e3

Browse files
committed
test: test against JRuby 10.1
1 parent 95db957 commit 017d2e3

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,17 @@ on:
1212

1313
jobs:
1414
ci:
15-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-latest
1616

1717
strategy:
1818
matrix:
1919
java-version: [8, 21, 25]
20-
ruby-version: [jruby-9.4, jruby-10]
20+
ruby-version: [jruby-9.4, jruby-10.0, jruby-10.1]
2121
task: ['', integration]
2222
exclude:
23-
# JRuby 10 requires Java 21 minimum
24-
- ruby-version: jruby-10
23+
- ruby-version: jruby-10.0 # JRuby 10 requires Java 21 minimum
24+
java-version: 8
25+
- ruby-version: jruby-10.1 # JRuby 10 requires Java 21 minimum
2526
java-version: 8
2627

2728
fail-fast: false

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
## 2.1.1 (UNRELEASED)
22

3+
- #623: fix: ensure compatibility with JRuby 10.1
34
- #583: fix: Create config dir if it's missing for simpler usage
45
- #588: fix: NullPointerException during shutdown with executable war files
56
- #589: fix: Jetty wars don't have console logging enabled by default

warbler.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ bundle up all of your application files for deployment to a Java environment.}
3232

3333
gem.add_runtime_dependency 'rake', ['~> 13.0', '>= 13.0.3']
3434
gem.add_runtime_dependency 'rexml', '~> 3.0'
35-
gem.add_runtime_dependency 'jruby-jars', ['>= 9.4', '< 10.1']
35+
gem.add_runtime_dependency 'jruby-jars', ['>= 9.4', '< 10.2']
3636
gem.add_runtime_dependency 'jruby-rack', ['>= 1.2.6', '< 1.4']
3737
gem.add_runtime_dependency 'rubyzip', ['>= 2.1.0', '< 4']
3838
gem.add_runtime_dependency 'ostruct', '~> 0.6.2'

0 commit comments

Comments
 (0)