diff --git a/README.adoc b/README.adoc index 78003e90..6039625d 100644 --- a/README.adoc +++ b/README.adoc @@ -55,7 +55,7 @@ credentials and you already have those. The projects that require middleware generally include a `docker-compose.yml`, so consider using -https://docs.docker.com/compose/[Docker Compose] to run the middeware servers +https://compose.docker.io/[Docker Compose] to run the middeware servers in Docker containers. See the README in the https://github.com/spring-cloud-samples/scripts[scripts demo repository] for specific instructions about the common cases of mongo, @@ -245,7 +245,6 @@ $ touch .springformat ==== Intellij IDEA In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin. -The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project. .spring-cloud-build-tools/ ---- diff --git a/docs/pom.xml b/docs/pom.xml index af6c14c2..5125edd7 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.0.M1 + 2.2.0.BUILD-SNAPSHOT spring-cloud-openfeign-docs pom diff --git a/pom.xml b/pom.xml index c2f41ca0..36c9d5fd 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.0.M1 + 2.2.0.BUILD-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 2.2.0.M3 + 2.2.0.BUILD-SNAPSHOT @@ -26,8 +26,8 @@ ${basedir} 2.7.3 - 2.2.0.M1 - 2.2.0.M1 + 2.2.0.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT 3.6.1 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 2d4d4379..6014b903 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.0.M1 + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java index e44970ab..7a84b393 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java @@ -91,15 +91,11 @@ public class FeignClientsConfiguration { @ConditionalOnClass(name = "org.springframework.data.domain.Pageable") @ConditionalOnMissingBean public Encoder feignEncoderPageable() { - PageableSpringEncoder encoder = new PageableSpringEncoder( - new SpringEncoder(this.messageConverters)); + PageableSpringEncoder encoder = new PageableSpringEncoder(new SpringEncoder(this.messageConverters)); if (springDataWebProperties != null) { - encoder.setPageParameter( - springDataWebProperties.getPageable().getPageParameter()); - encoder.setSizeParameter( - springDataWebProperties.getPageable().getSizeParameter()); - encoder.setSortParameter( - springDataWebProperties.getSort().getSortParameter()); + encoder.setPageParameter(springDataWebProperties.getPageable().getPageParameter()); + encoder.setSizeParameter(springDataWebProperties.getPageable().getSizeParameter()); + encoder.setSortParameter(springDataWebProperties.getSort().getSortParameter()); } return encoder; } diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index 004ccc50..82fa7c46 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.2.0.M3 + 2.2.0.BUILD-SNAPSHOT spring-cloud-openfeign-dependencies - 2.2.0.M1 + 2.2.0.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 4f013faa..e9ad7d80 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.0.M1 + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-starter-openfeign