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

# Conflicts:
#	src/spec/ruby/jruby/rack/integration_spec.rb

Author: chadlwilson

.github/workflows/maven.yml

@@ -9,7 +9,7 @@ on:
 env:
   # Default versions for canonical release build
   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)
+  DEFAULT_JRUBY_VERSION: '9.4.14.0' # Should match pom.xml <jruby.version> property (AND a version inside the test matrix)
   DEFAULT_RACK_VERSION: '~> 2.2.0' # Should match Gemfile (AND a version inside the test matrix)
 
 jobs:
@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        jruby_version: [ '9.4.13.0', '10.0.2.0' ]
+        jruby_version: [ '9.4.14.0', '10.0.2.0' ]
         java_version: [ '8', '11', '17', '21' ]
         rack_version: [ '~> 2.2.0' ]
         exclude:
@@ -59,16 +59,13 @@ jobs:
     strategy:
       matrix:
         appraisal: [
-          'rails50_rack22',
-          'rails52_rack22',
-          'rails60_rack22',
           'rails61_rack22',
           'rails70_rack22',
           'rails71_rack22',
           'rails72_rack22',
           'rails80_rack22',
         ]
-        jruby_version: [ '9.4.13.0', '10.0.2.0' ]
+        jruby_version: [ '9.4.14.0', '10.0.2.0' ]
         java_version: [ '8', '11', '17', '21' ]
         exclude:
           - jruby_version: '10.0.2.0'
@@ -78,7 +75,7 @@ jobs:
           - jruby_version: '10.0.2.0'
             java_version: '17' # JRuby 10 requires Java 21
           - appraisal: 'rails80_rack22'
-            jruby_version: '9.4.13.0' # Rails 8 requires Ruby 3.4 compatibility, which JRuby 9.4 does not support
+            jruby_version: '9.4.14.0' # Rails 8 requires Ruby 3.4 compatibility, which JRuby 9.4 does not support
       fail-fast: false
 
     env:
@@ -96,7 +93,7 @@ jobs:
           cache: maven
 
       - name: Setup JRuby
-        uses: ruby/setup-ruby@829114fc20da43a41d27359103ec7a63020954d4 # v1.255.0
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: jruby-${{ matrix.jruby_version }}
           bundler-cache: 'false' # Need to install later so we can vary from Gemfile.lock as required for JRuby version compatibility

Appraisals

@@ -3,9 +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} ]
 {
-    "rails50" => %w[rack22],
-    "rails52" => %w[rack22],
-    "rails60" => %w[rack22],
     "rails61" => %w[rack22],
     "rails70" => %w[rack22],
     "rails71" => %w[rack22],

History.md

@@ -7,6 +7,7 @@
 - Support Javax Servlet API 4.0 (JEE 8)
 - Adds basic compatibility with JRuby 10.0
 - Drop support for JRuby 9.3
+- Drop support for Rails < 6.1
 - Drop unnecessary `jruby.compat.version` and `RackConfig.getCompatVersion()` API
 - Drop JMS support
 - Drop deprecated `RackLogger` string (level) constants
@@ -22,6 +23,12 @@
 - Change context listener to throw, in case of an exception during initialization, by default
 - Change rails context listener to assume a thread-safe application by default
 
+## 1.2.5 (UNRELEASED)
+
+- Fix use of jruby-rack under Java 8 (#324)
+- Fix deprecated usages of JRuby runtime
+- Fix deprecated usages of Rack API
+
 ## 1.2.4
 
 - update (bundled) rack to 2.2.17

README.md

@@ -13,8 +13,8 @@ For more information on Rack, visit http://rack.github.io/.
 
 | JRuby-Rack Series                                          | Status     | Rack      | JRuby      | Java | Rails     | Target Servlet API  | Notes                                      |
 |------------------------------------------------------------|------------|-----------|------------|------|-----------|---------------------|--------------------------------------------|
-| 2.0 (_planned_)                                            | Dev        | 2.2       | 9.4 → 10.0 | 8+   | 5.0 → 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+   | 5.0 → 8.0 | 4.0 (Java EE 8)     | Servlet 2.5 → 3.1 likely to work fine.     |
+| 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)     |                                            |
@@ -335,6 +335,20 @@ package and push the .jar every time a commit changes a source file).
 * `./mvnw release:perform` (possibly with `-DuseReleaseProfile=false` due to Javadoc doclint failures for now)
 * `rake clean gem SKIP_SPECS=true` and push the gem
 
+## Adding testing for new Rails versions
+
+* Add the new version to `.github/workflows/maven.yml` under the `matrix` section
+* Add a new configuration to the `Appraisals` file, then
+    ```bundle exec appraisal generate```
+* Generate a new stub Rails application for the new version
+    ```shell
+    VERSION=rails72
+    cd src/spec/stub
+    rm -rf $VERSION && BUNDLE_GEMFILE=~/Projects/community/jruby-rack/gemfiles/${VERSION}_rack22.gemfile bundle exec rails new $VERSION --minimal --skip-git --skip-docker --skip-active-model --skip-active-record --skip-test --skip-system-test --skip-dev-gems --skip-bundle --skip-keeps --skip-asset-pipeline --skip-ci --skip-brakeman --skip-rubocop
+    ```
+* Manual changes to make to support testing
+  * In `config/production.rb` comment out the default `config.logger` value so jruby-rack applies its own `RailsLogger`.  
+
 ## Support
 
 Please use [github][3] to file bugs, patches and/or pull requests.

examples/Kirkfile

@@ -1,4 +1,4 @@
-rack "rails3/config.ru" do
+rack "rails7/config.ru" do
   listen 9090
 end
 

examples/camping/Gemfile.lock

@@ -18,7 +18,7 @@ GEM
     camping (2.1.532)
       mab (>= 0.0.3)
       rack (>= 1.0)
-    jruby-jars (9.4.13.0)
+    jruby-jars (9.4.14.0)
     jruby-rack (1.2.3)
     mab (0.0.3)
     markaby (0.9.4)