From 92e5d92e52fa02995aa257125a42e9c2f9e57107 Mon Sep 17 00:00:00 2001
From: buildmaster <builds@springframework.org>
Date: Thu, 29 Jun 2023 11:25:55 +0000
Subject: [PATCH 1/6] Update SNAPSHOT to 3.1.8

---
 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 8622d0f3..b1fb00a0 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.8-SNAPSHOT</version>
+		<version>3.1.8</version>
 	</parent>
 	<scm>
 		<url>https://github.com/spring-cloud/spring-cloud-openfeign</url>
diff --git a/pom.xml b/pom.xml
index 4431ef8a..c4e070d4 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.8-SNAPSHOT</version>
+	<version>3.1.8</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.8-SNAPSHOT</version>
+		<version>3.1.8</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.7</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 94cc1c98..e15dc7f1 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.8-SNAPSHOT</version>
+		<version>3.1.8</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 2bacd129..46460218 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.8-SNAPSHOT</version>
+		<version>3.1.8</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>3.1.8-SNAPSHOT</version>
+	<version>3.1.8</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 24e8fa33..2fab95a0 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.8-SNAPSHOT</version>
+		<version>3.1.8</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<scm>

From a0ca64a90f807d4e7b39c589a9826e03493d44af Mon Sep 17 00:00:00 2001
From: buildmaster <builds@springframework.org>
Date: Thu, 29 Jun 2023 11:27:26 +0000
Subject: [PATCH 2/6] 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 b1fb00a0..8622d0f3 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.8</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 c4e070d4..4431ef8a 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.8</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.8</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</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 e15dc7f1..94cc1c98 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.8</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 46460218..2bacd129 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.8</version>
+		<version>3.1.8-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>3.1.8</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 2fab95a0..24e8fa33 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.8</version>
+		<version>3.1.8-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<scm>

From 45d28abb49e32ae73453fadf5d1cf0810cea67bc Mon Sep 17 00:00:00 2001
From: buildmaster <builds@springframework.org>
Date: Thu, 29 Jun 2023 11:27:26 +0000
Subject: [PATCH 3/6] Bumping versions to 3.1.9-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 8622d0f3..900ae162 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.8-SNAPSHOT</version>
+		<version>3.1.9-SNAPSHOT</version>
 	</parent>
 	<scm>
 		<url>https://github.com/spring-cloud/spring-cloud-openfeign</url>
diff --git a/pom.xml b/pom.xml
index 4431ef8a..d1ce200a 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.8-SNAPSHOT</version>
+	<version>3.1.9-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.8-SNAPSHOT</version>
+		<version>3.1.9-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.8-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 94cc1c98..96a636f0 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.8-SNAPSHOT</version>
+		<version>3.1.9-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 2bacd129..2d22b1c8 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.8-SNAPSHOT</version>
+		<version>3.1.9-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>3.1.8-SNAPSHOT</version>
+	<version>3.1.9-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 24e8fa33..1519b9ef 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.8-SNAPSHOT</version>
+		<version>3.1.9-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<scm>

From a0dafafc3fa00624d4949fd0477352a33c5b22e3 Mon Sep 17 00:00:00 2001
From: Olga MaciaszekSharma <omaciaszeksh@vmware.com>
Date: Mon, 18 Sep 2023 14:49:54 +0200
Subject: [PATCH 4/6] Fix readme links.

---
 README.adoc                        | 4 ++--
 docs/src/main/asciidoc/README.adoc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.adoc b/README.adoc
index cb097fff..b83914ee 100644
--- a/README.adoc
+++ b/README.adoc
@@ -5,9 +5,9 @@ Edit the files in the src/main/asciidoc/ directory instead.
 ////
 
 
-image::https://github.com/spring-cloud/spring-cloud-openfeign/workflows/Build/badge.svg?branch=main&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-openfeign/actions"]
+image::https://github.com/spring-cloud/spring-cloud-openfeign/workflows/Build/badge.svg?branch=3.1.x&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-openfeign/actions"]
 
-image:https://codecov.io/gh/spring-cloud/spring-cloud-openfeign/branch/main/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-openfeign"]
+image:https://codecov.io/gh/spring-cloud/spring-cloud-openfeign/branch/3.1.x/graph/badge.svg["Codecov", link="https://app.codecov.io/gh/spring-cloud/spring-cloud-openfeign/tree/3.1.x"]
 
 image:https://api.codacy.com/project/badge/Grade/97b04c4e609c4b4f86b415e4437a6484["Codacy code quality", link="https://www.codacy.com/app/Spring-Cloud/spring-cloud-openfeign?utm_source=github.com&utm_medium=referral&utm_content=spring-cloud/spring-cloud-openfeign&utm_campaign=Badge_Grade"]
 
diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc
index 2af86f62..c2844c52 100644
--- a/docs/src/main/asciidoc/README.adoc
+++ b/docs/src/main/asciidoc/README.adoc
@@ -1,6 +1,6 @@
-image::https://github.com/spring-cloud/spring-cloud-openfeign/workflows/Build/badge.svg?branch=main&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-openfeign/actions"]
+image::https://github.com/spring-cloud/spring-cloud-openfeign/workflows/Build/badge.svg?branch=3.1.x&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-openfeign/actions"]
 
-image:https://codecov.io/gh/spring-cloud/spring-cloud-openfeign/branch/main/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-openfeign"]
+image:https://codecov.io/gh/spring-cloud/spring-cloud-openfeign/branch/3.1.x/graph/badge.svg["Codecov", link="https://app.codecov.io/gh/spring-cloud/spring-cloud-openfeign/tree/3.1.x"]
 
 image:https://api.codacy.com/project/badge/Grade/97b04c4e609c4b4f86b415e4437a6484["Codacy code quality", link="https://www.codacy.com/app/Spring-Cloud/spring-cloud-openfeign?utm_source=github.com&utm_medium=referral&utm_content=spring-cloud/spring-cloud-openfeign&utm_campaign=Badge_Grade"]
 

From b80680e17d05eea5c4f3713cc4685a79c79d2698 Mon Sep 17 00:00:00 2001
From: Olga MaciaszekSharma <omaciaszeksh@vmware.com>
Date: Mon, 18 Sep 2023 15:09:12 +0200
Subject: [PATCH 5/6] Remove Codacy badge.

---
 README.adoc                        | 2 --
 docs/src/main/asciidoc/README.adoc | 2 --
 2 files changed, 4 deletions(-)

diff --git a/README.adoc b/README.adoc
index b83914ee..b9d62cf5 100644
--- a/README.adoc
+++ b/README.adoc
@@ -9,8 +9,6 @@ image::https://github.com/spring-cloud/spring-cloud-openfeign/workflows/Build/ba
 
 image:https://codecov.io/gh/spring-cloud/spring-cloud-openfeign/branch/3.1.x/graph/badge.svg["Codecov", link="https://app.codecov.io/gh/spring-cloud/spring-cloud-openfeign/tree/3.1.x"]
 
-image:https://api.codacy.com/project/badge/Grade/97b04c4e609c4b4f86b415e4437a6484["Codacy code quality", link="https://www.codacy.com/app/Spring-Cloud/spring-cloud-openfeign?utm_source=github.com&utm_medium=referral&utm_content=spring-cloud/spring-cloud-openfeign&utm_campaign=Badge_Grade"]
-
 :doctype: book
 :idprefix:
 :idseparator: -
diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc
index c2844c52..4dce562e 100644
--- a/docs/src/main/asciidoc/README.adoc
+++ b/docs/src/main/asciidoc/README.adoc
@@ -2,8 +2,6 @@ image::https://github.com/spring-cloud/spring-cloud-openfeign/workflows/Build/ba
 
 image:https://codecov.io/gh/spring-cloud/spring-cloud-openfeign/branch/3.1.x/graph/badge.svg["Codecov", link="https://app.codecov.io/gh/spring-cloud/spring-cloud-openfeign/tree/3.1.x"]
 
-image:https://api.codacy.com/project/badge/Grade/97b04c4e609c4b4f86b415e4437a6484["Codacy code quality", link="https://www.codacy.com/app/Spring-Cloud/spring-cloud-openfeign?utm_source=github.com&utm_medium=referral&utm_content=spring-cloud/spring-cloud-openfeign&utm_campaign=Badge_Grade"]
-
 include::_attributes.adoc[]
 
 include::intro.adoc[]

From 835b9b5746c5129befba005d7be047024da786a5 Mon Sep 17 00:00:00 2001
From: Olga MaciaszekSharma <omaciaszeksh@vmware.com>
Date: Mon, 18 Sep 2023 15:09:31 +0200
Subject: [PATCH 6/6] Fix checkstyle.

---
 .../springframework/cloud/openfeign/encoding/Invoices.java  | 4 ++++
 .../cloud/openfeign/test/EqualsAndHashCodeAssert.java       | 6 +++++-
 src/checkstyle/checkstyle-suppressions.xml                  | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/Invoices.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/Invoices.java
index 7c5ab020..175fb77a 100644
--- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/Invoices.java
+++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/Invoices.java
@@ -30,6 +30,10 @@ import org.springframework.cloud.openfeign.encoding.app.domain.Invoice;
  */
 final class Invoices {
 
+	private Invoices() {
+		throw new IllegalStateException("Should not instantiate utility class");
+	}
+
 	public static List<Invoice> createInvoiceList(int count) {
 		final List<Invoice> invoices = new ArrayList<>();
 		for (int ind = 0; ind < count; ind++) {
diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/EqualsAndHashCodeAssert.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/EqualsAndHashCodeAssert.java
index d935a1a1..6e380e05 100644
--- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/EqualsAndHashCodeAssert.java
+++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/test/EqualsAndHashCodeAssert.java
@@ -25,7 +25,11 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Jonatan Ivanov
  */
-public class EqualsAndHashCodeAssert {
+public final class EqualsAndHashCodeAssert {
+
+	private EqualsAndHashCodeAssert() {
+		throw new IllegalStateException("Should not instantiate utility class");
+	}
 
 	/**
 	 * Checks if equals is reflexive: for any non-null reference value x, x.equals(x)
diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
index 81b1ab02..e3cf17bb 100644
--- a/src/checkstyle/checkstyle-suppressions.xml
+++ b/src/checkstyle/checkstyle-suppressions.xml
@@ -13,6 +13,7 @@
 	<suppress files=".*ProtobufTest.*" checks="LineLengthCheck" />
 	<suppress files=".*Hello.*" checks="RedundantModifier"/>
 	<suppress files=".*test.*" checks="JavadocStyle"/>
+	<suppress files=".*test.*" checks="JavadocVariable"/>
 	<!-- Important -->
 	<suppress files=".*HttpEncoding.*" checks="InterfaceIsTypeCheck" />
 </suppressions>