From df6275aee6d2679c2c43ad772299808d49e335c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Nov 2025 17:20:16 +0000
Subject: [PATCH 1/2] build: bump
 org.springframework.boot:spring-boot-dependencies

Bumps [org.springframework.boot:spring-boot-dependencies](https://github.com/spring-projects/spring-boot) from 2.7.11 to 3.5.7.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.11...v3.5.7)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-dependencies
  dependency-version: 3.5.7
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apm-agent-plugins/apm-rabbitmq/apm-rabbitmq-spring5/pom.xml   | 2 +-
 .../apm-rabbitmq/apm-rabbitmq-test-spring6/pom.xml            | 2 +-
 .../apm-spring-restclient-test/pom.xml                        | 2 +-
 .../apm-spring-resttemplate-plugin/pom.xml                    | 2 +-
 apm-agent-plugins/apm-spring-webflux/pom.xml                  | 4 ++--
 .../apm-spring-webmvc/apm-spring-webmvc-plugin/pom.xml        | 2 +-
 .../apm-spring-webmvc/apm-spring-webmvc-spring5/pom.xml       | 2 +-
 apm-agent-plugins/apm-spring-webmvc/pom.xml                   | 2 +-
 integration-tests/spring-boot-2/pom.xml                       | 2 +-
 integration-tests/spring-boot-3/pom.xml                       | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/apm-agent-plugins/apm-rabbitmq/apm-rabbitmq-spring5/pom.xml b/apm-agent-plugins/apm-rabbitmq/apm-rabbitmq-spring5/pom.xml
index a2c20f76fd..63ef224937 100644
--- a/apm-agent-plugins/apm-rabbitmq/apm-rabbitmq-spring5/pom.xml
+++ b/apm-agent-plugins/apm-rabbitmq/apm-rabbitmq-spring5/pom.xml
@@ -22,7 +22,7 @@
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.7.11</version> <!-- must be 2.x, do not upgrade further-->
+                <version>3.5.7</version> <!-- must be 2.x, do not upgrade further-->
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/apm-agent-plugins/apm-rabbitmq/apm-rabbitmq-test-spring6/pom.xml b/apm-agent-plugins/apm-rabbitmq/apm-rabbitmq-test-spring6/pom.xml
index ba7d0ab904..5c8e3934cc 100644
--- a/apm-agent-plugins/apm-rabbitmq/apm-rabbitmq-test-spring6/pom.xml
+++ b/apm-agent-plugins/apm-rabbitmq/apm-rabbitmq-test-spring6/pom.xml
@@ -23,7 +23,7 @@
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.5.6</version>
+                <version>3.5.7</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/apm-agent-plugins/apm-spring-resttemplate/apm-spring-restclient-test/pom.xml b/apm-agent-plugins/apm-spring-resttemplate/apm-spring-restclient-test/pom.xml
index 7f598b0564..d7f481b221 100644
--- a/apm-agent-plugins/apm-spring-resttemplate/apm-spring-restclient-test/pom.xml
+++ b/apm-agent-plugins/apm-spring-resttemplate/apm-spring-restclient-test/pom.xml
@@ -20,7 +20,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.5.6</version>
+                <version>3.5.7</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/apm-agent-plugins/apm-spring-resttemplate/apm-spring-resttemplate-plugin/pom.xml b/apm-agent-plugins/apm-spring-resttemplate/apm-spring-resttemplate-plugin/pom.xml
index 75ff39b3b2..6a6c95d7e8 100644
--- a/apm-agent-plugins/apm-spring-resttemplate/apm-spring-resttemplate-plugin/pom.xml
+++ b/apm-agent-plugins/apm-spring-resttemplate/apm-spring-resttemplate-plugin/pom.xml
@@ -23,7 +23,7 @@
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.5.6</version> <!-- update IT in case of major upgrade -->
+                <version>3.5.7</version> <!-- update IT in case of major upgrade -->
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/apm-agent-plugins/apm-spring-webflux/pom.xml b/apm-agent-plugins/apm-spring-webflux/pom.xml
index 2ac9152327..38ecf7ccbe 100644
--- a/apm-agent-plugins/apm-spring-webflux/pom.xml
+++ b/apm-agent-plugins/apm-spring-webflux/pom.xml
@@ -17,8 +17,8 @@
         <apm-agent-parent.base.dir>${project.basedir}/../..</apm-agent-parent.base.dir>
 
         <!-- spring boot version to use for dependency management & testing -->
-        <version.spring-boot-2>2.7.16</version.spring-boot-2>
-        <version.spring-boot-3>3.5.6</version.spring-boot-3>
+        <version.spring-boot-2>3.5.7</version.spring-boot-2>
+        <version.spring-boot-3>3.5.7</version.spring-boot-3>
     </properties>
 
     <modules>
diff --git a/apm-agent-plugins/apm-spring-webmvc/apm-spring-webmvc-plugin/pom.xml b/apm-agent-plugins/apm-spring-webmvc/apm-spring-webmvc-plugin/pom.xml
index 235fc06c59..7fad5279e2 100644
--- a/apm-agent-plugins/apm-spring-webmvc/apm-spring-webmvc-plugin/pom.xml
+++ b/apm-agent-plugins/apm-spring-webmvc/apm-spring-webmvc-plugin/pom.xml
@@ -22,7 +22,7 @@
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.5.6</version> <!-- must be 3.X to correspond to spring 6 -->
+                <version>3.5.7</version> <!-- must be 3.X to correspond to spring 6 -->
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/apm-agent-plugins/apm-spring-webmvc/apm-spring-webmvc-spring5/pom.xml b/apm-agent-plugins/apm-spring-webmvc/apm-spring-webmvc-spring5/pom.xml
index 37f27fb049..3d5b2c50d8 100644
--- a/apm-agent-plugins/apm-spring-webmvc/apm-spring-webmvc-spring5/pom.xml
+++ b/apm-agent-plugins/apm-spring-webmvc/apm-spring-webmvc-spring5/pom.xml
@@ -24,7 +24,7 @@
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.7.16</version> <!-- must be 2.X to correspond to spring 5 -->
+                <version>3.5.7</version> <!-- must be 2.X to correspond to spring 5 -->
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/apm-agent-plugins/apm-spring-webmvc/pom.xml b/apm-agent-plugins/apm-spring-webmvc/pom.xml
index 564423b249..e0bef6185c 100644
--- a/apm-agent-plugins/apm-spring-webmvc/pom.xml
+++ b/apm-agent-plugins/apm-spring-webmvc/pom.xml
@@ -29,7 +29,7 @@
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.5.6</version> <!-- must be 3.X to correspond to spring 6 -->
+                <version>3.5.7</version> <!-- must be 3.X to correspond to spring 6 -->
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/integration-tests/spring-boot-2/pom.xml b/integration-tests/spring-boot-2/pom.xml
index 63d62ae507..4b60fe987e 100644
--- a/integration-tests/spring-boot-2/pom.xml
+++ b/integration-tests/spring-boot-2/pom.xml
@@ -31,7 +31,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.7.16</version> <!-- no major upgrade here -->
+                <version>3.5.7</version> <!-- no major upgrade here -->
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/integration-tests/spring-boot-3/pom.xml b/integration-tests/spring-boot-3/pom.xml
index c8dc6e04de..752b953142 100644
--- a/integration-tests/spring-boot-3/pom.xml
+++ b/integration-tests/spring-boot-3/pom.xml
@@ -30,7 +30,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.5.6</version>
+                <version>3.5.7</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

From 502a7b6190fc648d187c3c05683cbfda7fdc59ce Mon Sep 17 00:00:00 2001
From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>
Date: Wed, 5 Nov 2025 08:56:22 +0100
Subject: [PATCH 2/2] restore older versions

---
 apm-agent-plugins/apm-rabbitmq/apm-rabbitmq-spring5/pom.xml     | 2 +-
 apm-agent-plugins/apm-spring-webflux/pom.xml                    | 2 +-
 .../apm-spring-webmvc/apm-spring-webmvc-spring5/pom.xml         | 2 +-
 integration-tests/spring-boot-2/pom.xml                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apm-agent-plugins/apm-rabbitmq/apm-rabbitmq-spring5/pom.xml b/apm-agent-plugins/apm-rabbitmq/apm-rabbitmq-spring5/pom.xml
index 63ef224937..a2c20f76fd 100644
--- a/apm-agent-plugins/apm-rabbitmq/apm-rabbitmq-spring5/pom.xml
+++ b/apm-agent-plugins/apm-rabbitmq/apm-rabbitmq-spring5/pom.xml
@@ -22,7 +22,7 @@
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.5.7</version> <!-- must be 2.x, do not upgrade further-->
+                <version>2.7.11</version> <!-- must be 2.x, do not upgrade further-->
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/apm-agent-plugins/apm-spring-webflux/pom.xml b/apm-agent-plugins/apm-spring-webflux/pom.xml
index 38ecf7ccbe..9412f19b55 100644
--- a/apm-agent-plugins/apm-spring-webflux/pom.xml
+++ b/apm-agent-plugins/apm-spring-webflux/pom.xml
@@ -17,7 +17,7 @@
         <apm-agent-parent.base.dir>${project.basedir}/../..</apm-agent-parent.base.dir>
 
         <!-- spring boot version to use for dependency management & testing -->
-        <version.spring-boot-2>3.5.7</version.spring-boot-2>
+        <version.spring-boot-2>2.7.16</version.spring-boot-2>
         <version.spring-boot-3>3.5.7</version.spring-boot-3>
     </properties>
 
diff --git a/apm-agent-plugins/apm-spring-webmvc/apm-spring-webmvc-spring5/pom.xml b/apm-agent-plugins/apm-spring-webmvc/apm-spring-webmvc-spring5/pom.xml
index 3d5b2c50d8..37f27fb049 100644
--- a/apm-agent-plugins/apm-spring-webmvc/apm-spring-webmvc-spring5/pom.xml
+++ b/apm-agent-plugins/apm-spring-webmvc/apm-spring-webmvc-spring5/pom.xml
@@ -24,7 +24,7 @@
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.5.7</version> <!-- must be 2.X to correspond to spring 5 -->
+                <version>2.7.16</version> <!-- must be 2.X to correspond to spring 5 -->
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/integration-tests/spring-boot-2/pom.xml b/integration-tests/spring-boot-2/pom.xml
index 4b60fe987e..63d62ae507 100644
--- a/integration-tests/spring-boot-2/pom.xml
+++ b/integration-tests/spring-boot-2/pom.xml
@@ -31,7 +31,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.5.7</version> <!-- no major upgrade here -->
+                <version>2.7.16</version> <!-- no major upgrade here -->
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>