Skip to content

Commit d48672d

Browse files
chadlwilsonchadlwilson
committed
Drop support for JRuby 9.3; increasing Java minimum to 11
1 parent 7e82c73 commit d48672d

12 files changed

+17
-26
lines changed

‎.github/workflows/maven.yml

Lines changed: 6 additions & 16 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: '8'
11+
DEFAULT_JAVA_VERSION: '11'
1212
DEFAULT_JRUBY_VERSION: '9.4.12.1' # Should match pom.xml <jruby.version> property (AND a version inside the test matrix)
1313

1414
jobs:
@@ -18,11 +18,9 @@ jobs:
1818

1919
strategy:
2020
matrix:
21-
jruby_version: [ '9.3.15.0', '9.4.12.1' ] # , '10.0.0.1'
22-
java_version: [ '8', '11', '17', '21' ]
21+
jruby_version: [ '9.4.12.1' ] # , '10.0.0.1'
22+
java_version: [ '11', '17', '21' ]
2323
exclude:
24-
- jruby_version: '10.0.0.1'
25-
java_version: '8' # JRuby 10 requires Java 21
2624
- jruby_version: '10.0.0.1'
2725
java_version: '11' # JRuby 10 requires Java 21
2826
- jruby_version: '10.0.0.1'
@@ -54,18 +52,10 @@ jobs:
5452

5553
strategy:
5654
matrix:
57-
jruby_version: [ '9.3.15.0', '9.4.12.1' ] # , '10.0.0.1'
58-
java_version: [ '8', '11', '17', '21' ]
55+
jruby_version: [ '9.4.12.1' ] # , '10.0.0.1'
56+
java_version: [ '11', '17', '21' ]
5957
appraisal: [ 'rails50', 'rails52', 'rails60', 'rails61', 'rails70', 'rails71', 'rails72' ]
6058
exclude:
61-
- jruby_version: '9.3.15.0'
62-
appraisal: 'rails70' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
63-
- jruby_version: '9.3.15.0'
64-
appraisal: 'rails71' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
65-
- jruby_version: '9.3.15.0'
66-
appraisal: 'rails72' # Requires Ruby 3.1 compatibility, which JRuby 9.3 does not support
67-
- jruby_version: '10.0.0.1'
68-
java_version: '8' # JRuby 10 requires Java 21
6959
- jruby_version: '10.0.0.1'
7060
java_version: '11' # JRuby 10 requires Java 21
7161
- jruby_version: '10.0.0.1'
@@ -91,7 +81,7 @@ jobs:
9181
with:
9282
ruby-version: jruby-${{ matrix.jruby_version }}
9383
bundler-cache: 'false' # Need to install later so we can vary from Gemfile.lock as required for JRuby version compatibility
94-
bundler: ${{ startsWith(matrix.jruby_version, '9.3') && '2.3.27' || 'Gemfile.lock' }}
84+
bundler: 'Gemfile.lock'
9585

9686
- name: Run appraisal for ${{ matrix.appraisal }}
9787
run: bundle install && bundle exec rake spec

‎Gemfile.lock

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

2626
PLATFORMS
27-
universal-java-1.8
2827
universal-java-11
2928
universal-java-17
3029
universal-java-21

‎History.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
## 1.2.4 (UNRELEASED)
22

3+
- Drop support for JRuby 9.3
4+
- Require Java 11 or later
5+
6+
## 1.2.4 (UNRELEASED)
7+
38
- update (bundled) rack to 2.2.16
49

510
## 1.2.3

‎README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ current stable 1.1.x releases.**
1515

1616
## Compatibility
1717

18+
JRuby-Rack 1.3.x
19+
- aims to be compatible with JRuby >= 9.4 and Java 11+
20+
- supports any container compatible with Java Servlet 4.0 API
21+
1822
JRuby-Rack 1.2.x
1923
- aims to be compatible with JRuby >= 9.3 and its supported JDK versions
2024
- supports any container compatible with Java Servlet 3.0 API

‎gemfiles/rails50.gemfile.lock

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

140140
PLATFORMS
141-
universal-java-1.8
142141
universal-java-11
143142
universal-java-17
144143
universal-java-21

‎gemfiles/rails52.gemfile.lock

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

148148
PLATFORMS
149-
universal-java-1.8
150149
universal-java-11
151150
universal-java-17
152151
universal-java-21

‎gemfiles/rails60.gemfile.lock

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

164164
PLATFORMS
165-
universal-java-1.8
166165
universal-java-11
167166
universal-java-17
168167
universal-java-21

‎gemfiles/rails61.gemfile.lock

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

167167
PLATFORMS
168-
universal-java-1.8
169168
universal-java-11
170169
universal-java-17
171170
universal-java-21

‎gemfiles/rails70.gemfile.lock

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

164164
PLATFORMS
165-
universal-java-1.8
166165
universal-java-11
167166
universal-java-17
168167
universal-java-21

‎gemfiles/rails71.gemfile.lock

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ GEM
203203
zeitwerk (2.7.2)
204204

205205
PLATFORMS
206-
universal-java-1.8
207206
universal-java-11
208207
universal-java-17
209208
universal-java-21

‎gemfiles/rails72.gemfile.lock

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ GEM
197197
zeitwerk (2.7.2)
198198

199199
PLATFORMS
200-
universal-java-1.8
201200
universal-java-11
202201
universal-java-17
203202
universal-java-21

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@
205205
<artifactId>maven-compiler-plugin</artifactId>
206206
<version>3.14.0</version>
207207
<configuration>
208-
<source>8</source>
209-
<target>8</target>
208+
<source>11</source>
209+
<target>11</target>
210210
<showDeprecation>true</showDeprecation>
211211
<showWarnings>true</showWarnings>
212212
</configuration>

0 commit comments

Comments
 (0)