From d4b8ad3dccc48410e495a216bda05a1be115f4ad Mon Sep 17 00:00:00 2001 From: Chad Wilson <29788154+chadlwilson@users.noreply.github.com> Date: Tue, 21 Apr 2026 23:44:01 +0800 Subject: [PATCH] [test] test against JRuby 10.1 --- .github/workflows/maven.yml | 16 ++++++++++++++-- CHANGELOG.md | 1 + Gemfile | 7 +++++-- Gemfile.lock | 15 +++++++++++++++ README.md | 4 ++-- 5 files changed, 37 insertions(+), 6 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 127716d2..a8fb6df2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: - jruby_version: [ '9.4.14.0', '10.0.5.0' ] + jruby_version: [ '9.4.14.0', '10.0.5.0', '10.1.0.0' ] java_version: [ '8', '11', '17', '21', '25' ] rack_version: [ '~> 2.2.0' ] exclude: @@ -29,6 +29,12 @@ jobs: java_version: '11' # JRuby 10 requires Java 21 - jruby_version: '10.0.5.0' java_version: '17' # JRuby 10 requires Java 21 + - jruby_version: '10.1.0.0' + java_version: '8' # JRuby 10 requires Java 21 + - jruby_version: '10.1.0.0' + java_version: '11' # JRuby 10 requires Java 21 + - jruby_version: '10.1.0.0' + java_version: '17' # JRuby 10 requires Java 21 fail-fast: false steps: @@ -64,7 +70,7 @@ jobs: 'rails72_rack22', 'rails80_rack22', ] - jruby_version: [ '9.4.14.0', '10.0.5.0' ] + jruby_version: [ '9.4.14.0', '10.0.5.0', '10.1.0.0' ] java_version: [ '8', '11', '17', '21', '25' ] exclude: - jruby_version: '10.0.5.0' @@ -73,6 +79,12 @@ jobs: java_version: '11' # JRuby 10 requires Java 21 - jruby_version: '10.0.5.0' java_version: '17' # JRuby 10 requires Java 21 + - jruby_version: '10.1.0.0' + java_version: '8' # JRuby 10 requires Java 21 + - jruby_version: '10.1.0.0' + java_version: '11' # JRuby 10 requires Java 21 + - jruby_version: '10.1.0.0' + java_version: '17' # JRuby 10 requires Java 21 - appraisal: 'rails80_rack22' jruby_version: '9.4.14.0' # Rails 8 requires Ruby 3.4 compatibility, which JRuby 9.4 does not support fail-fast: false diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c0129f3..767b2851 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## 1.3.0 (UNRELEASED) - Officially support Javax Servlet API 4.0 (JEE 8) +- Ensure compatibility with JRuby 10.1 Breaking compatibility changes - Drop support for JRuby 9.3 diff --git a/Gemfile b/Gemfile index 3a84a609..77acc5a4 100644 --- a/Gemfile +++ b/Gemfile @@ -12,5 +12,8 @@ group :development do gem 'appraisal', :require => nil end -gem 'rake', '~> 13.4', :group => :test, :require => nil -gem 'rspec', :group => :test +group :test do + gem 'rake', '~> 13.4', :require => nil + gem 'rspec' + gem 'logger' +end diff --git a/Gemfile.lock b/Gemfile.lock index 974d946f..43b5554c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,6 +6,7 @@ GEM rake thor (>= 0.14.0) diff-lcs (1.6.2) + logger (1.7.0) rack (2.2.23) rake (13.4.2) rspec (3.13.2) @@ -33,6 +34,20 @@ PLATFORMS DEPENDENCIES appraisal + logger rack (~> 2.2.23) rake (~> 13.4) rspec + +CHECKSUMS + appraisal (2.5.0) sha256=36989221be127913b0dba8d114da2001e6b2dceea7bd4951200eaba764eed3ce + diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 + logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 + rack (2.2.23) sha256=a8fe9d7e07064770b8ec123663fded8a59ef7e2b6db5cda7173d45a5718ab69c + rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701 + rspec (3.13.2) sha256=206284a08ad798e61f86d7ca3e376718d52c0bc944626b2349266f239f820587 + rspec-core (3.13.6) sha256=a8823c6411667b60a8bca135364351dda34cd55e44ff94c4be4633b37d828b2d + rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836 + rspec-mocks (3.13.8) sha256=086ad3d3d17533f4237643de0b5c42f04b66348c28bf6b9c2d3f4a3b01af1d47 + rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c + thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73 diff --git a/README.md b/README.md index 1d88b630..8a21b5aa 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ For more information on Rack, visit http://rack.github.io/. | JRuby-Rack Series | Status | Rack | JRuby | Java | Rails | Target Servlet API | Notes | |----------------------------------------------------------------|---------------|-----------|------------|------|-----------|---------------------|----------------------------------------------------------------| -| **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 | -| **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 | +| **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 | +| **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 | | [**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 | | [**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 | | [**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) | |