From 6f09ae0824ec3297f1fbfe250f42992fae1ae7f3 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 4 Mar 2020 16:28:48 +0000 Subject: [PATCH] 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