From 3562debf510fdc40612db59e7aae4257ec1d71df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 17:50:32 +0000
Subject: [PATCH 1/4] Bump org.springframework.boot:spring-boot-dependencies

Bumps [org.springframework.boot:spring-boot-dependencies](https://github.com/spring-projects/spring-boot) from 2.7.16 to 3.2.4.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.16...v3.2.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../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 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

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 3f02160f34..23ed57c2ff 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.2.2</version>
+                <version>3.2.4</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 8d9a70f69f..bca1f77295 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.2.2</version> <!-- update IT in case of major upgrade -->
+                <version>3.2.4</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 51265fae3c..037d955ef9 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.2.2</version.spring-boot-3>
+        <version.spring-boot-2>3.2.4</version.spring-boot-2>
+        <version.spring-boot-3>3.2.4</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 f42d4482df..f8de744727 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.2.2</version> <!-- must be 3.X to correspond to spring 6 -->
+                <version>3.2.4</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 21a82e7866..0d96a6f3df 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.2.4</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 e3c4af3f60..026edfc79e 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.2.2</version> <!-- must be 3.X to correspond to spring 6 -->
+                <version>3.2.4</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 6e834687b2..e25e89ca3d 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.2.4</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 174007e9fe..677925b929 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.2.2</version>
+                <version>3.2.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

From eb131e4e9777921ada52102c9b7e2ef444f05461 Mon Sep 17 00:00:00 2001
From: Jonas Kunz <jonas.kunz@elastic.co>
Date: Tue, 2 Apr 2024 10:10:59 +0200
Subject: [PATCH 2/4] Update pom.xml

---
 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 037d955ef9..011a98a119 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.2.4</version.spring-boot-2>
+        <version.spring-boot-2>2.7.16</version.spring-boot-2>
         <version.spring-boot-3>3.2.4</version.spring-boot-3>
     </properties>
 

From fe605c4a3b9c1edd39532bb71fc096ceaa68258e Mon Sep 17 00:00:00 2001
From: Jonas Kunz <jonas.kunz@elastic.co>
Date: Tue, 2 Apr 2024 10:11:21 +0200
Subject: [PATCH 3/4] Update pom.xml

---
 .../apm-spring-webmvc/apm-spring-webmvc-spring5/pom.xml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 0d96a6f3df..21a82e7866 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.2.4</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>

From 18c195bf8c82f14745dba03b263c18db5ab8de95 Mon Sep 17 00:00:00 2001
From: Jonas Kunz <jonas.kunz@elastic.co>
Date: Tue, 2 Apr 2024 10:11:42 +0200
Subject: [PATCH 4/4] Update pom.xml

---
 integration-tests/spring-boot-2/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration-tests/spring-boot-2/pom.xml b/integration-tests/spring-boot-2/pom.xml
index e25e89ca3d..6e834687b2 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.2.4</version> <!-- no major upgrade here -->
+                <version>2.7.16</version> <!-- no major upgrade here -->
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>