From ce7a55a484c9d51c60a35becc467c62728a5b9bc Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 11 Feb 2021 14:15:44 +0000 Subject: [PATCH] Going back to snapshots --- docs/pom.xml | 2 +- docs/src/main/asciidoc/_configprops.adoc | 39 +++++++++---------- pom.xml | 8 ++-- spring-cloud-openfeign-core/pom.xml | 2 +- .../encoding/FeignPageableEncodingTests.java | 10 ++--- spring-cloud-openfeign-dependencies/pom.xml | 4 +- spring-cloud-starter-openfeign/pom.xml | 2 +- 7 files changed, 32 insertions(+), 35 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index d9e2e0ec..2b898e00 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.7.RELEASE + 2.2.7.BUILD-SNAPSHOT spring-cloud-openfeign-docs pom diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 01c9fc45..8d9d569e 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -1,27 +1,26 @@ |=== |Name | Default | Description -|feign.autoconfiguration.jackson.enabled | `false` | If true, PageJacksonModule and SortJacksonModule bean will be provided for Jackson page decoding. -|feign.circuitbreaker.enabled | `false` | If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker. +|feign.circuitbreaker.enabled | false | If true, an OpenFeign client will be wrapped with a Spring Cloud CircuitBreaker circuit breaker. |feign.client.config | | -|feign.client.decode-slash | `true` | Feign clients do not encode slash `/` characters by default. To change this behavior, set the `decodeSlash` to `false`. -|feign.client.default-config | `default` | -|feign.client.default-to-properties | `true` | -|feign.compression.request.enabled | `false` | Enables the request sent by Feign to be compressed. -|feign.compression.request.mime-types | `[text/xml, application/xml, application/json]` | The list of supported mime types. -|feign.compression.request.min-request-size | `2048` | The minimum threshold content size. -|feign.compression.response.enabled | `false` | Enables the response from Feign to be compressed. -|feign.compression.response.useGzipDecoder | `false` | Enables the default gzip decoder to be used. -|feign.httpclient.connection-timeout | `2000` | -|feign.httpclient.connection-timer-repeat | `3000` | -|feign.httpclient.disable-ssl-validation | `false` | -|feign.httpclient.enabled | `true` | Enables the use of the Apache HTTP Client by Feign. -|feign.httpclient.follow-redirects | `true` | -|feign.httpclient.max-connections | `200` | -|feign.httpclient.max-connections-per-route | `50` | -|feign.httpclient.time-to-live | `900` | +|feign.client.decode-slash | true | Feign clients do not encode slash `/` characters by default. To change this behavior, set the `decodeSlash` to `false`. +|feign.client.default-config | default | +|feign.client.default-to-properties | true | +|feign.compression.request.enabled | false | Enables the request sent by Feign to be compressed. +|feign.compression.request.mime-types | [text/xml, application/xml, application/json] | The list of supported mime types. +|feign.compression.request.min-request-size | 2048 | The minimum threshold content size. +|feign.compression.response.enabled | false | Enables the response from Feign to be compressed. +|feign.compression.response.useGzipDecoder | false | Enables the default gzip decoder to be used. +|feign.httpclient.connection-timeout | 2000 | +|feign.httpclient.connection-timer-repeat | 3000 | +|feign.httpclient.disable-ssl-validation | false | +|feign.httpclient.enabled | true | Enables the use of the Apache HTTP Client by Feign. +|feign.httpclient.follow-redirects | true | +|feign.httpclient.max-connections | 200 | +|feign.httpclient.max-connections-per-route | 50 | +|feign.httpclient.time-to-live | 900 | |feign.httpclient.time-to-live-unit | | -|feign.hystrix.enabled | `false` | If true, an OpenFeign client will be wrapped with a Hystrix circuit breaker. -|feign.okhttp.enabled | `false` | Enables the use of the OK HTTP Client by Feign. +|feign.hystrix.enabled | false | If true, an OpenFeign client will be wrapped with a Hystrix circuit breaker. +|feign.okhttp.enabled | false | Enables the use of the OK HTTP Client by Feign. |=== \ No newline at end of file diff --git a/pom.xml b/pom.xml index 1b9bde57..3d71f240 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"> 4.0.0 spring-cloud-openfeign - 2.2.7.RELEASE + 2.2.7.BUILD-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 2.3.2.RELEASE + 2.3.1.RELEASE @@ -26,8 +26,8 @@ ${basedir} 2.11.3 - 2.2.7.RELEASE - 2.2.7.RELEASE + 2.2.7.BUILD-SNAPSHOT + 2.2.7.BUILD-SNAPSHOT 2.10 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 19232156..c88064b4 100644 --- a/spring-cloud-openfeign-core/pom.xml +++ b/spring-cloud-openfeign-core/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.7.RELEASE + 2.2.7.BUILD-SNAPSHOT .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignPageableEncodingTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignPageableEncodingTests.java index 0f163bdb..40f530a3 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignPageableEncodingTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignPageableEncodingTests.java @@ -101,8 +101,7 @@ public class FeignPageableEncodingTests { Pageable pageable = PageRequest.of(0, 10, Sort.Direction.DESC, "sortProperty"); // when - final ResponseEntity> response = this.invoiceClient - .getInvoicesPaged(pageable); + final ResponseEntity> response = this.invoiceClient.getInvoicesPaged(pageable); // then assertThat(response).isNotNull(); @@ -126,12 +125,11 @@ public class FeignPageableEncodingTests { @Test public void testPageableWithMultipleSort() { // given - Pageable pageable = PageRequest.of(0, 10, Sort - .by(Sort.Order.desc("sortProperty1"), Sort.Order.asc("sortProperty2"))); + Pageable pageable = PageRequest.of(0, 10, + Sort.by(Sort.Order.desc("sortProperty1"), Sort.Order.asc("sortProperty2"))); // when - final ResponseEntity> response = this.invoiceClient - .getInvoicesPaged(pageable); + final ResponseEntity> response = this.invoiceClient.getInvoicesPaged(pageable); // then assertThat(response).isNotNull(); diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index c9a39279..6d5aabcd 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.2.RELEASE + 2.3.2.BUILD-SNAPSHOT spring-cloud-openfeign-dependencies - 2.2.7.RELEASE + 2.2.7.BUILD-SNAPSHOT pom spring-cloud-openfeign-dependencies Spring Cloud OpenFeign Dependencies diff --git a/spring-cloud-starter-openfeign/pom.xml b/spring-cloud-starter-openfeign/pom.xml index cd15dd8d..c83ad3a3 100644 --- a/spring-cloud-starter-openfeign/pom.xml +++ b/spring-cloud-starter-openfeign/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.7.RELEASE + 2.2.7.BUILD-SNAPSHOT .. spring-cloud-starter-openfeign