Merge remote-tracking branch 'upstream/master' into jakarta-update

Author: chadlwilson

.github/workflows/maven.yml

@@ -19,23 +19,23 @@ jobs:
 
     strategy:
       matrix:
-        jruby_version: [ '9.4.14.0', '10.0.2.0' ]
+        jruby_version: [ '9.4.14.0', '10.0.3.0' ]
         java_version: [ '8', '11', '17', '21', '25' ]
         rack_version: [ '~> 2.2.0' ]
         exclude:
-          - jruby_version: '10.0.2.0'
+          - jruby_version: '10.0.3.0'
             java_version: '8'  # JRuby 10 requires Java 21
-          - jruby_version: '10.0.2.0'
+          - jruby_version: '10.0.3.0'
             java_version: '11' # JRuby 10 requires Java 21
-          - jruby_version: '10.0.2.0'
+          - jruby_version: '10.0.3.0'
             java_version: '17' # JRuby 10 requires Java 21
       fail-fast: false
 
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
     - name: Set up JDK
-      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+      uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'temurin'
@@ -59,20 +59,19 @@ jobs:
     strategy:
       matrix:
         appraisal: [
-          'rails61_rack22',
           'rails70_rack22',
           'rails71_rack22',
           'rails72_rack22',
           'rails80_rack22',
         ]
-        jruby_version: [ '9.4.14.0', '10.0.2.0' ]
+        jruby_version: [ '9.4.14.0', '10.0.3.0' ]
         java_version: [ '8', '11', '17', '21', '25' ]
         exclude:
-          - jruby_version: '10.0.2.0'
+          - jruby_version: '10.0.3.0'
             java_version: '8'  # JRuby 10 requires Java 21
-          - jruby_version: '10.0.2.0'
+          - jruby_version: '10.0.3.0'
             java_version: '11' # JRuby 10 requires Java 21
-          - jruby_version: '10.0.2.0'
+          - jruby_version: '10.0.3.0'
             java_version: '17' # JRuby 10 requires Java 21
           - appraisal: 'rails80_rack22'
             jruby_version: '9.4.14.0' # Rails 8 requires Ruby 3.4 compatibility, which JRuby 9.4 does not support
@@ -83,10 +82,10 @@ jobs:
       JRUBY_VERSION: ${{ matrix.jruby_version }}
 
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Set up JDK
-        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           java-version: ${{ matrix.java_version }}
           distribution: 'temurin'

Appraisals

@@ -3,7 +3,6 @@ version_spec = ->(prefix, desc) { "~> #{desc.split(prefix).last.insert(1, ".")}.
 # Rails version -> rack versions in format
 # rails#{MAJOR}#{MINOR} => %w[ rack#{MAJOR}#{MINOR} ]
 {
-    "rails61" => %w[rack22],
     "rails70" => %w[rack22],
     "rails71" => %w[rack22],
     "rails72" => %w[rack22],

CHANGELOG.md

@@ -9,7 +9,7 @@
 
 Breaking compatibility changes
 - Drop support for JRuby 9.3
-- Drop support for Rails < 6.1
+- Drop support for Rails < 7.0
 
 Breaking behavioral changes
 - Change context listener to throw by default in case of an exception during initialization

Gemfile.lock

@@ -20,8 +20,8 @@ GEM
     rspec-mocks (3.13.7)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.6)
-    thor (1.4.0)
+    rspec-support (3.13.7)
+    thor (1.5.0)
 
 PLATFORMS
   universal-java-1.8

README.md

@@ -13,13 +13,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_)                                            | Dev        | 2.2       | 9.4 → 10.0 | 8+   | 6.1 → 8.0 | 5.0+ (Jakarta EE 9) | Pre 5.0 servlet APIs non functional.       |
-| 1.3 (master, _unreleased_)                                 | Dev        | 2.2       | 9.4 → 10.0 | 8+   | 6.1 → 8.0 | 4.0 (Java EE 8)     | Servlet 2.5 → 3.1 likely to work fine.     |
-| [1.2](https://github.com/jruby/jruby-rack/tree/1.2-stable) | Maintained | 2.2       | 9.3 → 9.4  | 8+   | 5.0 → 7.2 | 3.0 (Java EE 6)     | Servlet 3.1 → 4.0 OK with some containers. |
-| [1.1](https://github.com/jruby/jruby-rack/tree/1.1-stable) | EOL        | 1.x → 2.2 | 1.6 → 9.4  | 6+   | 2.1 → 5.2 | 2.5 (Java EE 5)     | Servlet 3.0 → 4.0 OK with some containers. |
-| 1.0                                                        | EOL        | 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     | Target Servlet API  | Notes                                                          |
+|----------------------------------------------------------------|---------------|-----------|------------|------|-----------|---------------------|----------------------------------------------------------------|
+| **2.0 (_planned_, _unreleased_)**                              | Dev           | 2.2       | 9.4 → 10.0 | 8+   | 7.0 → 8.0 | 5.0+ (Jakarta EE 9) | ❌ Servlet < 5.0 containers will not work                       |
+| **1.3 (master, _unreleased_)**                                 | Dev           | 2.2       | 9.4 → 10.0 | 8+   | 7.0 → 8.0 | 4.0 (Java EE 8)     | ✅ _Unofficial_: Servlet 2.5 → 3.1 & Rails 6.1 likely working   |
+| [**1.2**](https://github.com/jruby/jruby-rack/tree/1.2-stable) | Maintained    | 2.2       | 9.3 → 9.4  | 8+   | 5.0 → 7.2 | 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)     |                                                                |
 
 ## Getting Started
 

pom.xml

@@ -25,7 +25,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>
-    <log4j.version>2.25.2</log4j.version>
+    <log4j.version>2.25.3</log4j.version>
     <spring.version>5.3.39</spring.version>
   </properties>
 
@@ -185,7 +185,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.14.1</version>
+        <version>3.15.0</version>
         <configuration>
           <release>8</release>
           <showDeprecation>true</showDeprecation>
@@ -195,7 +195,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>3.3.1</version>
+        <version>3.4.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -273,7 +273,7 @@
       <plugin>
         <groupId>org.sonatype.central</groupId>
         <artifactId>central-publishing-maven-plugin</artifactId>
-        <version>0.9.0</version>
+        <version>0.10.0</version>
         <extensions>true</extensions>
         <configuration>
           <publishingServerId>central</publishingServerId>
@@ -283,7 +283,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>versions-maven-plugin</artifactId>
-        <version>2.19.1</version>
+        <version>2.21.0</version>
         <configuration>
           <ignoredVersions>.*-(alpha|beta|M)[-0-9]+</ignoredVersions>
         </configuration>
@@ -305,7 +305,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.3.1</version>
+            <version>3.4.0</version>
             <executions>
               <execution>
                 <id>attach-sources</id>

src/spec/ruby/jruby/rack/integration_spec.rb

@@ -203,10 +203,6 @@
     end
   end
 
-  describe 'rails 6.1', lib: :rails61 do
-    it_should_behave_like 'a rails app'
-  end
-
   describe 'rails 7.0', lib: :rails70 do
     it_should_behave_like 'a rails app'
   end

src/spec/ruby/rack/application_spec.rb

@@ -738,10 +738,10 @@ def method_missing(name, *args, &block)
     expect(@rack_config).to receive(:getInitialRuntimes).and_return 3
     expect(@rack_config).to receive(:getMaximumRuntimes).and_return 4
 
-    @pooling_factory.init(@rack_context)
     start = java.lang.System.currentTimeMillis
+    @pooling_factory.init(@rack_context)
     expect(@pooling_factory.getApplication).not_to be nil
-    expect(java.lang.System.currentTimeMillis - start).to be_within(70).of(app_init_secs * 1000) # getApplication waited ~ sleep time
+    expect(java.lang.System.currentTimeMillis - start).to be >= app_init_secs * 1000 - 70 # getApplication waited ~ sleep time
   end
 
   it "waits acquire timeout till an application is available from the pool (than raises)" do
@@ -760,14 +760,14 @@ def method_missing(name, *args, &block)
     @pooling_factory.acquire_timeout = 1.to_java # second
     start = java.lang.System.currentTimeMillis
     expect(@pooling_factory.getApplication).not_to be nil
-    expect(java.lang.System.currentTimeMillis - start).to be_within(70).of(app_init_secs * 1000)
+    expect(java.lang.System.currentTimeMillis - start).to be >= app_init_secs * 1000 - 70
 
     app2 = @pooling_factory.getApplication # now the pool is empty
     timeout_secs = 0.1
     @pooling_factory.acquire_timeout = (timeout_secs).to_java
     start = java.lang.System.currentTimeMillis
     expect { @pooling_factory.getApplication }.to raise_error(org.jruby.rack.AcquireTimeoutException)
-    expect(java.lang.System.currentTimeMillis - start).to be_within(20).of(timeout_secs * 1000)
+    expect(java.lang.System.currentTimeMillis - start).to be >= timeout_secs * 1000 - 20
 
     @pooling_factory.finishedWithApplication(app2) # gets back to the pool
     expect(@pooling_factory.getApplication).to eq app2
@@ -800,13 +800,13 @@ def method_missing(name, *args, &block)
 
     start = java.lang.System.currentTimeMillis
     2.times { expect(@pooling_factory.getApplication).not_to be nil }
-    expect(java.lang.System.currentTimeMillis - start).to be_within(70).of(2 * app_get_secs * 1000)
+    expect(java.lang.System.currentTimeMillis - start).to be >= 2 * app_init_secs * 1000 - 70
 
     start = java.lang.System.currentTimeMillis
     expect {
       @pooling_factory.getApplication
     }.to raise_error(org.jruby.rack.AcquireTimeoutException)
-    expect(java.lang.System.currentTimeMillis - start).to be_within(20).of(timeout_secs * 1000)
+    expect(java.lang.System.currentTimeMillis - start).to be >= timeout_secs * 1000 - 20
   end
 
   it "initializes initial runtimes in parallel (with wait set to false)" do