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

# Conflicts:
#	pom.xml
#	src/main/java/org/jruby/rack/jms/DefaultQueueManager.java
#	src/main/java/org/jruby/rack/jms/QueueContextListener.java
#	src/main/java/org/jruby/rack/jms/QueueManager.java
#	src/main/java/org/jruby/rack/servlet/ResponseCapture.java
#	src/main/java/org/jruby/rack/servlet/RewindableInputStream.java
#	src/main/java/org/jruby/rack/servlet/ServletRackIncludedResponse.java
#	src/main/ruby/jruby/rack/queues.rb
#	src/spec/java/org/jruby/rack/mock/DelegatingServletInputStream.java
#	src/spec/java/org/jruby/rack/mock/DelegatingServletOutputStream.java
#	src/spec/java/org/jruby/rack/mock/MockAsyncContext.java
#	src/spec/java/org/jruby/rack/mock/MockHttpServletRequest.java
#	src/spec/java/org/jruby/rack/mock/MockHttpServletResponse.java
#	src/spec/java/org/jruby/rack/mock/MockHttpSession.java
#	src/spec/java/org/jruby/rack/mock/MockRequestDispatcher.java
#	src/spec/java/org/jruby/rack/mock/MockServletConfig.java
#	src/spec/java/org/jruby/rack/mock/MockServletContext.java
#	src/spec/java/org/jruby/rack/mock/MockSessionCookieConfig.java
#	src/spec/java/org/jruby/rack/mock/WebUtils.java
#	src/spec/ruby/jruby/rack/servlet_ext_spec.rb
#	src/spec/ruby/rack/jms_spec.rb

Author: chadlwilson

.github/dependabot.yml

@@ -0,0 +1,40 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: monthly
+    groups:
+      actions-deps:
+        patterns: [ "*" ]
+  - package-ecosystem: maven
+    directory: "/"
+    schedule:
+      interval: monthly
+    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
+    directories:
+      - "/"
+    schedule:
+      interval: monthly
+    allow:
+      - dependency-type: all
+    groups:
+      ruby-deps:
+        patterns: [ "*" ]
+    ignore:
+      - dependency-name: "rack"
+        update-types: [ "version-update:semver-major" ]

.github/workflows/maven.yml

@@ -1,18 +1,15 @@
-# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
-
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-name: Java CI with Maven
+name: Java CI
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "master", "*-stable" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "master", "*-stable" ]
+
+env:
+  # Default versions for canonical release build
+  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:
@@ -21,22 +18,73 @@ jobs:
 
     strategy:
       matrix:
-        java_version: [ '8', '11', '17', '21' ]
-        jruby_version: [ '9.3.15.0', '9.4.9.0' ]
+        jruby_version: [ '9.4.13.0', '10.0.0.1' ]
+        java_version: [ '11', '17', '21' ]
+        exclude:
+          - jruby_version: '10.0.0.1'
+            java_version: '11' # JRuby 10 requires Java 21
+          - jruby_version: '10.0.0.1'
+            java_version: '17' # JRuby 10 requires Java 21
       fail-fast: false
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
     - name: Set up JDK
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'temurin'
         cache: maven
+
     - name: Build with Maven
-      run: mvn -B install --file pom.xml -Djruby.version=${{ matrix.jruby_version }}
+      run: mvn -B install -Djruby.version=${{ matrix.jruby_version }}
 
     # Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
     - name: Update dependency graph
-      uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
-      if: github.head_ref == 'refs/heads/master' && matrix.java_version == '8' && startsWith(matrix.jruby_version, '9.4')
+      uses: advanced-security/maven-dependency-submission-action@b275d12641ac2d2108b2cbb7598b154ad2f2cee8 # v5.0.0
+      if: github.head_ref == 'refs/heads/master' && matrix.java_version == env.DEFAULT_JAVA_VERSION && matrix.jruby_version == env.DEFAULT_JRUBY_VERSION
+
+  appraisals:
+    needs: build
+    name: ${{ matrix.appraisal }} appraisal on ${{ matrix.jruby_version }} / Java ${{ matrix.java_version }}
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        jruby_version: [ '9.4.13.0', '10.0.0.1' ]
+        java_version: [ '11', '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.0.1'
+            java_version: '11' # JRuby 10 requires Java 21
+          - jruby_version: '10.0.0.1'
+            java_version: '17' # JRuby 10 requires Java 21
+      fail-fast: false
+
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.appraisal }}.gemfile
+      JRUBY_VERSION: ${{ matrix.jruby_version }}
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Set up JDK
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        with:
+          java-version: ${{ matrix.java_version }}
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Setup JRuby
+        uses: ruby/setup-ruby@472790540115ce5bd69d399a020189a8c87d641f # v1.247.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: 'Gemfile.lock'
+
+      - name: Run appraisal for ${{ matrix.appraisal }}
+        run: bundle install && bundle exec rake spec
+