Jakarta EE 9+ migration

.github/workflows/maven.yml

@@ -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:
@@ -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'
@@ -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'

Gemfile.lock

@@ -24,6 +24,7 @@ GEM
     thor (1.4.0)
 
 PLATFORMS
+  universal-java-1.8
   universal-java-11
   universal-java-17
   universal-java-21

History.md

@@ -1,6 +1,9 @@
+## 2.0.0 (UNRELEASED)
+
+- Support Jakarta Servlet API 5.0 (JEE 9)
+
 ## 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

README.md

@@ -13,8 +13,8 @@ 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      |                                                   |
+| 2.0.x (_planned_)                                            | Dev        | 9.4 → 10.0   | Java 8+     | 5.0                | Jakarta EE 9   |                                                   |
+| 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. |
 
@@ -291,7 +291,7 @@ Or the equivalent of doing `bundle exec rackup ...` if you're using Bundler :
 ## Logging
 
 JRuby-Rack sets up a delegate logger for Rails that sends logging output to
-`javax.servlet.ServletContext#log` by default. If you wish to use a different
+`jakarta.servlet.ServletContext#log` by default. If you wish to use a different
 logging system, configure `jruby.rack.logging` as follows:
 
 - `servlet_context` (default): Sends log messages to the servlet context.

gemfiles/rails50.gemfile.lock

@@ -138,6 +138,7 @@ GEM
     websocket-extensions (0.1.5)
 
 PLATFORMS
+  universal-java-1.8
   universal-java-11
   universal-java-17
   universal-java-21

gemfiles/rails52.gemfile.lock

@@ -146,6 +146,7 @@ GEM
     websocket-extensions (0.1.5)
 
 PLATFORMS
+  universal-java-1.8
   universal-java-11
   universal-java-17
   universal-java-21

gemfiles/rails60.gemfile.lock

@@ -162,6 +162,7 @@ GEM
     zeitwerk (2.6.18)
 
 PLATFORMS
+  universal-java-1.8
   universal-java-11
   universal-java-17
   universal-java-21

gemfiles/rails61.gemfile.lock

@@ -165,6 +165,7 @@ GEM
     zeitwerk (2.6.18)
 
 PLATFORMS
+  universal-java-1.8
   universal-java-11
   universal-java-17
   universal-java-21

gemfiles/rails70.gemfile.lock

@@ -162,6 +162,7 @@ GEM
     zeitwerk (2.6.18)
 
 PLATFORMS
+  universal-java-1.8
   universal-java-11
   universal-java-17
   universal-java-21

gemfiles/rails71.gemfile.lock

@@ -207,6 +207,7 @@ GEM
     zeitwerk (2.6.18)
 
 PLATFORMS
+  universal-java-1.8
   universal-java-11
   universal-java-17
   universal-java-21

gemfiles/rails72.gemfile.lock

@@ -201,6 +201,7 @@ GEM
     zeitwerk (2.6.18)
 
 PLATFORMS
+  universal-java-1.8
   universal-java-11
   universal-java-17
   universal-java-21

pom.xml

@@ -91,13 +91,13 @@
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
-      <version>4.0.4</version>
+      <version>5.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>jakarta.servlet.jsp</groupId>
       <artifactId>jakarta.servlet.jsp-api</artifactId>
-      <version>2.3.6</version>
+      <version>3.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -136,16 +136,10 @@
       <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>${spring.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>jakarta.el</groupId>
       <artifactId>jakarta.el-api</artifactId>
-      <version>3.0.3</version>
+      <version>4.0.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -201,8 +195,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>

src/main/java/org/jruby/rack/AbstractFilter.java

@@ -9,13 +9,13 @@
 
 import java.io.IOException;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.jruby.rack.servlet.RequestCapture;
 import org.jruby.rack.servlet.ResponseCapture;

src/main/java/org/jruby/rack/AbstractServlet.java

@@ -9,12 +9,12 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.jruby.rack.servlet.ServletRackEnvironment;
 import org.jruby.rack.servlet.ServletRackResponseEnvironment;

src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java

@@ -8,27 +8,27 @@
 package org.jruby.rack;
 
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Map;
-import java.util.Set;
-
 import org.jruby.Ruby;
 import org.jruby.RubyInstanceConfig;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.javasupport.JavaUtil;
-import org.jruby.rack.servlet.ServletRackContext;
 import org.jruby.rack.servlet.RewindableInputStream;
+import org.jruby.rack.servlet.ServletRackContext;
 import org.jruby.rack.util.IOHelpers;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.cli.OutputStrings;
 
-import static org.jruby.rack.RackLogger.Level.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Map;
+import java.util.Set;
+
 import static org.jruby.rack.DefaultRackConfig.isIgnoreRUBYOPT;
+import static org.jruby.rack.RackLogger.Level.*;
 
 /**
  * Default application factory creates a new application instance on each

src/main/java/org/jruby/rack/DefaultRackConfig.java

@@ -7,19 +7,16 @@
 
 package org.jruby.rack;
 
-import java.io.IOException;
-import java.io.LineNumberReader;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.io.StringReader;
+import org.jruby.rack.logging.OutputStreamLogger;
+import org.jruby.rack.logging.StandardOutLogger;
+import org.jruby.util.SafePropertyAccessor;
+
+import java.io.*;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import org.jruby.rack.logging.OutputStreamLogger;
-import org.jruby.rack.logging.StandardOutLogger;
-import org.jruby.util.SafePropertyAccessor;
 
 /**
  * A base implementation of that retrieves settings from system properties.
@@ -382,7 +379,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 );
                     }

src/main/java/org/jruby/rack/RackDispatcher.java

@@ -7,7 +7,7 @@
 
 package org.jruby.rack;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 
 /**