From 59478c75fefb961e959167a83347bbc6dd973e09 Mon Sep 17 00:00:00 2001
From: jackshirazi <11161990+jackshirazi@users.noreply.github.com>
Date: Fri, 29 Sep 2023 09:18:42 +0000
Subject: [PATCH] Bump org.springframework.boot:spring-boot-dependencies from
 2.7.10 to 3.1.4 (#3330) Bump
 org.springframework.boot:spring-boot-dependencies

Bumps [org.springframework.boot:spring-boot-dependencies](https://github.com/spring-projects/spring-boot) from 2.7.10 to 3.1.4.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.10...v3.1.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>

* keep testing latest 2.x version

* keep 2.x where we need it
---
 .../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 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

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 51c26dbd3e..32685642e9 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
@@ -22,7 +22,7 @@
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.1.2</version> <!-- update IT in case of major upgrade -->
+                <version>3.1.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 d18cbde268..4cb515c007 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.10</version.spring-boot-2>
-        <version.spring-boot-3>3.1.2</version.spring-boot-3>
+        <version.spring-boot-2>2.7.16</version.spring-boot-2>
+        <version.spring-boot-3>3.1.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 1db03bbbce..e725b18695 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.1.2</version> <!-- must be 3.X to correspond to spring 6 -->
+                <version>3.1.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 278620fef0..ffbcbd6397 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.10</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/apm-agent-plugins/apm-spring-webmvc/pom.xml b/apm-agent-plugins/apm-spring-webmvc/pom.xml
index 6029a8bdd4..723e855b08 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.1.2</version> <!-- must be 3.X to correspond to spring 6 -->
+                <version>3.1.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 c1b48a7882..dcfe25524a 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.10</version> <!-- no major upgrade here -->
+                <version>2.7.16</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 bc2339eed8..23f0defbc5 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.1.2</version>
+                <version>3.1.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>