pFad - Phone/Frame/Anonymizer/Declutterfier! Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

URL: http://github.com/jruby/jruby-rack/commit/836609a42c846cf919174c110643ccfa876f499c

a60c69660fa.css" /> Merge pull request #397 from chadlwilson/jruby-10-0-3 · jruby/jruby-rack@836609a · GitHub
Skip to content

Commit 836609a

Browse files
authored
Merge pull request #397 from chadlwilson/jruby-10-0-3
[tests] Rationalise testing for JRuby 10.0.3
2 parents 01cdc40 + c653492 commit 836609a

27 files changed

Lines changed: 16 additions & 407 deletions

.github/workflows/maven.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919

2020
strategy:
2121
matrix:
22-
jruby_version: [ '9.4.14.0', '10.0.2.0' ]
22+
jruby_version: [ '9.4.14.0', '10.0.3.0' ]
2323
java_version: [ '8', '11', '17', '21', '25' ]
2424
rack_version: [ '~> 2.2.0' ]
2525
exclude:
26-
- jruby_version: '10.0.2.0'
26+
- jruby_version: '10.0.3.0'
2727
java_version: '8' # JRuby 10 requires Java 21
28-
- jruby_version: '10.0.2.0'
28+
- jruby_version: '10.0.3.0'
2929
java_version: '11' # JRuby 10 requires Java 21
30-
- jruby_version: '10.0.2.0'
30+
- jruby_version: '10.0.3.0'
3131
java_version: '17' # JRuby 10 requires Java 21
3232
fail-fast: false
3333

@@ -59,20 +59,19 @@ jobs:
5959
strategy:
6060
matrix:
6161
appraisal: [
62-
'rails61_rack22',
6362
'rails70_rack22',
6463
'rails71_rack22',
6564
'rails72_rack22',
6665
'rails80_rack22',
6766
]
68-
jruby_version: [ '9.4.14.0', '10.0.2.0' ]
67+
jruby_version: [ '9.4.14.0', '10.0.3.0' ]
6968
java_version: [ '8', '11', '17', '21', '25' ]
7069
exclude:
71-
- jruby_version: '10.0.2.0'
70+
- jruby_version: '10.0.3.0'
7271
java_version: '8' # JRuby 10 requires Java 21
73-
- jruby_version: '10.0.2.0'
72+
- jruby_version: '10.0.3.0'
7473
java_version: '11' # JRuby 10 requires Java 21
75-
- jruby_version: '10.0.2.0'
74+
- jruby_version: '10.0.3.0'
7675
java_version: '17' # JRuby 10 requires Java 21
7776
- appraisal: 'rails80_rack22'
7877
jruby_version: '9.4.14.0' # Rails 8 requires Ruby 3.4 compatibility, which JRuby 9.4 does not support

Appraisals

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ version_spec = ->(prefix, desc) { "~> #{desc.split(prefix).last.insert(1, ".")}.
33
# Rails version -> rack versions in format
44
# rails#{MAJOR}#{MINOR} => %w[ rack#{MAJOR}#{MINOR} ]
55
{
6-
"rails61" => %w[rack22],
76
"rails70" => %w[rack22],
87
"rails71" => %w[rack22],
98
"rails72" => %w[rack22],

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
Breaking compatibility changes
77
- Drop support for JRuby 9.3
8-
- Drop support for Rails < 6.1
8+
- Drop support for Rails < 7.0
99

1010
Breaking behavioral changes
1111
- Change context listener to throw by default in case of an exception during initialization

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ For more information on Rack, visit http://rack.github.io/.
1313

1414
## Compatibility
1515

16-
| JRuby-Rack Series | Status | Rack | JRuby | Java | Rails | Target Servlet API | Notes |
17-
|------------------------------------------------------------|------------|-----------|------------|------|-----------|---------------------|--------------------------------------------|
18-
| 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. |
19-
| 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. |
20-
| [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. |
21-
| [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. |
22-
| 1.0 | EOL | 0.9 → 1.x | 1.1 → 1.9 | 5+ | 2.1 → 3.x | 2.5 (Java EE 5) | |
16+
| JRuby-Rack Series | Status | Rack | JRuby | Java | Rails | Target Servlet API | Notes |
17+
|----------------------------------------------------------------|---------------|-----------|------------|------|-----------|---------------------|----------------------------------------------------------------|
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 |
20+
| [**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 |
21+
| [**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 |
22+
| [**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) | |
2323

2424
## Getting Started
2525

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,6 @@
203203
end
204204
end
205205

206-
describe 'rails 6.1', lib: :rails61 do
207-
it_should_behave_like 'a rails app'
208-
end
209-
210206
describe 'rails 7.0', lib: :rails70 do
211207
it_should_behave_like 'a rails app'
212208
end

src/spec/stub/rails61/app/controllers/application_controller.rb

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/spec/stub/rails61/app/helpers/application_helper.rb

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/spec/stub/rails61/config/application.rb

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/spec/stub/rails61/config/boot.rb

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/spec/stub/rails61/config/credentials.yml.enc

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad © 2024 Your Company Name. All rights reserved.





Check this box to remove all script contents from the fetched content.



Check this box to remove all images from the fetched content.


Check this box to remove all CSS styles from the fetched content.


Check this box to keep images inefficiently compressed and original size.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy