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

Author: chadlwilson

.github/dependabot.yml

@@ -7,6 +7,8 @@ updates:
     groups:
       actions-deps:
         patterns: [ "*" ]
+
+  # Master branch
   - package-ecosystem: maven
     directory: "/"
     schedule:
@@ -28,6 +30,7 @@ updates:
   - package-ecosystem: bundler
     directories:
       - "/"
+      - "/examples/*"
     schedule:
       interval: monthly
     allow:
@@ -38,3 +41,52 @@ updates:
     ignore:
       - dependency-name: "rack"
         update-types: [ "version-update:semver-major" ]
+      - dependency-name: "rails"
+        update-types: [ "version-update:semver-minor" ]
+      - dependency-name: "jruby-jars"
+        update-types: [ "version-update:semver-major" ]
+
+  # Maintabled stable branches
+  - package-ecosystem: maven
+    target-branch: "1.2-stable"
+    commit-message:
+      prefix: "1.2.x: "
+    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
+    target-branch: "1.2-stable"
+    commit-message:
+      prefix: "1.2.x: "
+    directories:
+      - "/"
+      - "/examples/*"
+    schedule:
+      interval: monthly
+    allow:
+      - dependency-type: all
+    groups:
+      ruby-deps:
+        patterns: [ "*" ]
+    ignore:
+      - dependency-name: "rack"
+        update-types: [ "version-update:semver-major" ]
+      - dependency-name: "rails"
+        update-types: [ "version-update:semver-minor" ]
+      - dependency-name: "jruby-jars"
+        update-types: [ "version-update:semver-major" ]
+

History.md CHANGELOG.mdHistory.md renamed to CHANGELOG.md

@@ -22,7 +22,10 @@
 ## 1.2.6 (UNRELEASED)
 
 - Add missing block-only signature for debug logging
-- update (bundled) rack to 2.2.18
+- update (bundled) rack to 2.2.20
+- Ensure rack boot process leaves ENV['GEM_PATH'] and Gem.paths in a consistent state
+- Remove undocumented and unsafe jruby.rack.env.gem_path = false option (unusable on Bundler 1.6+)
+- Fix unintended Rubygems initialization too early in boot process with JRuby 9.4+
 
 ## 1.2.5
 

Gemfile

@@ -4,7 +4,7 @@ group :default do
   if rack_version = ENV['RACK_VERSION']
     gem 'rack', rack_version
   else
-    gem 'rack', '~> 2.2.18'
+    gem 'rack', '~> 2.2.20'
   end
 end
 

Gemfile.lock

@@ -6,7 +6,7 @@ GEM
       rake
       thor (>= 0.14.0)
     diff-lcs (1.6.2)
-    rack (2.2.18)
+    rack (2.2.20)
     rake (13.3.0)
     rspec (3.13.1)
       rspec-core (~> 3.13.0)
@@ -20,7 +20,7 @@ GEM
     rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.5)
+    rspec-support (3.13.6)
     thor (1.4.0)
 
 PLATFORMS
@@ -33,6 +33,6 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
-  rack (~> 2.2.18)
+  rack (~> 2.2.20)
   rake (~> 13.3)
   rspec

README.md

@@ -1,8 +1,10 @@
 # JRuby-Rack
 
-[![Gem Version](https://badge.fury.io/rb/jruby-rack.png)][5]
-[![Build Status](https://github.com/jruby/jruby-rack/actions/workflows/maven.yml/badge.svg)][6]
-
+[![Gem Version](https://img.shields.io/gem/v/jruby-rack)](https://rubygems.org/gems/jruby-rack)
+[![Jar Version](https://img.shields.io/maven-central/v/org.jruby.rack/jruby-rack)](https://central.sonatype.com/artifact/org.jruby.rack/jruby-rack)
+[![master Build Status](https://github.com/jruby/jruby-rack/actions/workflows/maven.yml/badge.svg)](https://github.com/jruby/jruby-rack/actions/workflows/maven.yml?query=branch%3Amaster) (master)
+[![1.2.x Build Status](https://github.com/jruby/jruby-rack/actions/workflows/maven.yml/badge.svg?branch=1.2-stable)](https://github.com/jruby/jruby-rack/actions/workflows/maven.yml?query=branch%3A1.2-stable) (1.2.x)
+ 
 JRuby-Rack is a lightweight adapter for the Java Servlet environment that allows
 any (Ruby) Rack-based application to run unmodified in a Java Servlet container.
 JRuby-Rack supports Rails as well as any Rack-compatible Ruby web framework.
@@ -248,7 +250,13 @@ as context init parameters in web.xml or as VM-wide system properties.
   this option to en empty string (or 'false') it acts as if the ENV hash was
   cleared out (similar to the now removed `jruby.rack.ignore.env` option).
 - `jruby.runtime.env.rubyopt`: Set to true to cause ENV['RUBYOPT']
-  to be retained even when using `jruby.runtime.env` to override environemnt (similar to how the removed `jruby.rack.ignore.env` option behaved by default).
+  to be retained even when using `jruby.runtime.env` to override the environment.
+- `jruby.rack.env.gem_path`: If set to `true` (the default) jruby-rack will
+  ensure ENV['GEM_PATH'] is altered to include the `gem.path` above. If you set it to a
+  value, this value will be used as GEM_PATH, overriding the environment and
+  ignoring `gem.path` etc. By setting this option to en empty string the ENV['GEM_PATH'] will
+  not be modified by jruby-rack at all and will retain its original values implied by
+  the process environment and `jruby.runtime.env` setting.
 - `jruby.rack.logging`: Specify the logging device to use. Defaults to
   `servlet_context`. See below.
 - `jruby.rack.request.size.initial.bytes`: Initial size for request body memory
@@ -373,9 +381,7 @@ package and push the .jar every time a commit changes a source file).
 Please use [github][3] to file bugs, patches and/or pull requests.
 More information at the [wiki][4] or ask us at **#jruby**'s IRC channel.
 
-[1]: https://github.com/jruby/warbler#warbler--
+[1]: https://github.com/jruby/warbler
 [2]: https://central.sonatype.com/artifact/org.jruby.rack/jruby-rack
 [3]: https://github.com/jruby/jruby-rack/issues
 [4]: https://github.com/jruby/jruby-rack/wiki
-[5]: http://badge.fury.io/rb/jruby-rack
-[6]: https://github.com/jruby/jruby-rack/actions/workflows/maven.yml

Rakefile

@@ -156,7 +156,7 @@ end
 desc "Build the jruby-rack-#{GEM_VERSION}.gem"
 task :gem => [target_jar, target_jruby_rack, target_jruby_rack_version] do
   Rake::Task['spec'].invoke unless ENV['SKIP_SPECS'] == 'true'
-  cp FileList["History.md", "LICENSE.txt", "README.md"], "target/gem"
+  cp FileList["CHANGELOG.md", "LICENSE.txt", "README.md"], "target/gem"
   cp target_jar, "target/gem/lib"
   if (jars = FileList["target/gem/lib/*.jar"].to_a).size > 1
     abort "Too many jars! #{jars.map{|j| File.basename(j)}.inspect}\nRun a clean build `rake clean` first"

examples/camping/Gemfile

@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'rack', '~> 2.2.18'
+ruby '~> 3.1.0'
+
+gem 'rack', '~> 2.2.20'
 gem 'rackup'
 gem 'camping', '< 3'
 gem 'markaby'

examples/camping/Gemfile.lock

@@ -24,13 +24,13 @@ GEM
     markaby (0.9.4)
       builder
     ostruct (0.6.2)
-    rack (2.2.18)
+    rack (2.2.20)
     rackup (1.0.1)
       rack (< 3)
       webrick
     rake (13.3.0)
-    rexml (3.4.3)
-    rubyzip (3.1.0)
+    rexml (3.4.4)
+    rubyzip (3.1.1)
     webrick (1.9.1)
 
 PLATFORMS
@@ -41,9 +41,12 @@ DEPENDENCIES
   camping (< 3)
   jruby-jars (< 10)
   markaby
-  rack (~> 2.2.18)
+  rack (~> 2.2.20)
   rackup
   warbler!
 
+RUBY VERSION
+   ruby 3.1.7p0 (jruby 9.4.14.0)
+
 BUNDLED WITH
    2.6.9

examples/rails7/Gemfile

@@ -1,9 +1,12 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "rails", "~> 7.2.2", ">= 7.2.2.2"
-gem "rack", "~> 2.2.0"
+ruby '~> 3.1.0'
+
+gem 'rails', '~> 7.2.2', '>= 7.2.2.2'
+gem 'rack', '~> 2.2.20'
 gem "sprockets-rails"
 
 group :development do
+  gem 'warbler', github: 'jruby/warbler', branch: 'master'
   gem 'jruby-jars', '< 10'
 end

examples/rails7/Gemfile.lock

@@ -1,3 +1,16 @@
+GIT
+  remote: https://github.com/jruby/warbler.git
+  revision: 523237b6d931efcd6f13a79692f6aa46ad997443
+  branch: master
+  specs:
+    warbler (2.0.5)
+      jruby-jars (>= 9.0.0)
+      jruby-rack (>= 1.1.1, < 1.3)
+      ostruct (= 0.6.2)
+      rake (>= 13.0.3)
+      rexml (~> 3.0)
+      rubyzip (>= 3.0.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -74,28 +87,35 @@ GEM
       tzinfo (~> 2.0, >= 2.0.5)
     base64 (0.3.0)
     benchmark (0.4.1)
-    bigdecimal (3.2.3-java)
+    bigdecimal (3.3.0)
+    bigdecimal (3.3.0-java)
     builder (3.3.0)
+    cgi (0.5.0)
     cgi (0.5.0-java)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.4)
     crass (1.0.6)
+    date (3.4.1)
     date (3.4.1-java)
     drb (2.2.3)
+    erb (4.0.4)
+      cgi (>= 0.3.3)
     erb (4.0.4-java)
       cgi (>= 0.3.3)
     erubi (1.13.1)
-    globalid (1.2.1)
+    globalid (1.3.0)
       activesupport (>= 6.1)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
+    io-console (0.8.1)
     io-console (0.8.1-java)
     irb (1.15.2)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jar-dependencies (0.5.5)
     jruby-jars (9.4.14.0)
+    jruby-rack (1.2.5)
     logger (1.7.0)
     loofah (2.24.1)
       crass (~> 1.0.2)
@@ -105,10 +125,10 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.4)
+    marcel (1.1.0)
     mini_mime (1.1.5)
     minitest (5.25.5)
-    net-imap (0.5.10)
+    net-imap (0.5.12)
       date
       net-protocol
     net-pop (0.1.2)
@@ -117,17 +137,25 @@ GEM
       timeout
     net-smtp (0.5.1)
       net-protocol
+    nio4r (2.7.4)
     nio4r (2.7.4-java)
-    nokogiri (1.18.9-java)
+    nokogiri (1.18.10-java)
+      racc (~> 1.4)
+    nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
-    pp (0.6.2)
+    ostruct (0.6.2)
+    pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
+    psych (5.2.6)
+      date
+      stringio
     psych (5.2.6-java)
       date
       jar-dependencies (>= 0.1.7)
+    racc (1.8.1)
     racc (1.8.1-java)
-    rack (2.2.18)
+    rack (2.2.20)
     rack-session (1.0.2)
       rack (< 3)
     rack-test (2.2.0)
@@ -165,11 +193,14 @@ GEM
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rake (13.3.0)
-    rdoc (6.14.2)
+    rdoc (6.15.0)
       erb
       psych (>= 4.0.0)
+      tsort
     reline (0.6.2)
       io-console (~> 0.5)
+    rexml (3.4.4)
+    rubyzip (3.1.1)
     securerandom (0.4.1)
     sprockets (4.2.2)
       concurrent-ruby (~> 1.0)
@@ -179,12 +210,17 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
+    stringio (3.1.7)
     thor (1.4.0)
     timeout (0.4.3)
+    tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     useragent (0.16.11)
     webrick (1.9.1)
+    websocket-driver (0.8.0)
+      base64
+      websocket-extensions (>= 0.1.0)
     websocket-driver (0.8.0-java)
       base64
       websocket-extensions (>= 0.1.0)
@@ -193,12 +229,17 @@ GEM
 
 PLATFORMS
   universal-java-21
+  x86_64-linux
 
 DEPENDENCIES
   jruby-jars (< 10)
-  rack (~> 2.2.0)
+  rack (~> 2.2.20)
   rails (~> 7.2.2, >= 7.2.2.2)
   sprockets-rails
+  warbler!
+
+RUBY VERSION
+   ruby 3.1.7p0 (jruby 9.4.14.0)
 
 BUNDLED WITH
    2.6.9