Skip to content

Commit 2055520

Browse files
committed
Tidy compatibility table in README
(cherry picked from commit 5e25eb1)
1 parent bbfd388 commit 2055520

File tree

1 file changed

+7
-15
lines changed

1 file changed

+7
-15
lines changed

README.md

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
[![Gem Version](https://badge.fury.io/rb/jruby-rack.png)][8]
2+
[![Build Status](https://github.com/jruby/jruby-rack/actions/workflows/maven.yml/badge.svg)][9]
3+
14
# JRuby-Rack
25

36
JRuby-Rack is a lightweight adapter for the Java Servlet environment that allows
@@ -6,23 +9,12 @@ JRuby-Rack supports Rails as well as any Rack-compatible Ruby web framework.
69

710
For more information on Rack, visit http://rack.github.io/.
811

9-
**This README (master) targets JRuby-Rack 1.2. Please use the
10-
[1.1-stable](https://github.com/jruby/jruby-rack/tree/1.1-stable) branch for
11-
current stable 1.1.x releases.**
12-
13-
[![Gem Version](https://badge.fury.io/rb/jruby-rack.png)][8]
14-
[![Build Status](https://github.com/jruby/jruby-rack/actions/workflows/maven.yml/badge.svg)][9]
15-
1612
## Compatibility
1713

18-
JRuby-Rack 1.2.x
19-
- aims to be compatible with JRuby >= 9.3 and its supported JDK versions
20-
- supports any container compatible with Java Servlet 3.0 API
21-
22-
JRuby-Rack 1.1.x
23-
- aims to be compatible with JRuby >= 1.6.4 (used successfully through JRuby 9.4.x)
24-
- supports any container compatible with Java Servlet 2.5 API (JEE 5)
25-
14+
| JRuby-Rack Version | Status | JRuby Compat | Java Compat | Target Servlet API | Target Java EE | Notes |
15+
|--------------------------------------------------------------|------------|----------------|-------------|--------------------|----------------|---------------------------------------------------|
16+
| [1.2.x](https://github.com/jruby/jruby-rack/tree/1.2-stable) | Maintained | 9.3 → 9.4 | Java 8+ | 3.0 | Java EE 6 | Servlet 3.1 → 4.0 tested OK with some containers. |
17+
| [1.1.x](https://github.com/jruby/jruby-rack/tree/1.1-stable) | EOL | ≥ 1.6.4 → 9.4 | Java 8+ | 2.5 | Java EE 5 | Servlet 3.0 → 4.0 tested OK with some containers. |
2618

2719
## Getting Started
2820

0 commit comments

Comments
 (0)