From c81c8d7ffe0e15e0d14c0ead74bca5bcc1ae5ba8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Nov 2025 05:13:49 +0000
Subject: [PATCH 1/2] build(deps): Bump org.springframework:spring-web from
 6.2.11 to 7.0.0

Bumps [org.springframework:spring-web](https://github.com/spring-projects/spring-framework) from 6.2.11 to 7.0.0.
- [Release notes](https://github.com/spring-projects/spring-framework/releases)
- [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.11...v7.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml        | 2 +-
 spring/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 707ed3459..e40794d3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -240,7 +240,7 @@
     <spring-cloud-dependencies.version>2025.0.0</spring-cloud-dependencies.version>
     <spring-cloud-starter-openfeign.version>4.3.0</spring-cloud-starter-openfeign.version>
     <spring-context.version>7.0.0</spring-context.version>
-    <spring-web.version>6.2.11</spring-web.version>
+    <spring-web.version>7.0.0</spring-web.version>
     <undertow-core.version>2.3.20.Final</undertow-core.version>
     <utils-java.version>1.18.0</utils-java.version>
   </properties>
diff --git a/spring/pom.xml b/spring/pom.xml
index dedbc8aa8..771797ab3 100644
--- a/spring/pom.xml
+++ b/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.0</spring.version>
   </properties>
 
   <dependencies>

From 8e909606418ed887a7bbdc859305b8650aa705ab Mon Sep 17 00:00:00 2001
From: Marvin Froeder <velo.br@gmail.com>
Date: Wed, 19 Nov 2025 08:02:04 -0300
Subject: [PATCH 2/2] fix: adapt to Spring 7.0 HttpHeaders API changes

Signed-off-by: Marvin Froeder <velo.br@gmail.com>
---
 .../converter/SpringManyMultipartFilesReaderTest.java       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/form-spring/src/test/java/feign/form/feign/spring/converter/SpringManyMultipartFilesReaderTest.java b/form-spring/src/test/java/feign/form/feign/spring/converter/SpringManyMultipartFilesReaderTest.java
index 9fcded4c2..94fff8aaf 100644
--- a/form-spring/src/test/java/feign/form/feign/spring/converter/SpringManyMultipartFilesReaderTest.java
+++ b/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;
@@ -85,9 +84,8 @@ public InputStream getBody() throws IOException {
     @Override
     public HttpHeaders getHeaders() {
       val 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;
     }
   }