Upgrade Spring Boot 4.0.2, Spring Framework 7.0.3, Spring Cloud OpenFeign 5.0.1

form-spring/src/test/java/feign/form/feign/spring/Client.java

@@ -25,10 +25,9 @@
 import feign.form.spring.SpringFormEncoder;
 import java.util.List;
 import java.util.Map;
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.support.FeignHttpMessageConverters;
 import org.springframework.cloud.openfeign.support.SpringEncoder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -91,10 +90,8 @@ String upload4(
 
   class ClientConfiguration {
 
-    @Autowired private ObjectFactory<HttpMessageConverters> messageConverters;
-
     @Bean
-    Encoder feignEncoder() {
+    Encoder feignEncoder(ObjectProvider<FeignHttpMessageConverters> messageConverters) {
       return new SpringFormEncoder(new SpringEncoder(messageConverters));
     }
 

form-spring/src/test/java/feign/form/feign/spring/DownloadClient.java

@@ -18,14 +18,12 @@
 import feign.Logger;
 import feign.codec.Decoder;
 import feign.form.spring.converter.SpringManyMultipartFilesReader;
-import java.util.ArrayList;
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.support.FeignHttpMessageConverters;
+import org.springframework.cloud.openfeign.support.HttpMessageConverterCustomizer;
 import org.springframework.cloud.openfeign.support.SpringDecoder;
 import org.springframework.context.annotation.Bean;
-import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.multipart.MultipartFile;
@@ -41,26 +39,14 @@ interface DownloadClient {
 
   class ClientConfiguration {
 
-    @Autowired private ObjectFactory<HttpMessageConverters> messageConverters;
-
     @Bean
-    Decoder feignDecoder() {
-      var springConverters = messageConverters.getObject().getConverters();
-      var decoderConverters = new ArrayList<HttpMessageConverter<?>>(springConverters.size() + 1);
-
-      decoderConverters.addAll(springConverters);
-      decoderConverters.add(new SpringManyMultipartFilesReader(4096));
-
-      var httpMessageConverters = new HttpMessageConverters(decoderConverters);
-
-      return new SpringDecoder(
-          new ObjectFactory<HttpMessageConverters>() {
+    HttpMessageConverterCustomizer multipartConverterCustomizer() {
+      return converters -> converters.add(new SpringManyMultipartFilesReader(4096));
+    }
 
-            @Override
-            public HttpMessageConverters getObject() {
-              return httpMessageConverters;
-            }
-          });
+    @Bean
+    Decoder feignDecoder(ObjectProvider<FeignHttpMessageConverters> messageConverters) {
+      return new SpringDecoder(messageConverters);
     }
 
     @Bean

form-spring/src/test/java/feign/form/feign/spring/converter/SpringManyMultipartFilesReaderTest.java

@@ -15,7 +15,6 @@
  */
 package feign.form.feign.spring.converter;
 
-import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
 import static org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE;
@@ -84,9 +83,8 @@ public InputStream getBody() throws IOException {
     @Override
     public HttpHeaders getHeaders() {
       var httpHeaders = new HttpHeaders();
-      httpHeaders.put(
-          CONTENT_TYPE,
-          singletonList(MULTIPART_FORM_DATA_VALUE + "; boundary=" + DUMMY_MULTIPART_BOUNDARY));
+      httpHeaders.set(
+          CONTENT_TYPE, MULTIPART_FORM_DATA_VALUE + "; boundary=" + DUMMY_MULTIPART_BOUNDARY);
       return httpHeaders;
     }
   }

java11/src/test/java/feign/http2client/test/Http2ClientAsyncTest.java

@@ -460,7 +460,7 @@ void configKeyUsesChildType() throws Exception {
 
   private <T> T unwrap(CompletableFuture<T> cf) throws Throwable {
     try {
-      return cf.get(1, TimeUnit.SECONDS);
+      return cf.get(10, TimeUnit.SECONDS);
     } catch (final ExecutionException e) {
       throw e.getCause();
     }

pom.xml

@@ -165,7 +165,7 @@
     <moshi.version>1.15.2</moshi.version>
     <slf4j.version>2.0.17</slf4j.version>
     <json.version>20250517</json.version>
-    <springboot.version>3.5.6</springboot.version>
+    <springboot.version>4.0.2</springboot.version>
 
     <junit5.version>6.0.2</junit5.version>
     <jackson.version>2.21.0</jackson.version>
@@ -237,9 +237,9 @@
     <saaj-impl-1.version>1.5.3</saaj-impl-1.version>
     <saaj-impl-3.version>3.0.2</saaj-impl-3.version>
     <spring-cloud-dependencies.version>2025.1.1</spring-cloud-dependencies.version>
-    <spring-cloud-starter-openfeign.version>4.3.0</spring-cloud-starter-openfeign.version>
+    <spring-cloud-starter-openfeign.version>5.0.1</spring-cloud-starter-openfeign.version>
     <spring-context.version>7.0.3</spring-context.version>
-    <spring-web.version>6.2.11</spring-web.version>
+    <spring-web.version>7.0.3</spring-web.version>
     <undertow-core.version>2.3.23.Final</undertow-core.version>
     <utils-java.version>1.18.0</utils-java.version>
   </properties>

spring/pom.xml

@@ -31,7 +31,7 @@
 
   <properties>
     <main.java.version>17</main.java.version>
-    <spring.version>6.2.11</spring.version>
+    <spring.version>7.0.3</spring.version>
   </properties>
 
   <dependencies>