From f4ca971253fd9b09edabde6e72217ad246663e69 Mon Sep 17 00:00:00 2001
From: buildmaster <buildmaster@springframework.org>
Date: Mon, 9 Nov 2020 10:38:56 +0000
Subject: [PATCH] Update SNAPSHOT to 2.2.6.RELEASE

---
 docs/pom.xml                                       |  2 +-
 pom.xml                                            |  6 +++---
 spring-cloud-openfeign-core/pom.xml                |  2 +-
 .../cloud/openfeign/FeignClientsRegistrar.java     |  3 +--
 .../openfeign/FeignClientsRegistrarTests.java      | 14 ++++++++------
 .../feignclientsregistrar/TopLevelClient.java      |  1 +
 .../feignclientsregistrar/sub/SubLevelClient.java  |  1 +
 spring-cloud-openfeign-dependencies/pom.xml        |  4 ++--
 spring-cloud-starter-openfeign/pom.xml             |  2 +-
 9 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index 04a53db1..b646c85a 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>2.2.6.BUILD-SNAPSHOT</version>
+		<version>2.2.6.RELEASE</version>
 	</parent>
 	<artifactId>spring-cloud-openfeign-docs</artifactId>
 	<packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index 81842c9f..7998ab70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 		 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>2.2.6.BUILD-SNAPSHOT</version>
+	<version>2.2.6.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud OpenFeign</name>
 	<description>Spring Cloud OpenFeign</description>
@@ -26,8 +26,8 @@
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 		<jackson.version>2.11.3</jackson.version>
-		<spring-cloud-commons.version>2.2.6.BUILD-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-netflix.version>2.2.6.BUILD-SNAPSHOT</spring-cloud-netflix.version>
+		<spring-cloud-commons.version>2.2.6.RELEASE</spring-cloud-commons.version>
+		<spring-cloud-netflix.version>2.2.6.RELEASE</spring-cloud-netflix.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 3f4a1dd8..857fb4b8 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>2.2.6.BUILD-SNAPSHOT</version>
+		<version>2.2.6.RELEASE</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-openfeign-core</artifactId>
diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java
index dbb04fef..e340e420 100644
--- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java
+++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java
@@ -192,8 +192,7 @@ class FeignClientsRegistrar
 						"@FeignClient can only be specified on an interface");
 
 				Map<String, Object> attributes = annotationMetadata
-						.getAnnotationAttributes(
-								FeignClient.class.getCanonicalName());
+						.getAnnotationAttributes(FeignClient.class.getCanonicalName());
 
 				String name = getClientName(attributes);
 				registerClientConfiguration(registry, name,
diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java
index b9c924dc..b25f5a06 100644
--- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java
+++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientsRegistrarTests.java
@@ -96,11 +96,12 @@ public class FeignClientsRegistrarTests {
 	@Test
 	public void shouldPassSubLevelFeignClient() {
 		AnnotationConfigApplicationContext config = new AnnotationConfigApplicationContext();
-		((DefaultListableBeanFactory) config.getBeanFactory()).setAllowBeanDefinitionOverriding(false);
+		((DefaultListableBeanFactory) config.getBeanFactory())
+				.setAllowBeanDefinitionOverriding(false);
 		config.register(TopLevelSubLevelTestConfig.class);
-		assertThatCode(() -> config.refresh())
-			.as("Case https://github.com/spring-cloud/spring-cloud-openfeign/issues/331 should be solved")
-			.doesNotThrowAnyException();
+		assertThatCode(() -> config.refresh()).as(
+				"Case https://github.com/spring-cloud/spring-cloud-openfeign/issues/331 should be solved")
+				.doesNotThrowAnyException();
 
 	}
 
@@ -138,10 +139,11 @@ public class FeignClientsRegistrarTests {
 	}
 
 	@EnableFeignClients(clients = {
-		org.springframework.cloud.openfeign.feignclientsregistrar.TopLevelClient.class,
-		org.springframework.cloud.openfeign.feignclientsregistrar.sub.SubLevelClient.class})
+			org.springframework.cloud.openfeign.feignclientsregistrar.TopLevelClient.class,
+			org.springframework.cloud.openfeign.feignclientsregistrar.sub.SubLevelClient.class })
 	@EnableAutoConfiguration(exclude = TestAutoConfiguration.class)
 	protected static class TopLevelSubLevelTestConfig {
+
 	}
 
 }
diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/feignclientsregistrar/TopLevelClient.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/feignclientsregistrar/TopLevelClient.java
index 2128bce4..d52cc4a1 100644
--- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/feignclientsregistrar/TopLevelClient.java
+++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/feignclientsregistrar/TopLevelClient.java
@@ -24,4 +24,5 @@ import org.springframework.cloud.openfeign.FeignClient;
 
 @FeignClient("top-level")
 public interface TopLevelClient {
+
 }
diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/feignclientsregistrar/sub/SubLevelClient.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/feignclientsregistrar/sub/SubLevelClient.java
index 84d01aea..29126482 100644
--- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/feignclientsregistrar/sub/SubLevelClient.java
+++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/feignclientsregistrar/sub/SubLevelClient.java
@@ -24,4 +24,5 @@ import org.springframework.cloud.openfeign.FeignClient;
 
 @FeignClient("sub-level")
 public interface SubLevelClient {
+
 }
diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml
index aff93012..ab0c56f7 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>2.3.2.BUILD-SNAPSHOT</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-openfeign-dependencies</artifactId>
-	<version>2.2.6.BUILD-SNAPSHOT</version>
+	<version>2.2.6.RELEASE</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 83e778f0..0b1ef5e2 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>2.2.6.BUILD-SNAPSHOT</version>
+		<version>2.2.6.RELEASE</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-openfeign</artifactId>