[2.0] 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: '17'
   DEFAULT_JRUBY_VERSION: '9.4.13.0' # Should match pom.xml <jruby.version> property (AND a version inside the test matrix)
 
 jobs:
@@ -19,10 +19,8 @@ jobs:
     strategy:
       matrix:
         jruby_version: [ '9.4.13.0', '10.0.1.0' ]
-        java_version: [ '11', '17', '21' ]
+        java_version: [ '17', '21' ]
         exclude:
-          - jruby_version: '10.0.1.0'
-            java_version: '11' # JRuby 10 requires Java 21
           - jruby_version: '10.0.1.0'
             java_version: '17' # JRuby 10 requires Java 21
       fail-fast: false
@@ -53,13 +51,11 @@ jobs:
     strategy:
       matrix:
         jruby_version: [ '9.4.13.0', '10.0.1.0' ]
-        java_version: [ '11', '17', '21' ]
+        java_version: [ '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.1.0'
-            java_version: '11' # JRuby 10 requires Java 21
           - jruby_version: '10.0.1.0'
             java_version: '17' # JRuby 10 requires Java 21
       fail-fast: false

README.md

@@ -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.

pom.xml

@@ -23,7 +23,7 @@
     <jruby.maven.plugins.version>3.0.6</jruby.maven.plugins.version>
     <gem.home>${project.build.directory}/rubygems</gem.home>
     <slf4j.version>2.0.17</slf4j.version>
-    <spring.version>5.3.39</spring.version>
+    <spring.version>6.2.9</spring.version>
   </properties>
 
   <issueManagement>
@@ -90,13 +90,13 @@
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
-      <version>4.0.4</version>
+      <version>6.1.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>jakarta.servlet.jsp</groupId>
       <artifactId>jakarta.servlet.jsp-api</artifactId>
-      <version>2.3.6</version>
+      <version>4.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -132,7 +132,7 @@
     <dependency>
       <groupId>jakarta.el</groupId>
       <artifactId>jakarta.el-api</artifactId>
-      <version>3.0.3</version>
+      <version>6.0.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -188,8 +188,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.14.0</version>
         <configuration>
-          <source>11</source>
-          <target>11</target>
+          <source>17</source>
+          <target>17</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

@@ -190,9 +190,10 @@ public IRubyObject createErrorApplicationObject(final Ruby runtime) {
 
         }
         if (errorApp == null) {
-            errorApp = "require 'jruby/rack/error_app' \n" +
-            "use JRuby::Rack::ErrorApp::ShowStatus \n" +
-            "run JRuby::Rack::ErrorApp.new";
+            errorApp = """
+                    require 'jruby/rack/error_app'
+                    use JRuby::Rack::ErrorApp::ShowStatus
+                    run JRuby::Rack::ErrorApp.new""";
         }
         runtime.evalScriptlet("load 'jruby/rack/boot/rack.rb'");
         return createRackServletWrapper(runtime, errorApp, errorAppPath);

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;
 
 /**

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

@@ -13,7 +13,7 @@
 
 /**
  * Represent a Rack environment (that will most likely by wrapping a
- * {@link javax.servlet.http.HttpServletRequest}).
+ * {@link jakarta.servlet.http.HttpServletRequest}).
  * Allows Rack applications to be loaded outside of JEE servlet environments.
  *
  * @see org.jruby.rack.servlet.ServletRackEnvironment
@@ -37,7 +37,7 @@ public interface RackEnvironment {
     // The following methods are specific to the rack environment
 
     /**
-     * @see javax.servlet.ServletRequest#getInputStream()
+     * @see jakarta.servlet.ServletRequest#getInputStream()
      * @return the input as a stream
      * @throws IOException if there's an IO exception
      */
@@ -53,107 +53,107 @@ public interface RackEnvironment {
     // The following methods are usually inherited from the servlet request
 
     /**
-     * @see javax.servlet.http.HttpServletRequest#getPathInfo()
+     * @see jakarta.servlet.http.HttpServletRequest#getPathInfo()
      * @return the request path info
      */
     String getPathInfo();
 
     /**
      * Request URI should include the query string if available.
-     * @see javax.servlet.http.HttpServletRequest#getRequestURI()
+     * @see jakarta.servlet.http.HttpServletRequest#getRequestURI()
      * @return the request URI
      */
     String getRequestURI();
 
     /**
-     * @see javax.servlet.http.HttpServletRequest#getAttributeNames()
+     * @see jakarta.servlet.http.HttpServletRequest#getAttributeNames()
      * @return an enumeration of all attribute names
      */
     Enumeration<String> getAttributeNames();
 
     /**
-     * @see javax.servlet.http.HttpServletRequest#getAttribute(String)
+     * @see jakarta.servlet.http.HttpServletRequest#getAttribute(String)
      * @param key the attribute key
      * @return the attribute value
      */
     Object getAttribute(String key);
 
     /**
-     * @see javax.servlet.http.HttpServletRequest#setAttribute(String, Object)
+     * @see jakarta.servlet.http.HttpServletRequest#setAttribute(String, Object)
      * @param key the key
      * @param value the value
      */
     void setAttribute(String key, Object value);
 
     /**
-     * @see javax.servlet.http.HttpServletRequest#getHeaderNames()
+     * @see jakarta.servlet.http.HttpServletRequest#getHeaderNames()
      * @return an enumeration of all header names
      */
     Enumeration<String> getHeaderNames();
 
     /**
-     * @see javax.servlet.http.HttpServletRequest#getHeader(String)
+     * @see jakarta.servlet.http.HttpServletRequest#getHeader(String)
      * @param name the header name
      * @return the header value
      */
     String getHeader(String name);
 
     /**
-     * @see javax.servlet.http.HttpServletRequest#getScheme()
+     * @see jakarta.servlet.http.HttpServletRequest#getScheme()
      * @return the request scheme
      */
     String getScheme();
 
     /**
-     * @see javax.servlet.http.HttpServletRequest#getContentType()
+     * @see jakarta.servlet.http.HttpServletRequest#getContentType()
      * @return the content type
      */
     String getContentType();
 
     /**
-     * @see javax.servlet.http.HttpServletRequest#getContentLength()
+     * @see jakarta.servlet.http.HttpServletRequest#getContentLength()
      * @return the content length
      */
     int getContentLength();
 
     /**
-     * @see javax.servlet.http.HttpServletRequest#getMethod()
+     * @see jakarta.servlet.http.HttpServletRequest#getMethod()
      * @return the request method
      */
     String getMethod();
 
     /**
-     * @see javax.servlet.http.HttpServletRequest#getQueryString()
+     * @see jakarta.servlet.http.HttpServletRequest#getQueryString()
      * @return the query string
      */
     String getQueryString();
 
     /**
-     * @see javax.servlet.http.HttpServletRequest#getServerName()
+     * @see jakarta.servlet.http.HttpServletRequest#getServerName()
      * @return the server name
      */
     String getServerName();
 
     /**
-     * @see javax.servlet.http.HttpServletRequest#getServerPort()
+     * @see jakarta.servlet.http.HttpServletRequest#getServerPort()
      * @return the server port
      */
     int getServerPort();
 
     /**
-     * @see javax.servlet.ServletRequest#getRemoteHost()
+     * @see jakarta.servlet.ServletRequest#getRemoteHost()
      * @return the remote host
      */
     String getRemoteHost();
 
     /**
-     * @see javax.servlet.ServletRequest#getRemoteAddr()
+     * @see jakarta.servlet.ServletRequest#getRemoteAddr()
      * @return the remote address
      */
     String getRemoteAddr();
 
     /**
-     * @see javax.servlet.http.HttpServletRequest#getRemoteUser()
+     * @see jakarta.servlet.http.HttpServletRequest#getRemoteUser()
      * @return the remote user
      */
     String getRemoteUser();

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

@@ -9,12 +9,12 @@
 
 import java.io.IOException;
 import java.net.MalformedURLException;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 
 import org.jruby.rack.servlet.RequestCapture;
 import org.jruby.rack.servlet.ResponseCapture;

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

@@ -16,8 +16,8 @@
  * handle and return the Rack response) interface.
  * It is likely to be (only) implemented as a HTTP servlet response.
  *
- * @see javax.servlet.ServletResponse
- * @see javax.servlet.http.HttpServletResponse
+ * @see jakarta.servlet.ServletResponse
+ * @see jakarta.servlet.http.HttpServletResponse
  * @see RackResponse
  *
  * @author nicksieger
@@ -26,30 +26,30 @@ public interface RackResponseEnvironment {
 
     /**
      * @return whether the underlying response has been committed.
-     * @see javax.servlet.ServletResponse#isCommitted()
+     * @see jakarta.servlet.ServletResponse#isCommitted()
      */
     boolean isCommitted();
 
     /**
      * Reset the response (buffer) so we can begin a new response.
-     * @see javax.servlet.ServletResponse#reset()
+     * @see jakarta.servlet.ServletResponse#reset()
      */
     void reset();
 
     /**
-     * @see javax.servlet.ServletResponse#setContentType(String)
+     * @see jakarta.servlet.ServletResponse#setContentType(String)
      * @param type the content type
      */
     void setContentType(String type) ;
 
     /**
-     * @see javax.servlet.ServletResponse#setContentLength(int)
+     * @see jakarta.servlet.ServletResponse#setContentLength(int)
      * @param length the content length
      */
     void setContentLength(int length) ;
 
     /**
-     * @see javax.servlet.ServletResponse#setCharacterEncoding(String)
+     * @see jakarta.servlet.ServletResponse#setCharacterEncoding(String)
      * @param charset the charset
      */
     void setCharacterEncoding(String charset) ;
@@ -107,14 +107,14 @@ public interface RackResponseEnvironment {
     void sendError(int code) throws IOException ;
 
     /**
-     * @see javax.servlet.ServletResponse#getOutputStream()
+     * @see jakarta.servlet.ServletResponse#getOutputStream()
      * @return the output stream
      * @throws IOException if there's an IO exception
      */
     OutputStream getOutputStream() throws IOException ;
 
     /**
-     * @see javax.servlet.ServletResponse#getWriter()
+     * @see jakarta.servlet.ServletResponse#getWriter()
      * @return the writer
      * @throws IOException if there's an IO exception
      */

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

@@ -7,7 +7,7 @@
 
 package org.jruby.rack;
 
-import javax.servlet.ServletConfig;
+import jakarta.servlet.ServletConfig;
 
 @SuppressWarnings("serial")
 public class RackServlet extends AbstractServlet {