Skip to content

Commit 6c76aee

Browse files
chadlwilsonchadlwilson
committed
[build] Re-introduce Java 8 compatibility
1 parent cfdfc25 commit 6c76aee

35 files changed

+4441
-179
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
env:
1010
# Default versions for canonical release build
11-
DEFAULT_JAVA_VERSION: '17'
11+
DEFAULT_JAVA_VERSION: '8'
1212
DEFAULT_JRUBY_VERSION: '9.4.13.0' # Should match pom.xml <jruby.version> property (AND a version inside the test matrix)
1313

1414
jobs:
@@ -19,8 +19,12 @@ jobs:
1919
strategy:
2020
matrix:
2121
jruby_version: [ '9.4.13.0', '10.0.2.0' ]
22-
java_version: [ '17', '21' ]
22+
java_version: [ '8', '11', '17', '21' ]
2323
exclude:
24+
- jruby_version: '10.0.2.0'
25+
java_version: '8' # JRuby 10 requires Java 21
26+
- jruby_version: '10.0.2.0'
27+
java_version: '11' # JRuby 10 requires Java 21
2428
- jruby_version: '10.0.2.0'
2529
java_version: '17' # JRuby 10 requires Java 21
2630
fail-fast: false
@@ -51,11 +55,15 @@ jobs:
5155
strategy:
5256
matrix:
5357
jruby_version: [ '9.4.13.0', '10.0.2.0' ]
54-
java_version: [ '17', '21' ]
58+
java_version: [ '8', '11', '17', '21' ]
5559
appraisal: [ 'rails50', 'rails52', 'rails60', 'rails61', 'rails70', 'rails71', 'rails72', 'rails80' ]
5660
exclude:
5761
- jruby_version: '9.4.13.0'
5862
appraisal: 'rails80' # Requires Ruby 3.4 compatibility, which JRuby 9.4 does not support
63+
- jruby_version: '10.0.2.0'
64+
java_version: '8' # JRuby 10 requires Java 21
65+
- jruby_version: '10.0.2.0'
66+
java_version: '11' # JRuby 10 requires Java 21
5967
- jruby_version: '10.0.2.0'
6068
java_version: '17' # JRuby 10 requires Java 21
6169
fail-fast: false

‎Gemfile.lock‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ GEM
2424
thor (1.4.0)
2525

2626
PLATFORMS
27+
universal-java-1.8
2728
universal-java-11
2829
universal-java-17
2930
universal-java-21

‎README.md‎

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

1414
| JRuby-Rack Version | Status | JRuby Compat | Java Compat | Target Servlet API | Target Java EE | Notes |
1515
|--------------------------------------------------------------|------------|--------------|-------------|--------------------|----------------|---------------------------------------------------|
16-
| 1.4.x (_planned_) | Dev | 9.4 → 10.0 | Java 17+ | 5.0 | Jakarta EE 9 | |
17-
| 1.3.x (master, _unreleased_) | Dev | 9.4 → 10.0 | Java 11+ | 4.0 | Java EE 8 | |
16+
| 1.4.x (_planned_) | Dev | 9.4 → 10.0 | Java 8+ | 5.0 | Jakarta EE 9 | |
17+
| 1.3.x (master, _unreleased_) | Dev | 9.4 → 10.0 | Java 8+ | 4.0 | Java EE 8 | |
1818
| [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. |
1919
| [1.1.x](https://github.com/jruby/jruby-rack/tree/1.1-stable) | EOL | 1.6 → 9.4 | Java 8+ | 2.5 | Java EE 5 | Servlet 3.0 → 4.0 tested OK with some containers. |
2020

‎gemfiles/rails50.gemfile.lock‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ GEM
138138
websocket-extensions (0.1.5)
139139

140140
PLATFORMS
141+
universal-java-1.8
141142
universal-java-11
142143
universal-java-17
143144
universal-java-21

‎gemfiles/rails52.gemfile.lock‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ GEM
146146
websocket-extensions (0.1.5)
147147

148148
PLATFORMS
149+
universal-java-1.8
149150
universal-java-11
150151
universal-java-17
151152
universal-java-21

‎gemfiles/rails60.gemfile.lock‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ GEM
162162
zeitwerk (2.6.18)
163163

164164
PLATFORMS
165+
universal-java-1.8
165166
universal-java-11
166167
universal-java-17
167168
universal-java-21

‎gemfiles/rails61.gemfile.lock‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ GEM
165165
zeitwerk (2.6.18)
166166

167167
PLATFORMS
168+
universal-java-1.8
168169
universal-java-11
169170
universal-java-17
170171
universal-java-21

‎gemfiles/rails70.gemfile.lock‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ GEM
162162
zeitwerk (2.6.18)
163163

164164
PLATFORMS
165+
universal-java-1.8
165166
universal-java-11
166167
universal-java-17
167168
universal-java-21

‎gemfiles/rails71.gemfile.lock‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ GEM
207207
zeitwerk (2.6.18)
208208

209209
PLATFORMS
210+
universal-java-1.8
210211
universal-java-11
211212
universal-java-17
212213
universal-java-21

‎gemfiles/rails72.gemfile.lock‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ GEM
201201
zeitwerk (2.6.18)
202202

203203
PLATFORMS
204+
universal-java-1.8
204205
universal-java-11
205206
universal-java-17
206207
universal-java-21

0 commit comments

Comments
 (0)