Run tests on Java 25

.github/workflows/ci.yml

@@ -10,16 +10,13 @@ on:
 
   pull_request:
 
-env:
-  JRUBY_OPTS: -J-Xmx896M
-
 jobs:
   ci:
     runs-on: ubuntu-22.04
 
     strategy:
       matrix:
-        java-version: [8, 21]
+        java-version: [8, 21, 25]
         ruby-version: [jruby-9.4, jruby-10]
         task: ['', integration]
         exclude:

.gitignore

@@ -7,6 +7,7 @@ nbproject
 target/
 out/
 Gemfile.lock
+!spec/rails7_stub/Gemfile.lock
 .idea
 warbler.iml
 warbler.iws

Mavenfile

@@ -28,9 +28,12 @@ scope :provided do
   jar 'org.eclipse.jetty:jetty-webapp', '${jetty.version}'
 end
 
+plugin :clean, '3.5.0'
 plugin :compiler, '3.14.1', :release => '8'
 plugin :resources, '3.3.1'
-plugin :jar, '2.6'
+plugin :jar, '3.4.2' do
+  execute_goals(:phase => 'none') # Avoid a duplicate execution with that defined by the :gemspec directive
+end
 plugin :install, '3.1.4'
 
 gem 'bundler', '${bundler.version}'

integration/rails7_test/src/main/ruby/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 7.1.0'
+gem 'rails', '~> 7.2.0'
 gem 'rack', '~> 2.2.19'
 
-gem 'activerecord-jdbcsqlite3-adapter', '~> 71.0'
+gem 'activerecord-jdbcsqlite3-adapter', '~> 72.1'

integration/runnable_w_bundler_test/src/main/ruby/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'json', '1.8.3'
+gem 'json', '~> 2.15'
 
 #gem 'warbler', :group => 'development'

spec/rails7_stub/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 7.0'
+gem 'rails', '~> 7.2.0'
 
-gem 'activerecord-jdbcpostgresql-adapter', '~> 70.0'
+gem 'activerecord-jdbcpostgresql-adapter', '~> 72.1'

spec/rails7_stub/Gemfile.lock

@@ -1,29 +1,29 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actioncable (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionmailbox (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activestorage (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       mail (>= 2.8.0)
-    actionmailer (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      actionview (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionmailer (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      actionview (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.2.1)
-      actionview (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionpack (7.2.2.2)
+      actionview (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4, < 3.2)
@@ -32,40 +32,40 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actiontext (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activestorage (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionview (7.2.2.2)
+      activesupport (= 7.2.2.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activejob (7.2.2.2)
+      activesupport (= 7.2.2.2)
       globalid (>= 0.3.6)
-    activemodel (7.2.2.1)
-      activesupport (= 7.2.2.1)
-    activerecord (7.2.2.1)
-      activemodel (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activemodel (7.2.2.2)
+      activesupport (= 7.2.2.2)
+    activerecord (7.2.2.2)
+      activemodel (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       timeout (>= 0.4.0)
-    activerecord-jdbc-adapter (70.2-java)
-      activerecord (~> 7.0)
-    activerecord-jdbcpostgresql-adapter (70.2-java)
-      activerecord-jdbc-adapter (= 70.2)
+    activerecord-jdbc-adapter (72.1-java)
+      activerecord (~> 7.2.2)
+    activerecord-jdbcpostgresql-adapter (72.1-java)
+      activerecord-jdbc-adapter (= 72.1)
       jdbc-postgres (>= 9.4, < 43)
-    activestorage (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activestorage (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       marcel (~> 1.0)
-    activesupport (7.2.2.1)
+    activesupport (7.2.2.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -79,28 +79,28 @@ GEM
       tzinfo (~> 2.0, >= 2.0.5)
     base64 (0.3.0)
     benchmark (0.4.1)
-    bigdecimal (3.2.2-java)
+    bigdecimal (3.3.1-java)
     builder (3.3.0)
     cgi (0.5.0-java)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    connection_pool (2.5.4)
     crass (1.0.6)
     date (3.4.1-java)
     drb (2.2.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.0-java)
+    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)
-    jdbc-postgres (42.6.0)
+    jdbc-postgres (42.7.8)
     logger (1.7.0)
     loofah (2.24.1)
       crass (~> 1.0.2)
@@ -110,10 +110,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.9)
+    minitest (5.26.0)
+    net-imap (0.5.12)
       date
       net-protocol
     net-pop (0.1.2)
@@ -123,61 +123,63 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4-java)
-    nokogiri (1.18.8-java)
+    nokogiri (1.18.10-java)
       racc (~> 1.4)
-    pp (0.6.2)
+    pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
     psych (5.2.6-java)
       date
       jar-dependencies (>= 0.1.7)
     racc (1.8.1-java)
-    rack (3.1.16)
+    rack (3.1.18)
     rack-session (2.1.1)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
     rack-test (2.2.0)
       rack (>= 1.3)
     rackup (2.2.1)
       rack (>= 3)
-    rails (7.2.2.1)
-      actioncable (= 7.2.2.1)
-      actionmailbox (= 7.2.2.1)
-      actionmailer (= 7.2.2.1)
-      actionpack (= 7.2.2.1)
-      actiontext (= 7.2.2.1)
-      actionview (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activemodel (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    rails (7.2.2.2)
+      actioncable (= 7.2.2.2)
+      actionmailbox (= 7.2.2.2)
+      actionmailer (= 7.2.2.2)
+      actionpack (= 7.2.2.2)
+      actiontext (= 7.2.2.2)
+      actionview (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activemodel (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activestorage (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       bundler (>= 1.15.0)
-      railties (= 7.2.2.1)
+      railties (= 7.2.2.2)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    railties (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rake (13.3.0)
-    rdoc (6.14.1)
+    rdoc (6.15.0)
       erb
       psych (>= 4.0.0)
-    reline (0.6.1)
+      tsort
+    reline (0.6.2)
       io-console (~> 0.5)
     securerandom (0.4.1)
-    thor (1.3.2)
+    thor (1.4.0)
     timeout (0.4.3)
+    tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     useragent (0.16.11)
@@ -189,14 +191,15 @@ GEM
 
 PLATFORMS
   universal-java-1.8
+  universal-java-8
   universal-java-11
   universal-java-17
   universal-java-21
-  universal-java-8
+  universal-java-25
 
 DEPENDENCIES
-  activerecord-jdbcpostgresql-adapter (~> 70.0)
-  rails (~> 7.0)
+  activerecord-jdbcpostgresql-adapter (~> 72.1)
+  rails (~> 7.2.0)
 
 BUNDLED WITH
-   2.6.3
+   2.6.9

spec/sample_bundler/Gemfile.lock

@@ -5,10 +5,11 @@ GEM
 
 PLATFORMS
   universal-java-1.8
+  universal-java-8
   universal-java-11
   universal-java-17
   universal-java-21
-  universal-java-8
+  universal-java-25
 
 DEPENDENCIES
   rake (= 13.3.0)