build: bump org.springframework.boot:spring-boot-dependencies from 2.…

…7.16 to 3.4.1 (#3926)
elastic · Jan 21, 2025 · 03e60d1 · 03e60d1
1 parent ec88d18
commit 03e60d1
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 33 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
@@ -20,7 +20,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.4.0</version>
+                <version>3.4.1</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
@@ -23,7 +23,7 @@
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.4.0</version> <!-- update IT in case of major upgrade -->
+                <version>3.4.1</version> <!-- update IT in case of major upgrade -->
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/...st/java/co/elastic/apm/agent/springwebflux/Spring6ServerAnnotatedInstrumentationTest.java b/...st/java/co/elastic/apm/agent/springwebflux/Spring6ServerAnnotatedInstrumentationTest.java
@@ -19,7 +19,6 @@
 package co.elastic.apm.agent.springwebflux;
 
 import co.elastic.apm.agent.testutils.Java17OnlyTest;
-import org.junit.jupiter.api.BeforeEach;
 
 public class Spring6ServerAnnotatedInstrumentationTest extends Java17OnlyTest {
 
@@ -28,10 +27,5 @@ public Spring6ServerAnnotatedInstrumentationTest() {
     }
 
     public static class Impl extends ServerAnnotatedInstrumentationTest {
-
-        @BeforeEach
-        void setUp() {
-            expectedFrameworkVersion = "6.2.0";
-        }
     }
 }
diff --git a/...t/java/co/elastic/apm/agent/springwebflux/Spring6ServerFunctionalInstrumentationTest.java b/...t/java/co/elastic/apm/agent/springwebflux/Spring6ServerFunctionalInstrumentationTest.java
@@ -19,7 +19,6 @@
 package co.elastic.apm.agent.springwebflux;
 
 import co.elastic.apm.agent.testutils.Java17OnlyTest;
-import org.junit.jupiter.api.BeforeEach;
 
 public class Spring6ServerFunctionalInstrumentationTest extends Java17OnlyTest {
 
@@ -28,9 +27,5 @@ public Spring6ServerFunctionalInstrumentationTest() {
     }
 
     public static class Impl extends ServerFunctionalInstrumentationTest {
-        @BeforeEach
-        void setUp() {
-            expectedFrameworkVersion = "6.2.0";
-        }
     }
 }
diff --git a/...-plugin/src/test/java/co/elastic/apm/agent/springwebflux/Spring6ServletContainerTest.java b/...-plugin/src/test/java/co/elastic/apm/agent/springwebflux/Spring6ServletContainerTest.java
@@ -18,15 +18,9 @@
  */
 package co.elastic.apm.agent.springwebflux;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.condition.EnabledForJreRange;
 import org.junit.jupiter.api.condition.JRE;
 
 @EnabledForJreRange(min = JRE.JAVA_17)
 public class Spring6ServletContainerTest extends ServletContainerTest {
-
-    @BeforeEach
-    void setUp() {
-        expectedFrameworkVersion = "6.2.0";
-    }
 }
diff --git a/...5/src/test/java/co/elastic/apm/agent/springwebflux/AbstractServerInstrumentationTest.java b/...5/src/test/java/co/elastic/apm/agent/springwebflux/AbstractServerInstrumentationTest.java
@@ -38,6 +38,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
+import org.springframework.core.SpringVersion;
 import org.springframework.http.codec.ServerSentEvent;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.publisher.Hooks;
@@ -58,7 +59,6 @@ public abstract class AbstractServerInstrumentationTest extends AbstractInstrume
     private static final String BASIC_AUTH_HEADER_VALUE = "Basic ZWxhc3RpYzpjaGFuZ2VtZQ==";
 
     protected static WebFluxApplication.App app;
-    protected String expectedFrameworkVersion = "5.3.30";
     protected GreetingWebClient client;
 
     @BeforeAll
@@ -134,7 +134,7 @@ private void hello(boolean expectHeaders) {
 
             assertThat(headersCount)
                 .describedAs("unexpected headers count")
-                .isEqualTo(6);
+                .isGreaterThanOrEqualTo(6);
 
             assertThat(headers.getFirst("random-value"))
                 .describedAs("non-standard request headers should be captured")
@@ -452,11 +452,7 @@ protected ErrorCaptureImpl getFirstError() {
         return reporter.getFirstError(200);
     }
 
-    TransactionImpl checkTransaction(TransactionImpl transaction, String expectedName, String expectedMethod, int expectedStatus) {
-        return checkTransaction(transaction, expectedName, expectedMethod, expectedStatus, expectedFrameworkVersion);
-    }
-
-    static TransactionImpl checkTransaction(TransactionImpl transaction, String expectedName, String expectedMethod, int expectedStatus, String expectedFrameworkVersion) {
+    static TransactionImpl checkTransaction(TransactionImpl transaction, String expectedName, String expectedMethod, int expectedStatus) {
         assertThat(transaction.getType()).isEqualTo("request");
         assertThat(transaction.getNameAsString()).isEqualTo(expectedName);
 
@@ -473,7 +469,8 @@ static TransactionImpl checkTransaction(TransactionImpl transaction, String expe
             .isEqualTo("Spring Webflux");
 
         assertThat(transaction.getFrameworkVersion())
-            .isEqualTo(expectedFrameworkVersion);
+            .isNotBlank()
+            .isEqualTo(SpringVersion.getVersion());
 
         return transaction;
     }

diff --git a/...ebflux-spring5/src/test/java/co/elastic/apm/agent/springwebflux/ServletContainerTest.java b/...ebflux-spring5/src/test/java/co/elastic/apm/agent/springwebflux/ServletContainerTest.java
@@ -34,7 +34,6 @@ public class ServletContainerTest extends AbstractInstrumentationTest {
 
     protected static WebFluxApplication.App app;
     protected static GreetingWebClient client;
-    protected String expectedFrameworkVersion = "5.3.30";
 
     @BeforeAll
     static void startApp() {
@@ -75,7 +74,7 @@ void shouldOnlyCreateOneTransaction() throws InterruptedException {
         TransactionImpl transaction = reporter.getFirstTransaction(200);
 
         // transaction naming should be set by webflux instrumentation
-        AbstractServerInstrumentationTest.checkTransaction(transaction, "GET /functional/with-parameters/{id}", "GET", 200, expectedFrameworkVersion);
+        AbstractServerInstrumentationTest.checkTransaction(transaction, "GET /functional/with-parameters/{id}", "GET", 200);
 
         // transaction HTTP part should be provided by servlet instrumentation
         AbstractServerInstrumentationTest.checkUrl(client, transaction, "/with-parameters/42");

diff --git a/apm-agent-plugins/apm-spring-webflux/pom.xml b/apm-agent-plugins/apm-spring-webflux/pom.xml
@@ -18,7 +18,7 @@
 
         <!-- 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.0</version.spring-boot-3>
+        <version.spring-boot-3>3.4.1</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
@@ -22,7 +22,7 @@
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.4.0</version> <!-- must be 3.X to correspond to spring 6 -->
+                <version>3.4.1</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/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.0</version> <!-- must be 3.X to correspond to spring 6 -->
+                <version>3.4.1</version> <!-- must be 3.X to correspond to spring 6 -->
                 <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
@@ -30,7 +30,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.4.0</version>
+                <version>3.4.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>