Merge pull request #4820 from liubao68/work

Bump spring boot from 3.3.5 to 3.4.5

Author: liubao68

demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/CodeFirstRestTemplateJaxrs.java

@@ -57,6 +57,6 @@ private void test404(RestOperations template) {
       }
     }
     TestMgr.check(404, exception.getStatusCode().value());
-    TestMgr.check("404 Not Found: \"{\"message\":\"Not Found\"}\"", exception.getMessage());
+    TestMgr.check(true, exception.getMessage().contains("404 Not Found"));
   }
 }

dependencies/default/pom.xml

@@ -71,7 +71,6 @@
     <mock-server.version>5.15.0</mock-server.version>
     <nacos-client.version>3.0.0</nacos-client.version>
     <netflix-commons.version>0.3.0</netflix-commons.version>
-    <netty.version>4.1.119.Final</netty.version>
     <okhttp3.version>4.12.0</okhttp3.version>
     <prometheus.version>0.16.0</prometheus.version>
     <protobuf.version>3.23.4</protobuf.version>
@@ -86,9 +85,8 @@
     <servlet-api.version>6.0.0</servlet-api.version>
     <slf4j.version>1.7.36</slf4j.version>
     <snakeyaml.version>2.4</snakeyaml.version>
-    <spring.version>6.1.10</spring.version>
     <swagger.version>2.2.29</swagger.version>
-    <vertx.version>4.5.14</vertx.version>
+    <vertx.version>4.5.15</vertx.version>
     <zipkin.version>3.5.1</zipkin.version>
     <zipkin-reporter.version>3.4.0</zipkin-reporter.version>
     <jetcd-core.version>0.8.5</jetcd-core.version>
@@ -230,14 +228,6 @@
         <version>${commons-logging.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-bom</artifactId>
-        <scope>import</scope>
-        <version>${netty.version}</version>
-        <type>pom</type>
-      </dependency>
-
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-model</artifactId>
@@ -495,14 +485,6 @@
         <version>${slf4j.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-framework-bom</artifactId>
-        <version>${spring.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>

pom.xml

@@ -67,7 +67,7 @@
     <site-maven-plugin.version>3.21.0</site-maven-plugin.version>
     <source-maven-plugin.version>3.3.0</source-maven-plugin.version>
     <spotbug-maven-plugin.version>4.9.3.0</spotbug-maven-plugin.version>
-    <spring-boot.version>3.3.5</spring-boot.version>
+    <spring-boot.version>3.4.5</spring-boot.version>
     <surefire-maven-plugin.version>3.5.3</surefire-maven-plugin.version>
     <!-- plugin version end -->
   </properties>

providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseClientHttpRequest.java

@@ -20,6 +20,7 @@
 import java.io.OutputStream;
 import java.lang.reflect.Type;
 import java.net.URI;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -150,6 +151,11 @@ public URI getURI() {
     return uri;
   }
 
+  @Override
+  public Map<String, Object> getAttributes() {
+    return Collections.emptyMap();
+  }
+
   @Override
   public HttpHeaders getHeaders() {
     return httpHeaders;