From bf338f9b1517264c5ec4b34612dd86e0ddc5f3f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 May 2025 18:00:18 +0000
Subject: [PATCH 1/4] 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-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 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-spring-webflux/pom.xml b/apm-agent-plugins/apm-spring-webflux/pom.xml
index fbc10bbbea..77d6fcb4fd 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>2.7.16</version.spring-boot-2>
+        <version.spring-boot-2>3.4.5</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 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/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>

From a9953dbe33f1bfcfd8a3e3d4d3d46f8e0aed86f5 Mon Sep 17 00:00:00 2001
From: jackshirazi <jack.shirazi@elastic.co>
Date: Mon, 12 May 2025 20:12:38 +0100
Subject: [PATCH 2/4] revert

---
 apm-agent-plugins/apm-rabbitmq/apm-rabbitmq-spring5/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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>

From 21eb199f3642896e6373165de0aae94cb6d8cbbc Mon Sep 17 00:00:00 2001
From: jackshirazi <jack.shirazi@elastic.co>
Date: Mon, 12 May 2025 20:13:50 +0100
Subject: [PATCH 3/4] revert

---
 apm-agent-plugins/apm-spring-webflux/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apm-agent-plugins/apm-spring-webflux/pom.xml b/apm-agent-plugins/apm-spring-webflux/pom.xml
index 77d6fcb4fd..821ca60c9a 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.11</version.spring-boot-2>
         <version.spring-boot-3>3.4.5</version.spring-boot-3>
     </properties>
 

From 27b2af05526e307fc1aed6e0952df797e270d98c Mon Sep 17 00:00:00 2001
From: jackshirazi <jack.shirazi@elastic.co>
Date: Mon, 12 May 2025 20:14:19 +0100
Subject: [PATCH 4/4] revert

---
 apm-agent-plugins/apm-spring-webflux/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apm-agent-plugins/apm-spring-webflux/pom.xml b/apm-agent-plugins/apm-spring-webflux/pom.xml
index 821ca60c9a..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>2.7.11</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>