Merge remote-tracking branch 'upstream/master' into gocd-master

# Conflicts:
#	.github/workflows/maven.yml
#	Gemfile.lock
#	History.md
#	gemfiles/rails50.gemfile.lock
#	gemfiles/rails52.gemfile.lock
#	gemfiles/rails60.gemfile.lock
#	gemfiles/rails61.gemfile.lock
#	gemfiles/rails70.gemfile.lock
#	gemfiles/rails71.gemfile.lock
#	gemfiles/rails72.gemfile.lock
#	pom.xml
#	src/main/ruby/jruby/rack/version.rb
#	src/spec/ruby/jruby/rack/integration_spec.rb

Author: chadlwilson

.github/workflows/maven.yml

@@ -2,14 +2,14 @@ name: Java CI
 
 on:
   push:
-    branches: [ "master", "*release*", "*stable*" ]
+    branches: [ "master", "*-stable" ]
   pull_request:
-    branches: [ "master", "*release*", "*stable*" ]
+    branches: [ "master", "*-stable" ]
 
 env:
   # Default versions for canonical release build
-  DEFAULT_JAVA_VERSION: '8'
-  DEFAULT_JRUBY_VERSION: '9.4.12.1' # Should match pom.xml <jruby.version> property (AND a version inside the test matrix)
+  DEFAULT_JAVA_VERSION: '11'
+  DEFAULT_JRUBY_VERSION: '9.4.13.0' # Should match pom.xml <jruby.version> property (AND a version inside the test matrix)
 
 jobs:
   build:
@@ -18,14 +18,12 @@ jobs:
 
     strategy:
       matrix:
-        jruby_version: [ '9.3.15.0', '9.4.12.1' ] # , '10.0.0.1'
-        java_version: [ '8', '11', '17', '21' ]
+        jruby_version: [ '9.4.13.0', '10.0.1.0' ]
+        java_version: [ '11', '17', '21' ]
         exclude:
-          - jruby_version: '10.0.0.1'
-            java_version: '8' # JRuby 10 requires Java 21
-          - jruby_version: '10.0.0.1'
+          - jruby_version: '10.0.1.0'
             java_version: '11' # JRuby 10 requires Java 21
-          - jruby_version: '10.0.0.1'
+          - jruby_version: '10.0.1.0'
             java_version: '17' # JRuby 10 requires Java 21
       fail-fast: false
 
@@ -54,21 +52,15 @@ jobs:
 
     strategy:
       matrix:
-        jruby_version: [ '9.3.15.0', '9.4.12.1' ] # , '10.0.0.1'
-        java_version: [ '8', '11', '17', '21' ]
-        appraisal: [ 'rails50', 'rails52', 'rails60', 'rails61', 'rails70', 'rails71', 'rails72' ]
+        jruby_version: [ '9.4.13.0', '10.0.1.0' ]
+        java_version: [ '11', '17', '21' ]
+        appraisal: [ 'rails50', 'rails52', 'rails60', 'rails61', 'rails70', 'rails71', 'rails72', 'rails80' ]
         exclude:
-          - jruby_version: '9.3.15.0'
-            appraisal: 'rails70' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
-          - jruby_version: '9.3.15.0'
-            appraisal: 'rails71' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support
-          - jruby_version: '9.3.15.0'
-            appraisal: 'rails72' # Requires Ruby 3.1 compatibility, which JRuby 9.3 does not support
-          - jruby_version: '10.0.0.1'
-            java_version: '8' # JRuby 10 requires Java 21
-          - jruby_version: '10.0.0.1'
+          - 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.0.1'
+          - jruby_version: '10.0.1.0'
             java_version: '17' # JRuby 10 requires Java 21
       fail-fast: false
 
@@ -87,11 +79,11 @@ jobs:
           cache: maven
 
       - name: Setup JRuby
-        uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
+        uses: ruby/setup-ruby@a9bfc2ecf3dd40734a9418f89a7e9d484c32b990 # v1.248.0
         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
-          bundler: ${{ startsWith(matrix.jruby_version, '9.3') && '2.3.27' || 'Gemfile.lock' }}
+          bundler: 'Gemfile.lock'
 
       - name: Run appraisal for ${{ matrix.appraisal }}
         run: bundle install && bundle exec rake spec

Appraisals

@@ -25,3 +25,7 @@ end
 appraise "rails72" do
   gem "rails", "~> 7.2.0"
 end
+
+appraise "rails80" do
+  gem "rails", "~> 8.0.0"
+end

Gemfile.lock

@@ -21,10 +21,9 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.4)
-    thor (1.3.2)
+    thor (1.4.0)
 
 PLATFORMS
-  universal-java-1.8
   universal-java-11
   universal-java-17
   universal-java-21
@@ -35,6 +34,3 @@ DEPENDENCIES
   rack (~> 2.2)
   rake (~> 13.3)
   rspec
-
-BUNDLED WITH
-   2.6.3

History.md

@@ -1,10 +1,26 @@
+## 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
+- Drop unnecessary `jruby.compat.version` and `RackConfig.getCompatVersion()` API
+- Drop JMS support
+- Drop deprecated `RackLogger` string (level) constants
+- Drop `jruby.rack.jruby.version` and `jruby.rack.rack.release` keys from rack `env` Hhsh
+- 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
+- update (bundled) rack to 2.2.17
+- Fix Rails 7.1 CSRF protection when working with `JavaServletStore` sessions
+
 ## 1.2.4 (UNRELEASED)
 
-- update (bundled) rack to 2.2.16
+- update (bundled) rack to 2.2.17
+- Fix Rails 7.1 CSRF protection when working with `JavaServletStore` sessions
 
 ## 1.2.3
 
-- avoid warnings due usage of `File.exists?`
+- avoid warnings due to usage of `File.exists?`
 - Fix Rails 7.1 compatibility by ensuring active_support is required before railtie
 - Workaround logger require issues with concurrent-ruby 1.3.5 and older Rails versions
 - Workaround NameError frozen string literal issues with JRuby 9.3 and Rails 5.2/6.0

README.md

@@ -6,9 +6,9 @@ JRuby-Rack supports Rails as well as any Rack-compatible Ruby web framework.
 
 For more information on Rack, visit http://rack.github.io/.
 
-**This README (master) targets JRuby-Rack 1.2. Please use the
-[1.1-stable](https://github.com/jruby/jruby-rack/tree/1.1-stable) branch for
-current stable 1.1.x releases.**
+**This README (master) targets JRuby-Rack 1.3. Please use the [1.2-stable](https://github.com/jruby/jruby-rack/tree/1.2-stable) or 
+[1.1-stable](https://github.com/jruby/jruby-rack/tree/1.1-stable) branches for
+current stable releases.**
 
 [![Gem Version](https://badge.fury.io/rb/jruby-rack.png)][8]
 [![Build Status](https://github.com/jruby/jruby-rack/actions/workflows/maven.yml/badge.svg)][9]
@@ -34,12 +34,16 @@ dependencies {
 
 ## Compatibility
 
+JRuby-Rack 1.3.x
+- aims to be compatible with JRuby 9.4 -> 10.0 and Java 11+
+- supports any container compatible with Java Servlet 4.0 API
+
 JRuby-Rack 1.2.x
-- aims to be compatible with JRuby >= 9.3 and its supported JDK versions
+- compatible with JRuby 9.3 -> 9.4 and their supported JDK versions
 - supports any container compatible with Java Servlet 3.0 API
 
 JRuby-Rack 1.1.x
-- aims to be compatible with JRuby >= 1.6.4 (used successfully through JRuby 9.4.x)
+- aims to be compatible with JRuby >= 1.6.4 (used successfully through JRuby 9.4)
 - supports any container compatible with Java Servlet 2.5 API (JEE 5)
 
 

Rakefile

@@ -143,7 +143,6 @@ module JRubyJars
   end
   require jruby_rack_jar_path if defined?(JRUBY_VERSION)
 end
-require 'jruby/rack/version' # @deprecated to be removed in 1.2
 }
   end
 end

examples/servers/Apache-Tomcat-6-0-14.txt

@@ -35,8 +35,6 @@ filter_adds_html = true
 filter_verifies_resource = false
 ignore_environment = true
 initial_runtimes = 
-jms_connection_factory = 
-jms_jndi_properties = 
 logger = org.jruby.rack.logging.ServletContextLogger@7a14b43d
 logger_class_name = servlet_context
 logger_name = jruby.rack

examples/servers/Apache-Tomcat-7-0-2.txt

@@ -35,8 +35,6 @@ filter_adds_html = true
 filter_verifies_resource = false
 ignore_environment = true
 initial_runtimes = 
-jms_connection_factory = 
-jms_jndi_properties = 
 logger = org.jruby.rack.logging.ServletContextLogger@398a3257
 logger_class_name = servlet_context
 logger_name = jruby.rack

examples/servers/GlassFish-v3.txt

@@ -37,8 +37,6 @@ filter_adds_html = true
 filter_verifies_resource = false
 ignore_environment = true
 initial_runtimes = 
-jms_connection_factory = 
-jms_jndi_properties = 
 logger = org.jruby.rack.logging.ServletContextLogger@46ee45a5
 logger_class_name = servlet_context
 logger_name = jruby.rack

examples/servers/JBoss-Web-2-1-3-GA.txt

@@ -37,8 +37,6 @@ filter_adds_html = true
 filter_verifies_resource = false
 ignore_environment = true
 initial_runtimes = 
-jms_connection_factory = 
-jms_jndi_properties = 
 logger = org.jruby.rack.logging.ServletContextLogger@1a20433b
 logger_class_name = servlet_context
 logger_name = jruby.rack