Skip to content

Commit 945923b

Browse files
chadlwilsonchadlwilson
authored
Merge pull request #422 from chadlwilson/jruby-10.1
[test] test against JRuby 10.1
2 parents 97600e4 + d4b8ad3 commit 945923b

5 files changed

Lines changed: 37 additions & 6 deletions

File tree

‎.github/workflows/maven.yml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
strategy:
2121
matrix:
22-
jruby_version: [ '9.4.14.0', '10.0.5.0' ]
22+
jruby_version: [ '9.4.14.0', '10.0.5.0', '10.1.0.0' ]
2323
java_version: [ '8', '11', '17', '21', '25' ]
2424
rack_version: [ '~> 2.2.0' ]
2525
exclude:
@@ -29,6 +29,12 @@ jobs:
2929
java_version: '11' # JRuby 10 requires Java 21
3030
- jruby_version: '10.0.5.0'
3131
java_version: '17' # JRuby 10 requires Java 21
32+
- jruby_version: '10.1.0.0'
33+
java_version: '8' # JRuby 10 requires Java 21
34+
- jruby_version: '10.1.0.0'
35+
java_version: '11' # JRuby 10 requires Java 21
36+
- jruby_version: '10.1.0.0'
37+
java_version: '17' # JRuby 10 requires Java 21
3238
fail-fast: false
3339

3440
steps:
@@ -64,7 +70,7 @@ jobs:
6470
'rails72_rack22',
6571
'rails80_rack22',
6672
]
67-
jruby_version: [ '9.4.14.0', '10.0.5.0' ]
73+
jruby_version: [ '9.4.14.0', '10.0.5.0', '10.1.0.0' ]
6874
java_version: [ '8', '11', '17', '21', '25' ]
6975
exclude:
7076
- jruby_version: '10.0.5.0'
@@ -73,6 +79,12 @@ jobs:
7379
java_version: '11' # JRuby 10 requires Java 21
7480
- jruby_version: '10.0.5.0'
7581
java_version: '17' # JRuby 10 requires Java 21
82+
- jruby_version: '10.1.0.0'
83+
java_version: '8' # JRuby 10 requires Java 21
84+
- jruby_version: '10.1.0.0'
85+
java_version: '11' # JRuby 10 requires Java 21
86+
- jruby_version: '10.1.0.0'
87+
java_version: '17' # JRuby 10 requires Java 21
7688
- appraisal: 'rails80_rack22'
7789
jruby_version: '9.4.14.0' # Rails 8 requires Ruby 3.4 compatibility, which JRuby 9.4 does not support
7890
fail-fast: false

‎CHANGELOG.md‎

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

33
- Officially support Javax Servlet API 4.0 (JEE 8)
4+
- Ensure compatibility with JRuby 10.1
45

56
Breaking compatibility changes
67
- Drop support for JRuby 9.3

‎Gemfile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,8 @@ group :development do
1212
gem 'appraisal', :require => nil
1313
end
1414

15-
gem 'rake', '~> 13.4', :group => :test, :require => nil
16-
gem 'rspec', :group => :test
15+
group :test do
16+
gem 'rake', '~> 13.4', :require => nil
17+
gem 'rspec'
18+
gem 'logger'
19+
end

‎Gemfile.lock‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ GEM
66
rake
77
thor (>= 0.14.0)
88
diff-lcs (1.6.2)
9+
logger (1.7.0)
910
rack (2.2.23)
1011
rake (13.4.2)
1112
rspec (3.13.2)
@@ -33,6 +34,20 @@ PLATFORMS
3334

3435
DEPENDENCIES
3536
appraisal
37+
logger
3638
rack (~> 2.2.23)
3739
rake (~> 13.4)
3840
rspec
41+
42+
CHECKSUMS
43+
appraisal (2.5.0) sha256=36989221be127913b0dba8d114da2001e6b2dceea7bd4951200eaba764eed3ce
44+
diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
45+
logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
46+
rack (2.2.23) sha256=a8fe9d7e07064770b8ec123663fded8a59ef7e2b6db5cda7173d45a5718ab69c
47+
rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
48+
rspec (3.13.2) sha256=206284a08ad798e61f86d7ca3e376718d52c0bc944626b2349266f239f820587
49+
rspec-core (3.13.6) sha256=a8823c6411667b60a8bca135364351dda34cd55e44ff94c4be4633b37d828b2d
50+
rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836
51+
rspec-mocks (3.13.8) sha256=086ad3d3d17533f4237643de0b5c42f04b66348c28bf6b9c2d3f4a3b01af1d47
52+
rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
53+
thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ For more information on Rack, visit http://rack.github.io/.
1515

1616
| JRuby-Rack Series | Status | Rack | JRuby | Java | Rails | Target Servlet API | Notes |
1717
|----------------------------------------------------------------|---------------|-----------|------------|------|-----------|---------------------|----------------------------------------------------------------|
18-
| **2.0 (_planned_, _unreleased_)** | Dev | 2.2 | 9.4 → 10.0 | 8+ | 7.0 → 8.0 | 5.0+ (Jakarta EE 9) | ❌ Servlet < 5.0 containers will not work |
19-
| **1.3 (master, _unreleased_)** | Dev | 2.2 | 9.4 → 10.0 | 8+ | 7.0 → 8.0 | 4.0 (Java EE 8) | ✅ _Unofficial_: Servlet 2.5 → 3.1 & Rails 6.1 likely working |
18+
| **2.0 (_planned_, _unreleased_)** | Dev | 2.2 | 9.4 → 10.1 | 8+ | 7.0 → 8.0 | 5.0+ (Jakarta EE 9) | ❌ Servlet < 5.0 containers will not work |
19+
| **1.3 (master, _unreleased_)** | Dev | 2.2 | 9.4 → 10.1 | 8+ | 7.0 → 8.0 | 4.0 (Java EE 8) | ✅ _Unofficial_: Servlet 2.5 → 3.1 & Rails 6.1 likely working |
2020
| [**1.2**](https://github.com/jruby/jruby-rack/tree/1.2-stable) | Maintained | 2.2 | 9.3 → 10.0 | 8+ | 5.0 → 8.0 | 3.0 (Java EE 6) | ✅ _Unofficial_: Servlet 3.1 → 4.0 also OK with most containers |
2121
| [**1.1**](https://github.com/jruby/jruby-rack/tree/1.1-stable) | EOL @ 2024-05 | 1.x → 2.2 | 1.6 → 9.4 | 6+ | 2.1 → 5.2 | 2.5 (Java EE 5) | ✅ _Unofficial_: Servlet 3.0 → 4.0 also OK with most containers |
2222
| [**1.0**](https://github.com/jruby/jruby-rack/tree/1.0.10) | EOL @ 2011-11 | 0.9 → 1.x | 1.1 → 1.9 | 5+ | 2.1 → 3.x | 2.5 (Java EE 5) | |

0 commit comments

Comments
 (0)