From 63fe594c90d563f13944a114618e308c3f586eda Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Oct 2026 03:33:23 +0000
Subject: [PATCH 1/2] build(deps): bump the maven-deps group across 2
 directories with 1 update

Bumps the maven-deps group with 1 update in the /integration/rails7_test directory: org.eclipse.jetty.ee11:jetty-ee11-maven-plugin.
Bumps the maven-deps group with 1 update in the /integration/simple_rack_test directory: org.eclipse.jetty.ee11:jetty-ee11-maven-plugin.


Updates `org.eclipse.jetty.ee11:jetty-ee11-maven-plugin` from 12.1.13 to 12.1.14

Updates `org.eclipse.jetty.ee11:jetty-ee11-maven-plugin` from 12.1.13 to 12.1.14

---
updated-dependencies:
- dependency-name: org.eclipse.jetty.ee11:jetty-ee11-maven-plugin
  dependency-version: 12.1.14
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: maven-deps
- dependency-name: org.eclipse.jetty.ee11:jetty-ee11-maven-plugin
  dependency-version: 12.1.14
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: maven-deps
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 integration/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/integration/pom.xml b/integration/pom.xml
index b0cf21a2..7fcf33c7 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -31,7 +31,7 @@
       <properties>
         <jetty-maven-plugin.group>org.eclipse.jetty.ee8</jetty-maven-plugin.group>
         <jetty-maven-plugin.artifact>jetty-ee8-maven-plugin</jetty-maven-plugin.artifact>
-        <jetty-maven-plugin.version>12.1.13</jetty-maven-plugin.version>
+        <jetty-maven-plugin.version>12.1.14</jetty-maven-plugin.version>
       </properties>
     </profile>
     <profile>
@@ -42,7 +42,7 @@
       <properties>
         <jetty-maven-plugin.group>org.eclipse.jetty.ee11</jetty-maven-plugin.group>
         <jetty-maven-plugin.artifact>jetty-ee11-maven-plugin</jetty-maven-plugin.artifact>
-        <jetty-maven-plugin.version>12.1.13</jetty-maven-plugin.version>
+        <jetty-maven-plugin.version>12.1.14</jetty-maven-plugin.version>
       </properties>
     </profile>
   </profiles>

From 5a809dd92c408e49ba38cc9543f8ec5a964b0843 Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@auctionet.com>
Date: Tue, 13 Oct 2026 12:16:23 +0200
Subject: [PATCH 2/2] test: install rack in simple_rack_test instead of relying
 on build order

simple_rack_test packages rack ~> 2.2.0 via config/warble.rb, but never
installed it. With jruby-rack 1.3/2.0 it arrives as a dependency; jruby-rack
1.2 has none, so the test only passed when rails7_test happened to run first
and bundle-install rack into the shared gem home. The invoker plugin's
directory order is not stable, so the jruby-rack 1.2 integration jobs failed
with Gem::MissingSpecError when simple_rack_test ran first.
---
 integration/simple_rack_test/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/integration/simple_rack_test/pom.xml b/integration/simple_rack_test/pom.xml
index 6b6a0de6..b7c5938f 100644
--- a/integration/simple_rack_test/pom.xml
+++ b/integration/simple_rack_test/pom.xml
@@ -18,6 +18,16 @@
         <groupId>org.jruby.maven</groupId>
         <artifactId>jruby-maven-plugin</artifactId>
         <executions>
+          <!-- config/warble.rb packages rack, but jruby-rack 1.2 (unlike 1.3+) does not depend on it,
+               and we must not rely on another integration project having installed it into the shared gem home -->
+          <execution>
+            <id>install-rack</id>
+            <phase>initialize</phase>
+            <goals><goal>jruby</goal></goals>
+            <configuration>
+              <args>-S gem install --no-document --conservative rack:~&gt;2.2.0</args>
+            </configuration>
+          </execution>
           <execution>
             <id>warble</id>
             <phase>pre-integration-test</phase>