From 5ed78317232bfd506dc6f9b2627daf683a38c016 Mon Sep 17 00:00:00 2001
From: buildmaster <builds@springframework.org>
Date: Thu, 27 Apr 2023 15:08:33 +0000
Subject: [PATCH 1/5] Update SNAPSHOT to 3.1.7

---
 docs/pom.xml                                | 2 +-
 pom.xml                                     | 6 +++---
 spring-cloud-openfeign-core/pom.xml         | 2 +-
 spring-cloud-openfeign-dependencies/pom.xml | 4 ++--
 spring-cloud-starter-openfeign/pom.xml      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index 919082b4c..f59532ff1 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.1.7-SNAPSHOT</version>
+		<version>3.1.7</version>
 	</parent>
 	<scm>
 		<url>https://github.com/spring-cloud/spring-cloud-openfeign</url>
diff --git a/pom.xml b/pom.xml
index e9c5f1ff3..d9000b145 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,14 +4,14 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-openfeign</artifactId>
-	<version>3.1.7-SNAPSHOT</version>
+	<version>3.1.7</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud OpenFeign</name>
 	<description>Spring Cloud OpenFeign</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.7-SNAPSHOT</version>
+		<version>3.1.7</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -26,7 +26,7 @@
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.11.3</jackson.version>
-		<spring-cloud-commons.version>3.1.7-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-commons.version>3.1.6</spring-cloud-commons.version>
 
 		<!-- Plugin versions -->
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml
index 7607e3033..7c5321d33 100644
--- a/spring-cloud-openfeign-core/pom.xml
+++ b/spring-cloud-openfeign-core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.1.7-SNAPSHOT</version>
+		<version>3.1.7</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<scm>
diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml
index 27a8d3c57..a425cb67e 100644
--- a/spring-cloud-openfeign-dependencies/pom.xml
+++ b/spring-cloud-openfeign-dependencies/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.7-SNAPSHOT</version>
+		<version>3.1.7</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>3.1.7-SNAPSHOT</version>
+	<version>3.1.7</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-openfeign-dependencies</name>
 	<description>Spring Cloud OpenFeign Dependencies</description>
diff --git a/spring-cloud-starter-openfeign/pom.xml b/spring-cloud-starter-openfeign/pom.xml
index a2e0312fa..687dd3f9a 100644
--- a/spring-cloud-starter-openfeign/pom.xml
+++ b/spring-cloud-starter-openfeign/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.1.7-SNAPSHOT</version>
+		<version>3.1.7</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<scm>

From 5c021abb648c992a70f23fa25ce7796f53ec4235 Mon Sep 17 00:00:00 2001
From: buildmaster <builds@springframework.org>
Date: Thu, 27 Apr 2023 15:10:14 +0000
Subject: [PATCH 2/5] Going back to snapshots

---
 docs/pom.xml                                | 2 +-
 pom.xml                                     | 6 +++---
 spring-cloud-openfeign-core/pom.xml         | 2 +-
 spring-cloud-openfeign-dependencies/pom.xml | 4 ++--
 spring-cloud-starter-openfeign/pom.xml      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index f59532ff1..919082b4c 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.7-SNAPSHOT</version>
 	</parent>
 	<scm>
 		<url>https://github.com/spring-cloud/spring-cloud-openfeign</url>
diff --git a/pom.xml b/pom.xml
index d9000b145..e9c5f1ff3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,14 +4,14 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-openfeign</artifactId>
-	<version>3.1.7</version>
+	<version>3.1.7-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud OpenFeign</name>
 	<description>Spring Cloud OpenFeign</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.7-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -26,7 +26,7 @@
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.11.3</jackson.version>
-		<spring-cloud-commons.version>3.1.6</spring-cloud-commons.version>
+		<spring-cloud-commons.version>3.1.7-SNAPSHOT</spring-cloud-commons.version>
 
 		<!-- Plugin versions -->
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml
index 7c5321d33..7607e3033 100644
--- a/spring-cloud-openfeign-core/pom.xml
+++ b/spring-cloud-openfeign-core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.7-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<scm>
diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml
index a425cb67e..27a8d3c57 100644
--- a/spring-cloud-openfeign-dependencies/pom.xml
+++ b/spring-cloud-openfeign-dependencies/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.7</version>
+		<version>3.1.7-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>3.1.7</version>
+	<version>3.1.7-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-openfeign-dependencies</name>
 	<description>Spring Cloud OpenFeign Dependencies</description>
diff --git a/spring-cloud-starter-openfeign/pom.xml b/spring-cloud-starter-openfeign/pom.xml
index 687dd3f9a..a2e0312fa 100644
--- a/spring-cloud-starter-openfeign/pom.xml
+++ b/spring-cloud-starter-openfeign/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.1.7</version>
+		<version>3.1.7-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<scm>

From 35f28bdaedd38021a1ef3dc8cb83683bae5575ad Mon Sep 17 00:00:00 2001
From: buildmaster <builds@springframework.org>
Date: Thu, 27 Apr 2023 15:10:15 +0000
Subject: [PATCH 3/5] Bumping versions to 3.1.8-SNAPSHOT after release

---
 docs/pom.xml                                | 2 +-
 pom.xml                                     | 6 +++---
 spring-cloud-openfeign-core/pom.xml         | 2 +-
 spring-cloud-openfeign-dependencies/pom.xml | 4 ++--
 spring-cloud-starter-openfeign/pom.xml      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index 919082b4c..8622d0f34 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.1.7-SNAPSHOT</version>
+		<version>3.1.8-SNAPSHOT</version>
 	</parent>
 	<scm>
 		<url>https://github.com/spring-cloud/spring-cloud-openfeign</url>
diff --git a/pom.xml b/pom.xml
index e9c5f1ff3..685b75afa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,14 +4,14 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-openfeign</artifactId>
-	<version>3.1.7-SNAPSHOT</version>
+	<version>3.1.8-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud OpenFeign</name>
 	<description>Spring Cloud OpenFeign</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.7-SNAPSHOT</version>
+		<version>3.1.8-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -26,7 +26,7 @@
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.11.3</jackson.version>
-		<spring-cloud-commons.version>3.1.7-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-commons.version>3.1.6</spring-cloud-commons.version>
 
 		<!-- Plugin versions -->
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml
index 7607e3033..678631cb3 100644
--- a/spring-cloud-openfeign-core/pom.xml
+++ b/spring-cloud-openfeign-core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.1.7-SNAPSHOT</version>
+		<version>3.1.8-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<scm>
diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml
index 27a8d3c57..daadf9e4f 100644
--- a/spring-cloud-openfeign-dependencies/pom.xml
+++ b/spring-cloud-openfeign-dependencies/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.7-SNAPSHOT</version>
+		<version>3.1.8-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>3.1.7-SNAPSHOT</version>
+	<version>3.1.8-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-openfeign-dependencies</name>
 	<description>Spring Cloud OpenFeign Dependencies</description>
diff --git a/spring-cloud-starter-openfeign/pom.xml b/spring-cloud-starter-openfeign/pom.xml
index a2e0312fa..24e8fa332 100644
--- a/spring-cloud-starter-openfeign/pom.xml
+++ b/spring-cloud-starter-openfeign/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-openfeign</artifactId>
-		<version>3.1.7-SNAPSHOT</version>
+		<version>3.1.8-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<scm>

From 04da64895954f325c1835eeb349e0bfd1685b804 Mon Sep 17 00:00:00 2001
From: buildmaster <builds@springframework.org>
Date: Fri, 28 Apr 2023 10:52:43 +0000
Subject: [PATCH 4/5] Bumping versions

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 685b75afa..4431ef8a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.11.3</jackson.version>
-		<spring-cloud-commons.version>3.1.6</spring-cloud-commons.version>
+		<spring-cloud-commons.version>3.1.7-SNAPSHOT</spring-cloud-commons.version>
 
 		<!-- Plugin versions -->
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>

From 4b3c0d0039318938da18b5747e70117393a3f515 Mon Sep 17 00:00:00 2001
From: Olga MaciaszekSharma <olga.maciaszek@gmail.com>
Date: Tue, 30 May 2023 15:36:03 +0200
Subject: [PATCH 5/5] Remove vulnerable commons-fileupload dependency. Fixes
 gh-853.

---
 spring-cloud-openfeign-core/pom.xml         |  8 ++++++++
 spring-cloud-openfeign-dependencies/pom.xml | 11 +++++++++++
 2 files changed, 19 insertions(+)

diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml
index 678631cb3..94cc1c986 100644
--- a/spring-cloud-openfeign-core/pom.xml
+++ b/spring-cloud-openfeign-core/pom.xml
@@ -108,8 +108,16 @@
 					<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 daadf9e4f..2bacd1298 100644
--- a/spring-cloud-openfeign-dependencies/pom.xml
+++ b/spring-cloud-openfeign-dependencies/pom.xml
@@ -48,6 +48,17 @@
 				<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>