From c565eae3aa178636e5db4121012fd8123cecada3 Mon Sep 17 00:00:00 2001
From: DidierLoiseau <didierloiseau+github@gmail.com>
Date: Fri, 11 Oct 2024 23:52:23 +0200
Subject: [PATCH 1/2] fix #1102: feign-form-spring relocated under
 io.github.openfeign

---
 spring-cloud-openfeign-core/pom.xml         | 12 ++----------
 spring-cloud-openfeign-dependencies/pom.xml | 17 -----------------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml
index d37b5dc4b..18a08207e 100644
--- a/spring-cloud-openfeign-core/pom.xml
+++ b/spring-cloud-openfeign-core/pom.xml
@@ -91,24 +91,16 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>io.github.openfeign.form</groupId>
+			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-form-spring</artifactId>
 			<exclusions>
-<!--				Vulnerable in 3.8.0-->
+<!--				Still vulnerable in 13.5-->
 				<exclusion>
 					<groupId>commons-io</groupId>
 					<artifactId>commons-io</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>commons-fileupload</groupId>
-					<artifactId>commons-fileupload</artifactId>
-				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-slf4j</artifactId>
diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml
index f354ab9c1..60738dc55 100644
--- a/spring-cloud-openfeign-dependencies/pom.xml
+++ b/spring-cloud-openfeign-dependencies/pom.xml
@@ -16,7 +16,6 @@
 	<description>Spring Cloud OpenFeign Dependencies</description>
 	<properties>
 		<feign.version>13.5</feign.version>
-		<feign-form.version>3.8.0</feign-form.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -37,22 +36,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>io.github.openfeign.form</groupId>
-				<artifactId>feign-form-spring</artifactId>
-				<version>${feign-form.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>commons-fileupload</groupId>
-						<artifactId>commons-fileupload</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>commons-fileupload</groupId>
-				<artifactId>commons-fileupload</artifactId>
-				<version>1.5</version>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<profiles>

From ef436ca8015f794063044de3d2798a419192f5f5 Mon Sep 17 00:00:00 2001
From: DidierLoiseau <didierloiseau+github@gmail.com>
Date: Sat, 12 Oct 2024 00:27:04 +0200
Subject: [PATCH 2/2] fix #1102: also remove exclusion for commons-io,
 dependants will need it

---
 spring-cloud-openfeign-core/pom.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml
index 18a08207e..b6d17a9d3 100644
--- a/spring-cloud-openfeign-core/pom.xml
+++ b/spring-cloud-openfeign-core/pom.xml
@@ -93,13 +93,6 @@
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-form-spring</artifactId>
-			<exclusions>
-<!--				Still vulnerable in 13.5-->
-				<exclusion>
-					<groupId>commons-io</groupId>
-					<artifactId>commons-io</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>