Merge pull request #397 from chadlwilson/jruby-10-0-3

[tests] Rationalise testing for JRuby 10.0.3

Author: chadlwilson

.github/workflows/maven.yml

@@ -19,15 +19,15 @@ jobs:
 
     strategy:
       matrix:
-        jruby_version: [ '9.4.14.0', '10.0.2.0' ]
+        jruby_version: [ '9.4.14.0', '10.0.3.0' ]
         java_version: [ '8', '11', '17', '21', '25' ]
         rack_version: [ '~> 2.2.0' ]
         exclude:
-          - jruby_version: '10.0.2.0'
+          - jruby_version: '10.0.3.0'
             java_version: '8'  # JRuby 10 requires Java 21
-          - jruby_version: '10.0.2.0'
+          - jruby_version: '10.0.3.0'
             java_version: '11' # JRuby 10 requires Java 21
-          - jruby_version: '10.0.2.0'
+          - jruby_version: '10.0.3.0'
             java_version: '17' # JRuby 10 requires Java 21
       fail-fast: false
 
@@ -59,20 +59,19 @@ jobs:
     strategy:
       matrix:
         appraisal: [
-          'rails61_rack22',
           'rails70_rack22',
           'rails71_rack22',
           'rails72_rack22',
           'rails80_rack22',
         ]
-        jruby_version: [ '9.4.14.0', '10.0.2.0' ]
+        jruby_version: [ '9.4.14.0', '10.0.3.0' ]
         java_version: [ '8', '11', '17', '21', '25' ]
         exclude:
-          - jruby_version: '10.0.2.0'
+          - jruby_version: '10.0.3.0'
             java_version: '8'  # JRuby 10 requires Java 21
-          - jruby_version: '10.0.2.0'
+          - jruby_version: '10.0.3.0'
             java_version: '11' # JRuby 10 requires Java 21
-          - jruby_version: '10.0.2.0'
+          - jruby_version: '10.0.3.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

Appraisals

@@ -3,7 +3,6 @@ version_spec = ->(prefix, desc) { "~> #{desc.split(prefix).last.insert(1, ".")}.
 # Rails version -> rack versions in format
 # rails#{MAJOR}#{MINOR} => %w[ rack#{MAJOR}#{MINOR} ]
 {
-    "rails61" => %w[rack22],
     "rails70" => %w[rack22],
     "rails71" => %w[rack22],
     "rails72" => %w[rack22],

CHANGELOG.md

@@ -5,7 +5,7 @@
 
 Breaking compatibility changes
 - Drop support for JRuby 9.3
-- Drop support for Rails < 6.1
+- Drop support for Rails < 7.0
 
 Breaking behavioral changes
 - Change context listener to throw by default in case of an exception during initialization

README.md

@@ -13,13 +13,13 @@ For more information on Rack, visit http://rack.github.io/.
 
 ## Compatibility
 
-| JRuby-Rack Series                                          | Status     | Rack      | JRuby      | Java | Rails     | Target Servlet API  | Notes                                      |
-|------------------------------------------------------------|------------|-----------|------------|------|-----------|---------------------|--------------------------------------------|
-| 2.0 (_planned_)                                            | Dev        | 2.2       | 9.4 → 10.0 | 8+   | 6.1 → 8.0 | 5.0+ (Jakarta EE 9) | Pre 5.0 servlet APIs non functional.       |
-| 1.3 (master, _unreleased_)                                 | Dev        | 2.2       | 9.4 → 10.0 | 8+   | 6.1 → 8.0 | 4.0 (Java EE 8)     | Servlet 2.5 → 3.1 likely to work fine.     |
-| [1.2](https://github.com/jruby/jruby-rack/tree/1.2-stable) | Maintained | 2.2       | 9.3 → 9.4  | 8+   | 5.0 → 7.2 | 3.0 (Java EE 6)     | Servlet 3.1 → 4.0 OK with some containers. |
-| [1.1](https://github.com/jruby/jruby-rack/tree/1.1-stable) | EOL        | 1.x → 2.2 | 1.6 → 9.4  | 6+   | 2.1 → 5.2 | 2.5 (Java EE 5)     | Servlet 3.0 → 4.0 OK with some containers. |
-| 1.0                                                        | EOL        | 0.9 → 1.x | 1.1 → 1.9  | 5+   | 2.1 → 3.x | 2.5 (Java EE 5)     |                                            |
+| 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   |
+| [**1.2**](https://github.com/jruby/jruby-rack/tree/1.2-stable) | Maintained    | 2.2       | 9.3 → 9.4  | 8+   | 5.0 → 7.2 | 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)     |                                                                |
 
 ## Getting Started
 

src/spec/ruby/jruby/rack/integration_spec.rb

@@ -203,10 +203,6 @@
     end
   end
 
-  describe 'rails 6.1', lib: :rails61 do
-    it_should_behave_like 'a rails app'
-  end
-
   describe 'rails 7.0', lib: :rails70 do
     it_should_behave_like 'a rails app'
   end