From 6f09ae0824ec3297f1fbfe250f42992fae1ae7f3 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 4 Mar 2020 16:28:48 +0000 Subject: [PATCH 1/9] Update SNAPSHOT to 2.2.2.RELEASE --- .flattened-pom.xml | 4 +- docs/.flattened-pom.xml | 6 +- docs/pom.xml | 2 +- pom.xml | 8 +- .../.flattened-pom.xml | 52 ++-- spring-cloud-openfeign-core/pom.xml | 2 +- .../.flattened-pom.xml | 230 ++++++++++++++++++ spring-cloud-openfeign-dependencies/pom.xml | 4 +- .../.flattened-pom.xml | 24 +- spring-cloud-starter-openfeign/pom.xml | 2 +- 10 files changed, 282 insertions(+), 52 deletions(-) create mode 100644 spring-cloud-openfeign-dependencies/.flattened-pom.xml diff --git a/.flattened-pom.xml b/.flattened-pom.xml index 43cd2d5e..c274c5fc 100644 --- a/.flattened-pom.xml +++ b/.flattened-pom.xml @@ -5,12 +5,12 @@ org.springframework.cloud spring-cloud-build - 2.2.2.BUILD-SNAPSHOT + 2.2.3.RELEASE org.springframework.cloud spring-cloud-openfeign - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE pom Spring Cloud OpenFeign Spring Cloud OpenFeign diff --git a/docs/.flattened-pom.xml b/docs/.flattened-pom.xml index 8f57581f..b550752b 100644 --- a/docs/.flattened-pom.xml +++ b/docs/.flattened-pom.xml @@ -5,11 +5,11 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE org.springframework.cloud spring-cloud-openfeign-docs - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE pom Spring Cloud OpenFeign Docs Spring Cloud Docs @@ -100,7 +100,7 @@ org.springframework.cloud spring-cloud-starter-openfeign - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE compile diff --git a/docs/pom.xml b/docs/pom.xml index 7a460aed..bdf65be4 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE spring-cloud-openfeign-docs pom diff --git a/pom.xml b/pom.xml index 60de9eda..68a52968 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.2.BUILD-SNAPSHOT + 2.2.2.RELEASE pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 2.2.2.BUILD-SNAPSHOT + 2.2.3.RELEASE @@ -26,8 +26,8 @@ ${basedir} 2.7.3 - 2.2.2.BUILD-SNAPSHOT - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE + 2.2.2.RELEASE 3.6.1 diff --git a/spring-cloud-openfeign-core/.flattened-pom.xml b/spring-cloud-openfeign-core/.flattened-pom.xml index 2df8945e..9023236e 100644 --- a/spring-cloud-openfeign-core/.flattened-pom.xml +++ b/spring-cloud-openfeign-core/.flattened-pom.xml @@ -5,12 +5,12 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE .. org.springframework.cloud spring-cloud-openfeign-core - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE Spring Cloud OpenFeign Core Spring Cloud OpenFeign Core https://spring.io/spring-cloud/spring-cloud-openfeign/spring-cloud-openfeign-core @@ -100,68 +100,68 @@ org.springframework.boot spring-boot-autoconfigure - 2.2.2.RELEASE + 2.2.5.RELEASE compile org.springframework.cloud spring-cloud-netflix-ribbon - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE compile org.springframework.boot spring-boot-starter-actuator - 2.2.2.RELEASE + 2.2.5.RELEASE compile true org.springframework.boot spring-boot-starter-security - 2.2.2.RELEASE + 2.2.5.RELEASE compile true org.springframework.boot spring-boot-starter-web - 2.2.2.RELEASE + 2.2.5.RELEASE compile true org.springframework.boot spring-boot-starter-webflux - 2.2.2.RELEASE + 2.2.5.RELEASE compile true org.springframework.boot spring-boot-starter-reactor-netty - 2.2.2.RELEASE + 2.2.5.RELEASE compile true org.springframework.boot spring-boot-starter-hateoas - 2.2.2.RELEASE + 2.2.5.RELEASE compile true io.netty netty-codec-http - 4.1.43.Final + 4.1.45.Final compile true io.projectreactor reactor-core - 3.3.1.RELEASE + 3.3.3.RELEASE compile true @@ -175,27 +175,27 @@ org.springframework.retry spring-retry - 1.2.4.RELEASE + 1.2.5.RELEASE compile true org.springframework.boot spring-boot-starter-aop - 2.2.2.RELEASE + 2.2.5.RELEASE compile org.springframework.cloud spring-cloud-commons - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE compile true org.springframework.cloud spring-cloud-context - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE compile true @@ -215,7 +215,7 @@ io.github.openfeign feign-core - 10.7.0 + 10.7.4 compile true @@ -228,28 +228,28 @@ io.github.openfeign feign-slf4j - 10.7.0 + 10.7.4 compile true io.github.openfeign feign-httpclient - 10.7.0 + 10.7.4 compile true io.github.openfeign feign-hystrix - 10.7.0 + 10.7.4 compile true io.github.openfeign feign-okhttp - 10.7.0 + 10.7.4 compile true @@ -349,35 +349,35 @@ com.squareup.okhttp3 okhttp - 3.14.4 + 3.14.7 compile true org.springframework.boot spring-boot-autoconfigure-processor - 2.2.2.RELEASE + 2.2.5.RELEASE compile true org.springframework.boot spring-boot-configuration-processor - 2.2.2.RELEASE + 2.2.5.RELEASE compile true org.springframework.data spring-data-commons - 2.2.3.RELEASE + 2.2.5.RELEASE compile true org.springframework.cloud spring-cloud-loadbalancer - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE compile true diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index d0a1c9a4..da7fa9d6 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.2.BUILD-SNAPSHOT + 2.2.2.RELEASE .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/.flattened-pom.xml b/spring-cloud-openfeign-dependencies/.flattened-pom.xml new file mode 100644 index 00000000..95181d9b --- /dev/null +++ b/spring-cloud-openfeign-dependencies/.flattened-pom.xml @@ -0,0 +1,230 @@ + + + 4.0.0 + + org.springframework.cloud + spring-cloud-dependencies-parent + 2.2.3.RELEASE + + + org.springframework.cloud + spring-cloud-openfeign-dependencies + 2.2.2.RELEASE + pom + spring-cloud-openfeign-dependencies + Spring Cloud OpenFeign Dependencies + https://projects.spring.io/spring-cloud/spring-cloud-openfeign-dependencies/ + + Pivotal Software, Inc. + https://www.spring.io + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + Copyright 2014-2015 the original author or authors. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. + + See the License for the specific language governing permissions and + limitations under the License. + + + + + dsyer + Dave Syer + dsyer at pivotal.io + Pivotal Software, Inc. + https://www.spring.io + + Project lead + + + + sgibb + Spencer Gibb + sgibb at pivotal.io + Pivotal Software, Inc. + https://www.spring.io + + Project lead + + + + + scm:git:git://github.com/spring-cloud/spring-cloud-build.git/spring-cloud-openfeign-dependencies + scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git/spring-cloud-openfeign-dependencies + https://github.com/spring-cloud/spring-cloud-build/spring-cloud-openfeign-dependencies + + + + repo.spring.io + Spring Release Repository + https://repo.spring.io/libs-release-local + + + repo.spring.io + Spring Snapshot Repository + https://repo.spring.io/libs-snapshot-local + + + spring-docs + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/spring-cloud-dependencies-parent/2.2.3.RELEASE/spring-cloud-openfeign-dependencies + + https://github.com/spring-cloud + + + 3.8.0 + 10.7.4 + + + + + org.springframework.cloud + spring-cloud-openfeign-core + ${project.version} + + + org.springframework.cloud + spring-cloud-starter-openfeign + ${project.version} + + + io.github.openfeign + feign-core + ${feign.version} + + + io.github.openfeign.form + feign-form-spring + ${feign-form.version} + + + io.github.openfeign + feign-slf4j + ${feign.version} + + + io.github.openfeign + feign-httpclient + ${feign.version} + + + io.github.openfeign + feign-hystrix + ${feign.version} + + + io.github.openfeign + feign-okhttp + ${feign.version} + + + io.github.openfeign + feign-gson + ${feign.version} + + + io.github.openfeign + feign-jackson-jaxb + ${feign.version} + + + io.github.openfeign + feign-jackson + ${feign.version} + + + io.github.openfeign + feign-jaxb + ${feign.version} + + + io.github.openfeign + feign-jaxrs + ${feign.version} + + + io.github.openfeign + feign-ribbon + ${feign.version} + + + io.github.openfeign + feign-sax + ${feign.version} + + + io.github.openfeign + feign-mock + ${feign.version} + + + + + + spring + + + + false + + + true + + spring-snapshots + Spring Snapshots + https://repo.spring.io/libs-snapshot-local + + + + false + + spring-milestones + Spring Milestones + https://repo.spring.io/libs-milestone-local + + + + false + + spring-releases + Spring Releases + https://repo.spring.io/release + + + + + + false + + + true + + spring-snapshots + Spring Snapshots + https://repo.spring.io/libs-snapshot-local + + + + false + + spring-milestones + Spring Milestones + https://repo.spring.io/libs-milestone-local + + + + + diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index 90be4c83..47f016ce 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.2.BUILD-SNAPSHOT + 2.2.3.RELEASE spring-cloud-openfeign-dependencies - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE pom spring-cloud-openfeign-dependencies Spring Cloud OpenFeign Dependencies diff --git a/spring-cloud-starter-openfeign/.flattened-pom.xml b/spring-cloud-starter-openfeign/.flattened-pom.xml index ed9e3d52..3310b187 100644 --- a/spring-cloud-starter-openfeign/.flattened-pom.xml +++ b/spring-cloud-starter-openfeign/.flattened-pom.xml @@ -5,12 +5,12 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE .. org.springframework.cloud spring-cloud-starter-openfeign - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE Spring Cloud Starter OpenFeign Spring Cloud Starter OpenFeign https://projects.spring.io/spring-cloud @@ -100,63 +100,63 @@ org.springframework.cloud spring-cloud-starter - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE compile org.springframework.cloud spring-cloud-openfeign-core - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE compile org.springframework spring-web - 5.2.2.RELEASE + 5.2.4.RELEASE compile org.springframework.cloud spring-cloud-commons - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE compile io.github.openfeign feign-core - 10.7.0 + 10.7.4 compile io.github.openfeign feign-slf4j - 10.7.0 + 10.7.4 compile io.github.openfeign feign-hystrix - 10.7.0 + 10.7.4 compile org.springframework.cloud spring-cloud-starter-netflix-ribbon - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE compile true org.springframework.cloud spring-cloud-starter-netflix-archaius - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE compile true org.springframework.cloud spring-cloud-starter-loadbalancer - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE compile true diff --git a/spring-cloud-starter-openfeign/pom.xml b/spring-cloud-starter-openfeign/pom.xml index 027c4068..844d3da0 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.2.BUILD-SNAPSHOT + 2.2.2.RELEASE .. spring-cloud-starter-openfeign From b5c8e6619eb381061713bae8695b199ea3230847 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 4 Mar 2020 16:30:43 +0000 Subject: [PATCH 2/9] Going back to snapshots --- .flattened-pom.xml | 4 +- docs/.flattened-pom.xml | 6 +- docs/pom.xml | 2 +- pom.xml | 8 +- .../.flattened-pom.xml | 52 ++-- spring-cloud-openfeign-core/pom.xml | 2 +- .../.flattened-pom.xml | 230 ------------------ spring-cloud-openfeign-dependencies/pom.xml | 4 +- .../.flattened-pom.xml | 24 +- spring-cloud-starter-openfeign/pom.xml | 2 +- 10 files changed, 52 insertions(+), 282 deletions(-) delete mode 100644 spring-cloud-openfeign-dependencies/.flattened-pom.xml diff --git a/.flattened-pom.xml b/.flattened-pom.xml index c274c5fc..43cd2d5e 100644 --- a/.flattened-pom.xml +++ b/.flattened-pom.xml @@ -5,12 +5,12 @@ org.springframework.cloud spring-cloud-build - 2.2.3.RELEASE + 2.2.2.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-openfeign - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign diff --git a/docs/.flattened-pom.xml b/docs/.flattened-pom.xml index b550752b..8f57581f 100644 --- a/docs/.flattened-pom.xml +++ b/docs/.flattened-pom.xml @@ -5,11 +5,11 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT org.springframework.cloud spring-cloud-openfeign-docs - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT pom Spring Cloud OpenFeign Docs Spring Cloud Docs @@ -100,7 +100,7 @@ org.springframework.cloud spring-cloud-starter-openfeign - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT compile diff --git a/docs/pom.xml b/docs/pom.xml index bdf65be4..7a460aed 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT spring-cloud-openfeign-docs pom diff --git a/pom.xml b/pom.xml index 68a52968..60de9eda 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.2.RELEASE + 2.2.2.BUILD-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 2.2.3.RELEASE + 2.2.2.BUILD-SNAPSHOT @@ -26,8 +26,8 @@ ${basedir} 2.7.3 - 2.2.2.RELEASE - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT 3.6.1 diff --git a/spring-cloud-openfeign-core/.flattened-pom.xml b/spring-cloud-openfeign-core/.flattened-pom.xml index 9023236e..2df8945e 100644 --- a/spring-cloud-openfeign-core/.flattened-pom.xml +++ b/spring-cloud-openfeign-core/.flattened-pom.xml @@ -5,12 +5,12 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT .. org.springframework.cloud spring-cloud-openfeign-core - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT Spring Cloud OpenFeign Core Spring Cloud OpenFeign Core https://spring.io/spring-cloud/spring-cloud-openfeign/spring-cloud-openfeign-core @@ -100,68 +100,68 @@ org.springframework.boot spring-boot-autoconfigure - 2.2.5.RELEASE + 2.2.2.RELEASE compile org.springframework.cloud spring-cloud-netflix-ribbon - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT compile org.springframework.boot spring-boot-starter-actuator - 2.2.5.RELEASE + 2.2.2.RELEASE compile true org.springframework.boot spring-boot-starter-security - 2.2.5.RELEASE + 2.2.2.RELEASE compile true org.springframework.boot spring-boot-starter-web - 2.2.5.RELEASE + 2.2.2.RELEASE compile true org.springframework.boot spring-boot-starter-webflux - 2.2.5.RELEASE + 2.2.2.RELEASE compile true org.springframework.boot spring-boot-starter-reactor-netty - 2.2.5.RELEASE + 2.2.2.RELEASE compile true org.springframework.boot spring-boot-starter-hateoas - 2.2.5.RELEASE + 2.2.2.RELEASE compile true io.netty netty-codec-http - 4.1.45.Final + 4.1.43.Final compile true io.projectreactor reactor-core - 3.3.3.RELEASE + 3.3.1.RELEASE compile true @@ -175,27 +175,27 @@ org.springframework.retry spring-retry - 1.2.5.RELEASE + 1.2.4.RELEASE compile true org.springframework.boot spring-boot-starter-aop - 2.2.5.RELEASE + 2.2.2.RELEASE compile org.springframework.cloud spring-cloud-commons - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT compile true org.springframework.cloud spring-cloud-context - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT compile true @@ -215,7 +215,7 @@ io.github.openfeign feign-core - 10.7.4 + 10.7.0 compile true @@ -228,28 +228,28 @@ io.github.openfeign feign-slf4j - 10.7.4 + 10.7.0 compile true io.github.openfeign feign-httpclient - 10.7.4 + 10.7.0 compile true io.github.openfeign feign-hystrix - 10.7.4 + 10.7.0 compile true io.github.openfeign feign-okhttp - 10.7.4 + 10.7.0 compile true @@ -349,35 +349,35 @@ com.squareup.okhttp3 okhttp - 3.14.7 + 3.14.4 compile true org.springframework.boot spring-boot-autoconfigure-processor - 2.2.5.RELEASE + 2.2.2.RELEASE compile true org.springframework.boot spring-boot-configuration-processor - 2.2.5.RELEASE + 2.2.2.RELEASE compile true org.springframework.data spring-data-commons - 2.2.5.RELEASE + 2.2.3.RELEASE compile true org.springframework.cloud spring-cloud-loadbalancer - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT compile true diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index da7fa9d6..d0a1c9a4 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.2.RELEASE + 2.2.2.BUILD-SNAPSHOT .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/.flattened-pom.xml b/spring-cloud-openfeign-dependencies/.flattened-pom.xml deleted file mode 100644 index 95181d9b..00000000 --- a/spring-cloud-openfeign-dependencies/.flattened-pom.xml +++ /dev/null @@ -1,230 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-dependencies-parent - 2.2.3.RELEASE - - - org.springframework.cloud - spring-cloud-openfeign-dependencies - 2.2.2.RELEASE - pom - spring-cloud-openfeign-dependencies - Spring Cloud OpenFeign Dependencies - https://projects.spring.io/spring-cloud/spring-cloud-openfeign-dependencies/ - - Pivotal Software, Inc. - https://www.spring.io - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - Copyright 2014-2015 the original author or authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. - - See the License for the specific language governing permissions and - limitations under the License. - - - - - dsyer - Dave Syer - dsyer at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - Project lead - - - - sgibb - Spencer Gibb - sgibb at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - Project lead - - - - - scm:git:git://github.com/spring-cloud/spring-cloud-build.git/spring-cloud-openfeign-dependencies - scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git/spring-cloud-openfeign-dependencies - https://github.com/spring-cloud/spring-cloud-build/spring-cloud-openfeign-dependencies - - - - repo.spring.io - Spring Release Repository - https://repo.spring.io/libs-release-local - - - repo.spring.io - Spring Snapshot Repository - https://repo.spring.io/libs-snapshot-local - - - spring-docs - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/spring-cloud-dependencies-parent/2.2.3.RELEASE/spring-cloud-openfeign-dependencies - - https://github.com/spring-cloud - - - 3.8.0 - 10.7.4 - - - - - org.springframework.cloud - spring-cloud-openfeign-core - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-openfeign - ${project.version} - - - io.github.openfeign - feign-core - ${feign.version} - - - io.github.openfeign.form - feign-form-spring - ${feign-form.version} - - - io.github.openfeign - feign-slf4j - ${feign.version} - - - io.github.openfeign - feign-httpclient - ${feign.version} - - - io.github.openfeign - feign-hystrix - ${feign.version} - - - io.github.openfeign - feign-okhttp - ${feign.version} - - - io.github.openfeign - feign-gson - ${feign.version} - - - io.github.openfeign - feign-jackson-jaxb - ${feign.version} - - - io.github.openfeign - feign-jackson - ${feign.version} - - - io.github.openfeign - feign-jaxb - ${feign.version} - - - io.github.openfeign - feign-jaxrs - ${feign.version} - - - io.github.openfeign - feign-ribbon - ${feign.version} - - - io.github.openfeign - feign-sax - ${feign.version} - - - io.github.openfeign - feign-mock - ${feign.version} - - - - - - spring - - - - false - - - true - - spring-snapshots - Spring Snapshots - https://repo.spring.io/libs-snapshot-local - - - - false - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone-local - - - - false - - spring-releases - Spring Releases - https://repo.spring.io/release - - - - - - false - - - true - - spring-snapshots - Spring Snapshots - https://repo.spring.io/libs-snapshot-local - - - - false - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone-local - - - - - diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index 47f016ce..90be4c83 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.3.RELEASE + 2.2.2.BUILD-SNAPSHOT spring-cloud-openfeign-dependencies - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT pom spring-cloud-openfeign-dependencies Spring Cloud OpenFeign Dependencies diff --git a/spring-cloud-starter-openfeign/.flattened-pom.xml b/spring-cloud-starter-openfeign/.flattened-pom.xml index 3310b187..ed9e3d52 100644 --- a/spring-cloud-starter-openfeign/.flattened-pom.xml +++ b/spring-cloud-starter-openfeign/.flattened-pom.xml @@ -5,12 +5,12 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT .. org.springframework.cloud spring-cloud-starter-openfeign - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT Spring Cloud Starter OpenFeign Spring Cloud Starter OpenFeign https://projects.spring.io/spring-cloud @@ -100,63 +100,63 @@ org.springframework.cloud spring-cloud-starter - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT compile org.springframework.cloud spring-cloud-openfeign-core - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT compile org.springframework spring-web - 5.2.4.RELEASE + 5.2.2.RELEASE compile org.springframework.cloud spring-cloud-commons - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT compile io.github.openfeign feign-core - 10.7.4 + 10.7.0 compile io.github.openfeign feign-slf4j - 10.7.4 + 10.7.0 compile io.github.openfeign feign-hystrix - 10.7.4 + 10.7.0 compile org.springframework.cloud spring-cloud-starter-netflix-ribbon - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT compile true org.springframework.cloud spring-cloud-starter-netflix-archaius - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT compile true org.springframework.cloud spring-cloud-starter-loadbalancer - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT compile true diff --git a/spring-cloud-starter-openfeign/pom.xml b/spring-cloud-starter-openfeign/pom.xml index 844d3da0..027c4068 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.2.RELEASE + 2.2.2.BUILD-SNAPSHOT .. spring-cloud-starter-openfeign From 8666006bf4fc39fc2380894dae4da7fdd71f720a Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 4 Mar 2020 16:30:43 +0000 Subject: [PATCH 3/9] Bumping versions to 2.2.3.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 4 ++-- spring-cloud-starter-openfeign/pom.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 7a460aed..cf642676 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT spring-cloud-openfeign-docs pom diff --git a/pom.xml b/pom.xml index 60de9eda..32749051 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.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 2.2.2.BUILD-SNAPSHOT + 2.2.3.RELEASE @@ -26,8 +26,8 @@ ${basedir} 2.7.3 - 2.2.2.BUILD-SNAPSHOT - 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT 3.6.1 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index d0a1c9a4..a59bca62 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.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index 90be4c83..ea90476a 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.2.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT spring-cloud-openfeign-dependencies - 2.2.2.BUILD-SNAPSHOT + 2.2.3.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 027c4068..6f8fedad 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.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT .. spring-cloud-starter-openfeign From df5d1d50795671c34b89f8a7b5e3a7bc7db8d696 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 17 Jan 2020 18:58:51 -0500 Subject: [PATCH 4/9] removes .flattened-pom.xml --- .flattened-pom.xml | 134 ------ docs/.flattened-pom.xml | 107 ----- .../.flattened-pom.xml | 385 ------------------ .../.flattened-pom.xml | 164 -------- 4 files changed, 790 deletions(-) delete mode 100644 .flattened-pom.xml delete mode 100644 docs/.flattened-pom.xml delete mode 100644 spring-cloud-openfeign-core/.flattened-pom.xml delete mode 100644 spring-cloud-starter-openfeign/.flattened-pom.xml diff --git a/.flattened-pom.xml b/.flattened-pom.xml deleted file mode 100644 index 43cd2d5e..00000000 --- a/.flattened-pom.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-build - 2.2.2.BUILD-SNAPSHOT - - - org.springframework.cloud - spring-cloud-openfeign - 2.2.2.BUILD-SNAPSHOT - pom - Spring Cloud OpenFeign - Spring Cloud OpenFeign - https://spring.io/spring-cloud/spring-cloud-openfeign - - Pivotal Software, Inc. - https://www.spring.io - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - Copyright 2014-2015 the original author or authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. - - See the License for the specific language governing permissions and - limitations under the License. - - - - - dsyer - Dave Syer - dsyer at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - lead - - - - sgibb - Spencer Gibb - sgibb at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - lead - - - - mgrzejszczak - Marcin Grzejszczak - mgrzejszczak at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - developer - - - - rbaxter - Ryan Baxter - rbaxter at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - developer - - - - omaciaszeksharma - Olga Maciaszek-Sharma - omaciaszeksharma at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - developer - - - - - scm:git:git://github.com/spring-cloud/spring-cloud-openfeign.git - scm:git:ssh://git@github.com/spring-cloud/spring-cloud-openfeign.git - https://github.com/spring-cloud/spring-cloud-openfeign - - - - spring - - - - false - - - true - - spring-snapshots - Spring Snapshots - https://repo.spring.io/libs-snapshot-local - - - - false - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone-local - - - - false - - spring-releases - Spring Releases - https://repo.spring.io/release - - - - - diff --git a/docs/.flattened-pom.xml b/docs/.flattened-pom.xml deleted file mode 100644 index 8f57581f..00000000 --- a/docs/.flattened-pom.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-openfeign - 2.2.2.BUILD-SNAPSHOT - - org.springframework.cloud - spring-cloud-openfeign-docs - 2.2.2.BUILD-SNAPSHOT - pom - Spring Cloud OpenFeign Docs - Spring Cloud Docs - https://spring.io/spring-cloud/spring-cloud-openfeign/spring-cloud-openfeign-docs - - Pivotal Software, Inc. - https://www.spring.io - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - Copyright 2014-2015 the original author or authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. - - See the License for the specific language governing permissions and - limitations under the License. - - - - - dsyer - Dave Syer - dsyer at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - lead - - - - sgibb - Spencer Gibb - sgibb at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - lead - - - - mgrzejszczak - Marcin Grzejszczak - mgrzejszczak at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - developer - - - - rbaxter - Ryan Baxter - rbaxter at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - developer - - - - omaciaszeksharma - Olga Maciaszek-Sharma - omaciaszeksharma at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - developer - - - - - scm:git:git://github.com/spring-cloud/spring-cloud-openfeign.git/spring-cloud-openfeign-docs - scm:git:ssh://git@github.com/spring-cloud/spring-cloud-openfeign.git/spring-cloud-openfeign-docs - https://github.com/spring-cloud/spring-cloud-openfeign/spring-cloud-openfeign-docs - - - - org.springframework.cloud - spring-cloud-starter-openfeign - 2.2.2.BUILD-SNAPSHOT - compile - - - diff --git a/spring-cloud-openfeign-core/.flattened-pom.xml b/spring-cloud-openfeign-core/.flattened-pom.xml deleted file mode 100644 index 2df8945e..00000000 --- a/spring-cloud-openfeign-core/.flattened-pom.xml +++ /dev/null @@ -1,385 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-openfeign - 2.2.2.BUILD-SNAPSHOT - .. - - org.springframework.cloud - spring-cloud-openfeign-core - 2.2.2.BUILD-SNAPSHOT - Spring Cloud OpenFeign Core - Spring Cloud OpenFeign Core - https://spring.io/spring-cloud/spring-cloud-openfeign/spring-cloud-openfeign-core - - Pivotal Software, Inc. - https://www.spring.io - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - Copyright 2014-2015 the original author or authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. - - See the License for the specific language governing permissions and - limitations under the License. - - - - - dsyer - Dave Syer - dsyer at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - lead - - - - sgibb - Spencer Gibb - sgibb at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - lead - - - - mgrzejszczak - Marcin Grzejszczak - mgrzejszczak at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - developer - - - - rbaxter - Ryan Baxter - rbaxter at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - developer - - - - omaciaszeksharma - Olga Maciaszek-Sharma - omaciaszeksharma at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - developer - - - - - scm:git:git://github.com/spring-cloud/spring-cloud-openfeign.git/spring-cloud-openfeign-core - scm:git:ssh://git@github.com/spring-cloud/spring-cloud-openfeign.git/spring-cloud-openfeign-core - https://github.com/spring-cloud/spring-cloud-openfeign/spring-cloud-openfeign-core - - - - org.springframework.boot - spring-boot-autoconfigure - 2.2.2.RELEASE - compile - - - org.springframework.cloud - spring-cloud-netflix-ribbon - 2.2.2.BUILD-SNAPSHOT - compile - - - org.springframework.boot - spring-boot-starter-actuator - 2.2.2.RELEASE - compile - true - - - org.springframework.boot - spring-boot-starter-security - 2.2.2.RELEASE - compile - true - - - org.springframework.boot - spring-boot-starter-web - 2.2.2.RELEASE - compile - true - - - org.springframework.boot - spring-boot-starter-webflux - 2.2.2.RELEASE - compile - true - - - org.springframework.boot - spring-boot-starter-reactor-netty - 2.2.2.RELEASE - compile - true - - - org.springframework.boot - spring-boot-starter-hateoas - 2.2.2.RELEASE - compile - true - - - io.netty - netty-codec-http - 4.1.43.Final - compile - true - - - io.projectreactor - reactor-core - 3.3.1.RELEASE - compile - true - - - io.reactivex - rxjava-reactive-streams - 1.2.1 - compile - true - - - org.springframework.retry - spring-retry - 1.2.4.RELEASE - compile - true - - - org.springframework.boot - spring-boot-starter-aop - 2.2.2.RELEASE - compile - - - org.springframework.cloud - spring-cloud-commons - 2.2.2.BUILD-SNAPSHOT - compile - true - - - org.springframework.cloud - spring-cloud-context - 2.2.2.BUILD-SNAPSHOT - compile - true - - - com.netflix.ribbon - ribbon-loadbalancer - 2.3.0 - compile - - - annotations - com.google.code.findbugs - - - true - - - io.github.openfeign - feign-core - 10.7.0 - compile - true - - - io.github.openfeign.form - feign-form-spring - 3.8.0 - compile - - - io.github.openfeign - feign-slf4j - 10.7.0 - compile - true - - - io.github.openfeign - feign-httpclient - 10.7.0 - compile - true - - - io.github.openfeign - feign-hystrix - 10.7.0 - compile - true - - - io.github.openfeign - feign-okhttp - 10.7.0 - compile - true - - - com.netflix.hystrix - hystrix-core - 1.5.18 - compile - - - annotations - com.google.code.findbugs - - - true - - - com.netflix.hystrix - hystrix-serialization - 1.5.18 - compile - - - annotations - com.google.code.findbugs - - - true - - - com.netflix.hystrix - hystrix-metrics-event-stream - 1.5.18 - compile - - - servlet-api - javax.servlet - - - true - - - com.netflix.hystrix - hystrix-javanica - 1.5.18 - compile - - - jsr305 - com.google.code.findbugs - - - annotations - com.google.code.findbugs - - - aspectjrt - org.aspectj - - - true - - - com.netflix.ribbon - ribbon-core - 2.3.0 - compile - - - annotations - com.google.code.findbugs - - - true - - - com.netflix.ribbon - ribbon-httpclient - 2.3.0 - compile - - - annotations - com.google.code.findbugs - - - true - - - io.reactivex - rxjava - 1.3.8 - compile - true - - - com.squareup.okhttp3 - okhttp - 3.14.4 - compile - true - - - org.springframework.boot - spring-boot-autoconfigure-processor - 2.2.2.RELEASE - compile - true - - - org.springframework.boot - spring-boot-configuration-processor - 2.2.2.RELEASE - compile - true - - - org.springframework.data - spring-data-commons - 2.2.3.RELEASE - compile - true - - - org.springframework.cloud - spring-cloud-loadbalancer - 2.2.2.BUILD-SNAPSHOT - compile - true - - - diff --git a/spring-cloud-starter-openfeign/.flattened-pom.xml b/spring-cloud-starter-openfeign/.flattened-pom.xml deleted file mode 100644 index ed9e3d52..00000000 --- a/spring-cloud-starter-openfeign/.flattened-pom.xml +++ /dev/null @@ -1,164 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-openfeign - 2.2.2.BUILD-SNAPSHOT - .. - - org.springframework.cloud - spring-cloud-starter-openfeign - 2.2.2.BUILD-SNAPSHOT - Spring Cloud Starter OpenFeign - Spring Cloud Starter OpenFeign - https://projects.spring.io/spring-cloud - - Pivotal Software, Inc. - https://www.spring.io - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - Copyright 2014-2015 the original author or authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. - - See the License for the specific language governing permissions and - limitations under the License. - - - - - dsyer - Dave Syer - dsyer at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - lead - - - - sgibb - Spencer Gibb - sgibb at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - lead - - - - mgrzejszczak - Marcin Grzejszczak - mgrzejszczak at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - developer - - - - rbaxter - Ryan Baxter - rbaxter at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - developer - - - - omaciaszeksharma - Olga Maciaszek-Sharma - omaciaszeksharma at pivotal.io - Pivotal Software, Inc. - https://www.spring.io - - developer - - - - - scm:git:git://github.com/spring-cloud/spring-cloud-openfeign.git/spring-cloud-starter-openfeign - scm:git:ssh://git@github.com/spring-cloud/spring-cloud-openfeign.git/spring-cloud-starter-openfeign - https://github.com/spring-cloud/spring-cloud-openfeign/spring-cloud-starter-openfeign - - - - org.springframework.cloud - spring-cloud-starter - 2.2.2.BUILD-SNAPSHOT - compile - - - org.springframework.cloud - spring-cloud-openfeign-core - 2.2.2.BUILD-SNAPSHOT - compile - - - org.springframework - spring-web - 5.2.2.RELEASE - compile - - - org.springframework.cloud - spring-cloud-commons - 2.2.2.BUILD-SNAPSHOT - compile - - - io.github.openfeign - feign-core - 10.7.0 - compile - - - io.github.openfeign - feign-slf4j - 10.7.0 - compile - - - io.github.openfeign - feign-hystrix - 10.7.0 - compile - - - org.springframework.cloud - spring-cloud-starter-netflix-ribbon - 2.2.2.BUILD-SNAPSHOT - compile - true - - - org.springframework.cloud - spring-cloud-starter-netflix-archaius - 2.2.2.BUILD-SNAPSHOT - compile - true - - - org.springframework.cloud - spring-cloud-starter-loadbalancer - 2.2.2.BUILD-SNAPSHOT - compile - true - - - From f3c3b9073bb6a70f76f46318c710a3bd66b5dea4 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 17 Jan 2020 18:59:24 -0500 Subject: [PATCH 5/9] ignores .flattened-pom.xml --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0f4f3fdb..8a860b40 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,6 @@ _site/ .shelf *.swp *.swo -.vscode/ \ No newline at end of file +.vscode/ +.flattened-pom.xml + From 06769c47057a94e4958a53b3ead32467510ea62a Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 6 Mar 2020 12:52:51 -0500 Subject: [PATCH 6/9] Updates docs branches --- docs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pom.xml b/docs/pom.xml index cf642676..1734978a 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -15,7 +15,7 @@ spring-cloud-openfeign ${basedir}/.. - 2.0.x,2.1.x + 2.1.x,2.2.x feign.* From 1ad9a8a24fb567e49b226d828c696cbd2c5840d6 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 18 Mar 2020 18:16:24 -0400 Subject: [PATCH 7/9] bumps build to 2.2.4.BUILD-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 32749051..5cf1b422 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 2.2.3.RELEASE + 2.2.4.BUILD-SNAPSHOT From cd1cead7fd5c319e1f61cdbe695da7188b8a7fa1 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 19 Mar 2020 12:00:35 -0400 Subject: [PATCH 8/9] bumps build to 2.3.0.BUILD-SNAPSHOT --- pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5cf1b422..3e00a014 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 2.2.4.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index ea90476a..6d56db7a 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -6,7 +6,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.2.4.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT spring-cloud-openfeign-dependencies From db2e84ef06efd8ca21b6d2dbd5f7e795b0c4821e Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Fri, 20 Mar 2020 19:58:47 +0100 Subject: [PATCH 9/9] Add test for passing `@MatrixVariable` without specified name. Add documentation for `@MatrixVariable` support. Fixes gh-307. --- .../main/asciidoc/spring-cloud-openfeign.adoc | 31 +++++++++++++++++++ .../support/SpringMvcContractTests.java | 19 ++++++++++++ 2 files changed, 50 insertions(+) diff --git a/docs/src/main/asciidoc/spring-cloud-openfeign.adoc b/docs/src/main/asciidoc/spring-cloud-openfeign.adoc index 76ffcd11..0bc222e3 100644 --- a/docs/src/main/asciidoc/spring-cloud-openfeign.adoc +++ b/docs/src/main/asciidoc/spring-cloud-openfeign.adoc @@ -524,6 +524,37 @@ public interface DemoTemplate { } ---- +=== Spring MatrixVariable Support + +Spring Cloud OpenFeign provides support for the Spring `@MatrixVariable` annotation. + +If a map is passed as the method argument, the `@MatrixVariable` path segment is created by joining key-value pairs from the map with a `=`. + +If a different object is passed, either the `name` provided in the `@MatrixVariable` annotation (if defined) or the annotated variable name is +joined with the provided method argument using `=`. + +IMPORTANT:: Even though, on the server side, Spring does not require the users to name the path segment placeholder same as the matrix variable name, since it would be too ambiguous on the client side, Sprig Cloud OpenFeign requires that you add a path segment placeholder with a name matching either the `name` provided in the `@MatrixVariable` annotation (if defined) or the annotated variable name. + +For example: + +[source,java,indent=0] +---- +@GetMapping("/objects/links/{matrixVars}") +Map> getObjects(@MatrixVariable Map> matrixVars); +---- +Note that both variable name and the path segment placeholder are called `matrixVars`. + +[source,java,indent=0] +---- +@FeignClient("demo") +public interface DemoTemplate { + + @GetMapping(path = "/stores") + CollectionModel getStores(); +} +---- + + === Troubleshooting ==== Early Initialization Errors diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java index 997a3e8f..8daf7a8c 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java @@ -554,6 +554,22 @@ public class SpringMvcContractTests { .isEqualTo(data.indexToExpander().get(0).expand("value")); } + @Test + public void testMatrixVariableWithNoName() throws NoSuchMethodException { + Method method = TestTemplate_MatrixVariable.class + .getDeclaredMethod("matrixVariableNotNamed", Map.class); + MethodMetadata data = this.contract + .parseAndValidateMetadata(method.getDeclaringClass(), method); + Map testMap = new HashMap<>(); + + testMap.put("param", "value"); + + assertThat(data.template().method()).isEqualTo("GET"); + assertThat(data.template().url()).isEqualTo("/matrixVariable/{params}"); + assertThat(";param=value") + .isEqualTo(data.indexToExpander().get(0).expand(testMap)); + } + @Test public void testAddingTemplatedParameterWithTheSameKey() throws NoSuchMethodException { @@ -697,6 +713,9 @@ public class SpringMvcContractTests { @RequestMapping(path = "/matrixVariableObject/{param}") String matrixVariableObject(@MatrixVariable("param") Object object); + @RequestMapping(path = "/matrixVariable/{params}") + String matrixVariableNotNamed(@MatrixVariable Map params); + } @JsonAutoDetect