Skip to content

[build] Re-introduce Java 8 compatibility for 1.3.x #315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 12, 2025
Merged

[build] Re-introduce Java 8 compatibility for 1.3.x #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

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

jobs:
Expand All @@ -19,8 +19,10 @@ jobs:
strategy:
matrix:
jruby_version: [ '9.4.13.0', '10.0.2.0' ]
java_version: [ '11', '17', '21' ]
java_version: [ '8', '11', '17', '21' ]
exclude:
- jruby_version: '10.0.2.0'
java_version: '8' # JRuby 10 requires Java 21
- jruby_version: '10.0.2.0'
java_version: '11' # JRuby 10 requires Java 21
- jruby_version: '10.0.2.0'
Expand Down Expand Up @@ -53,11 +55,13 @@ jobs:
strategy:
matrix:
jruby_version: [ '9.4.13.0', '10.0.2.0' ]
java_version: [ '11', '17', '21' ]
java_version: [ '8', '11', '17', '21' ]
appraisal: [ 'rails50', 'rails52', 'rails60', 'rails61', 'rails70', 'rails71', 'rails72', 'rails80' ]
exclude:
- jruby_version: '9.4.13.0'
appraisal: 'rails80' # Requires Ruby 3.4 compatibility, which JRuby 9.4 does not support
- jruby_version: '10.0.2.0'
java_version: '8' # JRuby 10 requires Java 21
- jruby_version: '10.0.2.0'
java_version: '11' # JRuby 10 requires Java 21
- jruby_version: '10.0.2.0'
Expand Down
1 change: 1 addition & 0 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ GEM
thor (1.4.0)

PLATFORMS
universal-java-1.8
universal-java-11
universal-java-17
universal-java-21
Expand Down
1 change: 0 additions & 1 deletion History.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
## 1.3.0 (UNRELEASED)

- Require Java 11 or later
- Support Javax Servlet API 4.0 (JEE 8)
- Adds basic compatibility with JRuby 10.0
- Drop support for JRuby 9.3
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ For more information on Rack, visit http://rack.github.io/.
| JRuby-Rack Version | Status | JRuby Compat | Java Compat | Target Servlet API | Target Java EE | Notes |
|--------------------------------------------------------------|------------|--------------|-------------|--------------------|----------------|---------------------------------------------------|
| 2.0.x (_planned_) | Dev | 9.4 → 10.0 | Java 17+ | 5.0 | Jakarta EE 9 | |
| 1.3.x (master, _unreleased_) | Dev | 9.4 → 10.0 | Java 11+ | 4.0 | Java EE 8 | |
| 1.3.x (master, _unreleased_) | Dev | 9.4 → 10.0 | Java 8+ | 4.0 | Java EE 8 | |
| [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. |
| [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. |

Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails50.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ GEM
websocket-extensions (0.1.5)

PLATFORMS
universal-java-1.8
universal-java-11
universal-java-17
universal-java-21
Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails52.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ GEM
websocket-extensions (0.1.5)

PLATFORMS
universal-java-1.8
universal-java-11
universal-java-17
universal-java-21
Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails60.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ GEM
zeitwerk (2.6.18)

PLATFORMS
universal-java-1.8
universal-java-11
universal-java-17
universal-java-21
Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails61.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ GEM
zeitwerk (2.6.18)

PLATFORMS
universal-java-1.8
universal-java-11
universal-java-17
universal-java-21
Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails70.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ GEM
zeitwerk (2.6.18)

PLATFORMS
universal-java-1.8
universal-java-11
universal-java-17
universal-java-21
Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails71.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ GEM
zeitwerk (2.6.18)

PLATFORMS
universal-java-1.8
universal-java-11
universal-java-17
universal-java-21
Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails72.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ GEM
zeitwerk (2.6.18)

PLATFORMS
universal-java-1.8
universal-java-11
universal-java-17
universal-java-21
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<configuration>
<source>11</source>
<target>11</target>
<source>8</source>
<target>8</target>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jruby/rack/DefaultRackConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ private Map<String, String> toStringMap(final String env) {
for ( final String entry : entries ) {
String[] pair = entry.split("=", 2);
if ( pair.length == 1 ) { // no = separator
if ( entry.isBlank() ) continue;
if ( entry.trim().isEmpty() ) continue;
if ( lastKey == null ) continue; // missing key
map.put( lastKey, lastVal = lastVal + ',' + entry );
}
Expand Down
22 changes: 14 additions & 8 deletions src/main/java/org/jruby/rack/UnmappedRackFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,24 @@ public class UnmappedRackFilter extends AbstractFilter {

private boolean responseHandledByDefault = true;

private static final Collection<Integer> RESPONSE_NOT_HANDLED_STATUSES = Set.of(
404,
403, // 403 due to containers not supporting PUT/DELETE correctly (Tomcat 6)
405, // 405 returned by Jetty 7/8 on PUT/DELETE requests by default
501 // 501 is returned for non standard http verbs like PATCH
);
private static final Collection<Integer> RESPONSE_NOT_HANDLED_STATUSES;
static {
final Set<Integer> statuses = new HashSet<>(8, 1);
statuses.add(404);
// 403 due containers not supporting PUT/DELETE correctly (Tomcat 6)
statuses.add(403);
// 405 returned by Jetty 7/8 on PUT/DELETE requests by default
statuses.add(405);
// 501 is returned for non standard http verbs like PATCH
statuses.add(501);
RESPONSE_NOT_HANDLED_STATUSES = Collections.unmodifiableSet(statuses);
}

private Collection<Integer> responseNotHandledStatuses = RESPONSE_NOT_HANDLED_STATUSES;
private RackContext context;
private RackDispatcher dispatcher;

public UnmappedRackFilter() { /** constructor used by container */ }
public UnmappedRackFilter() { /* constructor used by container */ }

/**
* Dependency-injected constructor for testing
Expand Down Expand Up @@ -85,7 +91,7 @@ public void init(FilterConfig config) throws ServletException {
map(String::trim)
.filter(status -> !status.isEmpty())
.map(Integer::parseInt)
.collect(Collectors.toUnmodifiableSet());
.collect(Collectors.toSet());
}
// ResponseCapture.handledByDefault true/false (true by default)
value = config.getInitParameter("responseHandledByDefault");
Expand Down
42 changes: 22 additions & 20 deletions src/main/java/org/jruby/rack/servlet/RequestCapture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
Expand Down Expand Up @@ -79,7 +79,7 @@ public Map<String, String[]> getParameterMap() {
@Override
public Enumeration<String> getParameterNames() {
if ( requestParametersParsed() ) {
return new Enumeration<>() {
return new Enumeration<String>() {
final Iterator<String> keys = requestParams.keySet().iterator();
public boolean hasMoreElements() {
return keys.hasNext();
Expand Down Expand Up @@ -121,25 +121,27 @@ private boolean parseRequestParams() {
final Map<String,String[]> params = new HashMap<>();
final String[] pairs = line.split("\\&");
for (String pair : pairs) {
String[] fields = pair.split("=", 2);
String key = URLDecoder.decode(fields[0], StandardCharsets.UTF_8);
String value = null;
if (fields.length == 2) {
value = URLDecoder.decode(fields[1], StandardCharsets.UTF_8);
}
if (value != null) {
String[] newValues;
if (params.containsKey(key)) {
String[] values = params.get(key);
newValues = new String[values.length + 1];
System.arraycopy(values, 0, newValues, 0, values.length);
newValues[values.length] = value;
} else {
newValues = new String[1];
newValues[0] = value;
try {
String[] fields = pair.split("=", 2);
String key = URLDecoder.decode(fields[0], "UTF-8");
String value = null;
if (fields.length == 2) {
value = URLDecoder.decode(fields[1], "UTF-8");
}
params.put(key, newValues);
}
if (value != null) {
String[] newValues;
if (params.containsKey(key)) {
String[] values = params.get(key);
newValues = new String[values.length + 1];
System.arraycopy(values, 0, newValues, 0, values.length);
newValues[values.length] = value;
} else {
newValues = new String[1];
newValues[0] = value;
}
params.put(key, newValues);
}
} catch (UnsupportedEncodingException ignore) { /* UTF-8 should be fine */ }
}

this.requestParams = params;
Expand Down