SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,845 Commits 28 Branches 0 Tags
fix-pageable-processing-when-querymap-present
Commit Graph

2845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Olga Maciaszek-Sharma
1178739437 Merge remote-tracking branch 'origin/2.2.x' 2020-09-17 14:51:13 +02:00
Olga Maciaszek-Sharma
c3dcb1f376 Remove maven compiler plugin version to use the one provided by Boot instead. 2020-09-17 14:49:03 +02:00
Olga Maciaszek-Sharma
27e2775c5f Upgrade protobuf-java. 2020-09-17 14:30:54 +02:00
Olga Maciaszek-Sharma
83ef242406 Upgrade vavr. 2020-09-17 14:20:29 +02:00
Olga Maciaszek-Sharma
2d9f51a17f Merge 2.2.x. 2020-09-17 14:09:15 +02:00
Olga Maciaszek-Sharma
faff6aef8a Reformat with updated JavaFormat plugin version. 2020-09-17 13:54:45 +02:00
Olga Maciaszek-Sharma
6534950ed2 Upgrade jakson. 2020-09-17 12:57:47 +02:00
Olga Maciaszek-Sharma
80710a9f20 Merge remote-tracking branch 'origin/2.2.x' 
# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-openfeign-core/pom.xml
#	spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientOverrideDefaultsTests.java
#	spring-cloud-openfeign-dependencies/pom.xml
#	spring-cloud-starter-openfeign/pom.xml
 2020-09-16 13:01:34 +02:00
Olga Maciaszek-Sharma
e83593651c Clean up test. 2020-09-16 12:50:57 +02:00
Olga Maciaszek-Sharma
4cbf6da17b Adjust test to changes in commons. 2020-09-16 12:38:22 +02:00
liuzeyanga
5fea4f3b35 change "Sprig Cloud" to  "Spring Cloud" 2020-09-16 11:53:59 +02:00
buildmaster
36c06c97a6 Bumping versions to 2.2.6.BUILD-SNAPSHOT after release 2020-08-28 20:04:40 +00:00
buildmaster
d6b021eaa4 Going back to snapshots 2020-08-28 20:04:40 +00:00
buildmaster
c2430c0e29 Update SNAPSHOT to 2.2.5.RELEASE 2020-08-28 20:02:41 +00:00
Olga Maciaszek-Sharma
d41f041efc Merge remote-tracking branch 'origin/2.2.x' 
# Conflicts:
#	pom.xml
 2020-08-13 14:41:12 +02:00
Olga Maciaszek-Sharma
b66e08fda8 Fix the docs. 2020-08-13 14:37:55 +02:00
spencergibb
84819e1328 Bumps s-c-build to 2.3.2.BUILD-SNAPSHOT 2020-08-03 13:21:35 -04:00
spencergibb
b6422db8e9 ignores .sdkmanrc 2020-08-03 13:21:17 -04:00
Olga Maciaszek-Sharma
2f13eb4816 Merge remote-tracking branch 'origin/2.2.x' 
# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-openfeign-core/pom.xml
#	spring-cloud-openfeign-dependencies/pom.xml
#	spring-cloud-starter-openfeign/pom.xml
 2020-08-03 10:05:52 +02:00
Olga Maciaszek-Sharma
4bf010e810 Ignore InvalidMediaTypeException when verifying if Multipart content. Fixes gh-363. (#388) 2020-08-03 10:02:05 +02:00
buildmaster
bd671efed9 Bumping versions to 2.2.5.BUILD-SNAPSHOT after release 2020-07-31 20:53:35 +00:00
buildmaster
bfd473cb8f Going back to snapshots 2020-07-31 20:53:35 +00:00
buildmaster
2f5d63a061 Update SNAPSHOT to 2.2.4.RELEASE 2020-07-31 20:51:47 +00:00
Olga Maciaszek-Sharma
62aa76fb97 Merge remote-tracking branch 'origin/2.2.x' 2020-07-30 16:24:25 +02:00
Olga Maciaszek-Sharma
14929cbfee Revert "Fix double @RequestMapping with empty value (#245)" 
This reverts commit 0afb60a72a.

# Conflicts:
#	spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java
#	spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java
 2020-07-30 16:18:25 +02:00
buildmaster
5ce900828f Going back to snapshots 2020-07-23 18:26:47 +00:00
buildmaster
48bb0cdba5 Update SNAPSHOT to 3.0.0-M3 2020-07-23 18:25:41 +00:00
spencergibb
dc5eef0125 Updates to new BlockingLoadBalancerClient constructor 2020-07-23 13:36:14 -04:00
Olga Maciaszek-Sharma
343f436b71 Merge remote-tracking branch 'origin/2.2.x' 2020-07-17 15:07:20 +02:00
Olga Maciaszek-Sharma
d3da7e16e8 Add CollectionFormat support (#371) 
* Add CollectionFormat support. Fixes gh-146.

* Minor refactoring.

* Fix docs.
 2020-07-17 15:05:21 +02:00
Olga Maciaszek-Sharma
f184c3f293 Merge remote-tracking branch 'origin/2.2.x' 2020-07-14 17:38:50 +02:00
Olga Maciaszek-Sharma
4e89dd1523 Annotate @FeignClient with @Inherited. Fixes gh-322. (#370) 2020-07-14 17:38:02 +02:00
Olga Maciaszek-Sharma
f600140004 Merge remote-tracking branch 'origin/2.2.x' 2020-07-14 16:03:00 +02:00
Olga Maciaszek-Sharma
63ba4d40ff Fix checkstyle. 2020-07-14 16:02:28 +02:00
Olga Maciaszek-Sharma
d07c229b0e Merge remote-tracking branch 'origin/2.2.x' 2020-07-14 15:20:23 +02:00
Olga Maciaszek-Sharma
06862ab090 Add test for @MockBean. Fixes gh-343. 2020-07-14 15:19:58 +02:00
Olga Maciaszek-Sharma
84cb74a898 Merge remote-tracking branch 'origin/2.2.x' 
# Conflicts:
#	spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java
 2020-07-13 17:23:49 +02:00
Olga Maciaszek-Sharma
72784920d8 Fix read timeout (#369) 
* Fix setting readTimeout and connectionTimeout separately from each other. Fixes gh-324.

* Refactor (remove superfluous keywords) and reformat.
 2020-07-13 17:19:18 +02:00
Ryan Baxter
9677353c27 Fixing broken tests 2020-07-09 11:13:05 -04:00
spencergibb
4766d95def Adds junit-vintage-engine 2020-06-15 16:40:29 -04:00
Marcin Grzejszczak
bba3f2e92c Updated props 2020-06-08 17:54:58 +02:00
Marcin Grzejszczak
c4fd4eb42e Changed packaging to jar 2020-06-08 17:12:15 +02:00
Marcin Grzejszczak
b56a4a1259 Uploading sources for docs 2020-06-08 16:48:07 +02:00
Olga Maciaszek-Sharma
4a4da0e2d1 Merge remote-tracking branch 'origin/2.2.x' 2020-06-05 18:27:15 +02:00
Olga Maciaszek-Sharma
bf13ae95c9 Remove superfluous conditional. Fixes gh-323. (#350) 2020-06-05 18:26:34 +02:00
Olga Maciaszek-Sharma
efca091fda Merge remote-tracking branch 'origin/2.2.x' 
# Conflicts:
#	pom.xml
 2020-06-05 16:30:27 +02:00
Olga Maciaszek-Sharma
af06086c30 Fix docs. 2020-06-05 16:28:25 +02:00
Marcin Grzejszczak
5497f5a37c Migrated to docs.spring.io & updated sc-build 2020-06-04 15:50:09 +02:00
Olga Maciaszek-Sharma
2e2987e787 Merge remote-tracking branch 'origin/2.2.x' 
# Conflicts:
#	docs/src/main/asciidoc/spring-cloud-openfeign.adoc
 2020-06-04 14:59:17 +02:00
Olga Maciaszek-Sharma
12084de3a9 Fix docs. Fixes gh-340. 2020-06-04 14:54:38 +02:00