Skip to content

Commit 5d09c25

Browse files
committed
[chore] cherry-pick 1.2.x changelog/README with backported JRuby 10.0 compatibility
1 parent fe239d1 commit 5d09c25

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

CHANGELOG.md

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

33
- Officially support Javax Servlet API 4.0 (JEE 8)
4-
- Officially support JRuby 10.0
54

65
Breaking compatibility changes
76
- Drop support for JRuby 9.3
@@ -33,6 +32,7 @@ Breaking configuration capability changes
3332

3433
## 1.2.7 (UNRELEASED)
3534

35+
- Fix compatibility with JRuby 10.0 and Rails 8.0 (#419)
3636
- Fix ability to include and forward to JSPs under Rails (#370)
3737
- Update (bundled) rack to 2.2.23 (#417)
3838

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ For more information on Rack, visit http://rack.github.io/.
1717
|----------------------------------------------------------------|---------------|-----------|------------|------|-----------|---------------------|----------------------------------------------------------------|
1818
| **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 |
1919
| **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 |
20+
| [**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) | |
2323

0 commit comments

Comments
 (0)