feat: Jakarta EE 9+ migration

.github/dependabot.yml

@@ -43,6 +43,56 @@ updates:
         update-types: [ "version-update:semver-major" ]
 
   # Maintained stable branches
+  - package-ecosystem: github-actions
+    target-branch: "1.3-stable"
+    commit-message:
+      prefix: "1.3.x: "
+    directory: "/"
+    schedule:
+      interval: weekly
+    groups:
+      actions-deps:
+        patterns: [ "*" ]
+
+  - package-ecosystem: maven
+    target-branch: "1.3-stable"
+    commit-message:
+      prefix: "1.3.x: "
+    directory: "/"
+    schedule:
+      interval: weekly
+    groups:
+      maven-deps:
+        dependency-type: "production"
+      maven-dev-deps:
+        dependency-type: "development"
+    ignore:
+      - dependency-name: "org.jruby*"
+        update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
+      - dependency-name: "jakarta*"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "javax*"
+        update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
+      - dependency-name: "org.springframework*"
+        update-types: [ "version-update:semver-major" ]
+
+  - package-ecosystem: bundler
+    target-branch: "1.3-stable"
+    commit-message:
+      prefix: "1.3.x: "
+    directories:
+      - "/"
+    schedule:
+      interval: weekly
+    allow:
+      - dependency-type: all
+    groups:
+      ruby-deps:
+        patterns: [ "*" ]
+    ignore:
+      - dependency-name: "rack"
+        update-types: [ "version-update:semver-major" ]
+
   - package-ecosystem: github-actions
     target-branch: "1.2-stable"
     commit-message:

CHANGELOG.md

@@ -1,7 +1,11 @@
-## 1.3.0 (UNRELEASED) 
+## 2.0.0 (UNRELEASED)
+
+- Support Jakarta Servlet API 5.0 → 6.1 (Jakarta EE 9 → 11)
+
+## 1.3.0 (UNRELEASED)
 
 - Officially support Javax Servlet API 4.0 (JEE 8)
-- Refactor logging for more sane defaults
+- Refactor logging for more sane defaults and improved performance
 - Remove long-deprecated configuration and API functionality
 
 For most users this should be a minor upgrade; as long as you do not depend on functionality deprecated within

README.md

@@ -3,6 +3,7 @@
 [![Gem Version](https://img.shields.io/gem/v/jruby-rack)](https://rubygems.org/gems/jruby-rack)
 [![Jar Version](https://img.shields.io/maven-central/v/org.jruby.rack/jruby-rack)](https://central.sonatype.com/artifact/org.jruby.rack/jruby-rack)
 [![master Build Status](https://github.com/jruby/jruby-rack/actions/workflows/maven.yml/badge.svg)](https://github.com/jruby/jruby-rack/actions/workflows/maven.yml?query=branch%3Amaster) (master)
+[![1.3.x Build Status](https://github.com/jruby/jruby-rack/actions/workflows/maven.yml/badge.svg?branch=1.3-stable)](https://github.com/jruby/jruby-rack/actions/workflows/maven.yml?query=branch%3A1.3-stable) (1.3.x)
 [![1.2.x Build Status](https://github.com/jruby/jruby-rack/actions/workflows/maven.yml/badge.svg?branch=1.2-stable)](https://github.com/jruby/jruby-rack/actions/workflows/maven.yml?query=branch%3A1.2-stable) (1.2.x)
 
 JRuby-Rack is a lightweight adapter for the Java Servlet environment that allows
@@ -13,13 +14,13 @@ For more information on Rack, visit http://rack.github.io/.
 
 ## Compatibility
 
-| JRuby-Rack Series                                              | Status        | Rack      | JRuby       | Java | Rails     | Target Servlet API  | Notes                                                                |
-|----------------------------------------------------------------|---------------|-----------|-------------|------|-----------|---------------------|----------------------------------------------------------------------|
-| **2.0 (_planned_, _unreleased_)**                              | Dev           | 2.2       | 10.0 → 10.1 | 21+  | 7.2 → 8.0 | 5.0+ (Jakarta EE 9) | ❌ Servlet < 5.0 containers will not work                            |
-| **1.3 (master, _unreleased_)**                                 | Dev           | 2.2       | 10.0 → 10.1 | 21+  | 7.2 → 8.0 | 4.0 (Java EE 8)     | ✅ _Unofficial_: Servlet 2.5 → 3.1 & Rails 6.1 → 7.1 also likely OK. |
-| [**1.2**](https://github.com/jruby/jruby-rack/tree/1.2-stable) | Maintained    | 2.2       | 9.3 → 10.1  | 8+   | 5.0 → 8.0 | 3.0 (Java EE 6)     | ✅ _Unofficial_: Servlet 3.1 → 4.0 also OK with most containers      |
-| [**1.1**](https://github.com/jruby/jruby-rack/tree/1.1-stable) | EOL @ 2024-05 | 1.x → 2.2 | 1.6 → 9.4   | 6+   | 2.1 → 5.2 | 2.5 (Java EE 5)     | ✅ _Unofficial_: Servlet 3.0 → 4.0 also OK with most containers      |
-| [**1.0**](https://github.com/jruby/jruby-rack/tree/1.0.10)     | EOL @ 2011-11 | 0.9 → 1.x | 1.1 → 1.9   | 5+   | 2.1 → 3.x | 2.5 (Java EE 5)     |                                                                      |
+| JRuby-Rack Series                                                                        | Status        | Rack      | JRuby       | Java | Rails     | Servlet API (min → mostly supported) | Notes                                                     |
+|------------------------------------------------------------------------------------------|---------------|-----------|-------------|------|-----------|--------------------------------------|-----------------------------------------------------------|
+| **2.0 (_master_, _unreleased_)**                                                         | Dev           | 2.2       | 10.0 → 10.1 | 21+  | 7.2 → 8.0 | 5.0 → 6.1 (Jakarta EE 9 → 11)        | ❌ Servlet < 5.0 containers will not work                 |
+| [**1.3**](https://github.com/jruby/jruby-rack/tree/1.3-stable) (_planned_, _unreleased_) | Dev           | 2.2       | 10.0 → 10.1 | 21+  | 7.2 → 8.0 | 4.0 (Java EE 8)                      | ✅ _Unofficial_: Rails 6.1 → 7.1 untested, but likely OK. |
+| [**1.2**](https://github.com/jruby/jruby-rack/tree/1.2-stable)                           | Maintained    | 2.2       | 9.3 → 10.1  | 8+   | 5.0 → 8.0 | 3.0 → 4.0 (Java EE 6 → 7)            |                                                           |
+| [**1.1**](https://github.com/jruby/jruby-rack/tree/1.1-stable)                           | EOL @ 2024-05 | 1.x → 2.2 | 1.6 → 9.4   | 6+   | 2.1 → 5.2 | 2.5 → 4.0 (Java EE 5 → 7)            |                                                           |
+| [**1.0**](https://github.com/jruby/jruby-rack/tree/1.0.10)                               | EOL @ 2011-11 | 0.9 → 1.x | 1.1 → 1.9   | 5+   | 2.1 → 3.x | 2.5 (Java EE 5)                      |                                                           |
 
 ## Getting Started
 
@@ -275,7 +276,7 @@ or available on the application's gem path.
 ## 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.

pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>org.jruby.rack</groupId>
   <artifactId>jruby-rack</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>JRuby-Rack</name>
   <url>https://github.com/jruby/jruby-rack/</url>
   <description>
@@ -19,19 +19,28 @@
   </description>
 
   <properties>
+    <!-- Build related settings -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <jruby.maven.plugins.version>3.0.6</jruby.maven.plugins.version>
+    <gem.home>${project.build.directory}/rubygems</gem.home>
 
     <!-- Version to target at compile time -->
     <jruby.compat.version>10.0.6.0</jruby.compat.version>
     <jruby.compat.artifact>jruby</jruby.compat.artifact>
     <!-- Version to execute tests with -->
     <jruby.test.version>${jruby.compat.version}</jruby.test.version>
 
-    <jruby.maven.plugins.version>3.0.6</jruby.maven.plugins.version>
-    <gem.home>${project.build.directory}/rubygems</gem.home>
+    <!-- Minimum servlet API compatibility to target (Jakarta EE 9) -->
+    <servlet-api.compat.version>5.0.0</servlet-api.compat.version>
+    <servlet-jsp-api.compat.version>3.0.0</servlet-jsp-api.compat.version>
+
+    <!-- Test Dependencies -->
+    <servlet-api.test.version>6.1.0</servlet-api.test.version>
+    <el-api.test.version>6.0.1</el-api.test.version>
+    <spring.version>6.2.19</spring.version>
+
     <slf4j.version>2.0.18</slf4j.version>
     <log4j.version>2.26.1</log4j.version>
-    <spring.version>5.3.39</spring.version>
   </properties>
 
   <issueManagement>
@@ -91,13 +100,13 @@
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
-      <version>4.0.4</version>
+      <version>${servlet-api.compat.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>jakarta.servlet.jsp</groupId>
       <artifactId>jakarta.servlet.jsp-api</artifactId>
-      <version>2.3.6</version>
+      <version>${servlet-jsp-api.compat.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -132,20 +141,20 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
+      <artifactId>spring-test</artifactId>
       <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
+      <artifactId>spring-web</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>${el-api.test.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -230,6 +239,26 @@
             <configuration>
               <outputDirectory>${project.build.directory}/lib</outputDirectory>
               <excludeGroupIds>org.jruby,rubygems</excludeGroupIds>
+              <!-- compile floor stays off the test classpath; test version copied below -->
+              <excludeArtifactIds>jakarta.servlet-api</excludeArtifactIds>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test-servlet-api</id>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <!-- Use later version of API for testing than we compile against -->
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>jakarta.servlet</groupId>
+                  <artifactId>jakarta.servlet-api</artifactId>
+                  <version>${servlet-api.test.version}</version>
+                </artifactItem>
+              </artifactItems>
+              <outputDirectory>${project.build.directory}/lib</outputDirectory>
             </configuration>
           </execution>
         </executions>
@@ -273,6 +302,9 @@
             <configuration>
               <!--suppress UnresolvedMavenProperty -->
               <args>-S rake speconly SKIP_SPECS=${skipTests}</args>
+              <!-- keep the maven-resolved (compile floor) servlet-api off the spec JVM classpath;
+                   spec_helper.rb builds the classpath from target/lib (see copy-test-servlet-api) -->
+              <addProjectClasspath>false</addProjectClasspath>
             </configuration>
           </execution>
         </executions>

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

@@ -8,14 +8,14 @@
 package org.jruby.rack;
 
 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;
 import org.jruby.rack.servlet.ServletRackEnvironment;

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

@@ -8,13 +8,13 @@
 package org.jruby.rack;
 
 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/RackDispatcher.java

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