Merge branch 'master' into jakarta-update

Author: chadlwilson

CHANGELOG.md

@@ -23,7 +23,7 @@
 - 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.6 (UNRELEASED)
+## 1.2.6
 
 - Add missing block-only signature for debug logging
 - update (bundled) rack to 2.2.20

Gemfile.lock

@@ -17,7 +17,7 @@ GEM
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
+    rspec-mocks (3.13.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.6)

examples/camping/Gemfile

@@ -8,6 +8,6 @@ gem 'camping', '< 3'
 gem 'markaby'
 
 group :development do
-  gem 'warbler', github: 'jruby/warbler', branch: 'master'
+  gem 'warbler', '~> 2.1'
   gem 'jruby-jars', '< 10'
 end

examples/camping/Gemfile.lock

@@ -1,16 +1,3 @@
-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:
@@ -19,18 +6,25 @@ GEM
       mab (>= 0.0.3)
       rack (>= 1.0)
     jruby-jars (9.4.14.0)
-    jruby-rack (1.2.5)
+    jruby-rack (1.2.6)
     mab (0.0.3)
     markaby (0.9.4)
       builder
-    ostruct (0.6.2)
+    ostruct (0.6.3)
     rack (2.2.20)
     rackup (1.0.1)
       rack (< 3)
       webrick
     rake (13.3.0)
     rexml (3.4.4)
-    rubyzip (3.1.1)
+    rubyzip (3.2.0)
+    warbler (2.1.0)
+      jruby-jars (>= 9.4, < 10.1)
+      jruby-rack (>= 1.2.3, < 1.3)
+      ostruct (~> 0.6.2)
+      rake (~> 13.0, >= 13.0.3)
+      rexml (~> 3.0)
+      rubyzip (>= 3.0.0)
     webrick (1.9.1)
 
 PLATFORMS
@@ -43,7 +37,7 @@ DEPENDENCIES
   markaby
   rack (~> 2.2.20)
   rackup
-  warbler!
+  warbler (~> 2.1)
 
 RUBY VERSION
    ruby 3.1.7p0 (jruby 9.4.14.0)

examples/rails7/Gemfile

@@ -7,6 +7,6 @@ gem 'rack', '~> 2.2.20'
 gem "sprockets-rails"
 
 group :development do
-  gem 'warbler', github: 'jruby/warbler', branch: 'master'
+  gem 'warbler', '~> 2.1'
   gem 'jruby-jars', '< 10'
 end

examples/rails7/Gemfile.lock

@@ -1,16 +1,3 @@
-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:
@@ -87,8 +74,8 @@ GEM
       tzinfo (~> 2.0, >= 2.0.5)
     base64 (0.3.0)
     benchmark (0.4.1)
-    bigdecimal (3.3.0)
-    bigdecimal (3.3.0-java)
+    bigdecimal (3.3.1)
+    bigdecimal (3.3.1-java)
     builder (3.3.0)
     cgi (0.5.0)
     cgi (0.5.0-java)
@@ -115,7 +102,7 @@ GEM
       reline (>= 0.4.2)
     jar-dependencies (0.5.5)
     jruby-jars (9.4.14.0)
-    jruby-rack (1.2.5)
+    jruby-rack (1.2.6)
     logger (1.7.0)
     loofah (2.24.1)
       crass (~> 1.0.2)
@@ -127,7 +114,7 @@ GEM
       net-smtp
     marcel (1.1.0)
     mini_mime (1.1.5)
-    minitest (5.25.5)
+    minitest (5.26.0)
     net-imap (0.5.12)
       date
       net-protocol
@@ -143,7 +130,7 @@ GEM
       racc (~> 1.4)
     nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
-    ostruct (0.6.2)
+    ostruct (0.6.3)
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
@@ -200,7 +187,7 @@ GEM
     reline (0.6.2)
       io-console (~> 0.5)
     rexml (3.4.4)
-    rubyzip (3.1.1)
+    rubyzip (3.2.0)
     securerandom (0.4.1)
     sprockets (4.2.2)
       concurrent-ruby (~> 1.0)
@@ -217,6 +204,13 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     useragent (0.16.11)
+    warbler (2.1.0)
+      jruby-jars (>= 9.4, < 10.1)
+      jruby-rack (>= 1.2.3, < 1.3)
+      ostruct (~> 0.6.2)
+      rake (~> 13.0, >= 13.0.3)
+      rexml (~> 3.0)
+      rubyzip (>= 3.0.0)
     webrick (1.9.1)
     websocket-driver (0.8.0)
       base64
@@ -236,7 +230,7 @@ DEPENDENCIES
   rack (~> 2.2.20)
   rails (~> 7.2.2, >= 7.2.2.2)
   sprockets-rails
-  warbler!
+  warbler (~> 2.1)
 
 RUBY VERSION
    ruby 3.1.7p0 (jruby 9.4.14.0)

examples/sinatra/Gemfile

@@ -7,6 +7,6 @@ gem 'webrick'
 gem 'rack', '~> 2.2.20'
 
 group :development do
-  gem 'warbler', github: 'jruby/warbler', branch: 'master'
+  gem 'warbler', '~> 2.1'
   gem 'jruby-jars', '< 10'
 end

examples/sinatra/Gemfile.lock

@@ -1,39 +1,33 @@
-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:
     base64 (0.3.0)
     jruby-jars (9.4.14.0)
-    jruby-rack (1.2.5)
+    jruby-rack (1.2.6)
     mustermann (3.0.4)
       ruby2_keywords (~> 0.0.1)
-    ostruct (0.6.2)
+    ostruct (0.6.3)
     rack (2.2.20)
     rack-protection (3.2.0)
       base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
     rake (13.3.0)
     rexml (3.4.4)
     ruby2_keywords (0.0.5)
-    rubyzip (3.1.1)
+    rubyzip (3.2.0)
     sinatra (3.2.0)
       mustermann (~> 3.0)
       rack (~> 2.2, >= 2.2.4)
       rack-protection (= 3.2.0)
       tilt (~> 2.0)
     tilt (2.6.1)
+    warbler (2.1.0)
+      jruby-jars (>= 9.4, < 10.1)
+      jruby-rack (>= 1.2.3, < 1.3)
+      ostruct (~> 0.6.2)
+      rake (~> 13.0, >= 13.0.3)
+      rexml (~> 3.0)
+      rubyzip (>= 3.0.0)
     webrick (1.9.1)
 
 PLATFORMS
@@ -44,7 +38,7 @@ DEPENDENCIES
   jruby-jars (< 10)
   rack (~> 2.2.20)
   sinatra
-  warbler!
+  warbler (~> 2.1)
   webrick
 
 RUBY VERSION