From fa4248ca6b77677b8a70cff1f1117b2d003ff6c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 May 2025 17:41:30 +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.4.5.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.11...v3.4.5)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-dependencies
  dependency-version: 3.4.5
  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 33cd39a8e7..0b4ed30ff1 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.4.5</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 378eee9006..41bf3fcdb4 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.4.4</version>
+                <version>3.4.5</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 6c1173c3b0..d957827d08 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.4.4</version>
+                <version>3.4.5</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 7d196e84b5..a1e0108baa 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.4.4</version> <!-- update IT in case of major upgrade -->
+                <version>3.4.5</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 1bf743301b..77d6fcb4fd 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.4.4</version.spring-boot-3>
+        <version.spring-boot-2>3.4.5</version.spring-boot-2>
+        <version.spring-boot-3>3.4.5</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 6d0dadc69d..4bce4800ea 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.4.4</version> <!-- must be 3.X to correspond to spring 6 -->
+                <version>3.4.5</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 25f34e4704..695c213c73 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.4.5</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 844e4603b8..4559f16d98 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.4.4</version> <!-- must be 3.X to correspond to spring 6 -->
+                <version>3.4.5</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 6fef9b154b..fe1f0b8ac7 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.4.5</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 a7b900b600..ed99b385bc 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.4.4</version>
+                <version>3.4.5</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

From 68266e8c5395b0a47588d501eb7775d6e15a0a2a Mon Sep 17 00:00:00 2001
From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>
Date: Tue, 6 May 2025 16:12:20 +0200
Subject: [PATCH 2/2] restore previous 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 0b4ed30ff1..33cd39a8e7 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.4.5</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 77d6fcb4fd..fbc10bbbea 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.4.5</version.spring-boot-2>
+        <version.spring-boot-2>2.7.16</version.spring-boot-2>
         <version.spring-boot-3>3.4.5</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 695c213c73..25f34e4704 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.4.5</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 fe1f0b8ac7..6fef9b154b 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.4.5</version> <!-- no major upgrade here -->
+                <version>2.7.16</version> <!-- no major upgrade here -->
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>