Browse Source

Merge branch '2.1.x'

pull/140/head
Olga Maciaszek-Sharma 6 years ago
parent
commit
84b0d0ca40
  1. 2
      spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringDecoder.java
  2. 4
      spring-cloud-openfeign-dependencies/pom.xml

2
spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringDecoder.java

@ -58,7 +58,7 @@ public class SpringDecoder implements Decoder {
return extractor.extractData(new FeignResponseAdapter(response)); return extractor.extractData(new FeignResponseAdapter(response));
} }
throw new DecodeException( throw new DecodeException(response.status(),
"type is not an instance of Class or ParameterizedType: " + type); "type is not an instance of Class or ParameterizedType: " + type);
} }

4
spring-cloud-openfeign-dependencies/pom.xml

@ -15,8 +15,8 @@
<name>spring-cloud-openfeign-dependencies</name> <name>spring-cloud-openfeign-dependencies</name>
<description>Spring Cloud OpenFeign Dependencies</description> <description>Spring Cloud OpenFeign Dependencies</description>
<properties> <properties>
<feign.version>10.1.0</feign.version> <feign.version>10.2.3</feign.version>
<feign-form.version>3.5.0</feign-form.version> <feign-form.version>3.8.0</feign-form.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>

Loading…
Cancel
Save