Olga Maciaszek-Sharma
fbb5c920c4
Fix merge.
3 years ago
Olga Maciaszek-Sharma
b991442f90
merge 3.1.x
3 years ago
Olga Maciaszek-Sharma
c72f6d0795
Backport support for custom HTTP status in a backwards compatible way. ( #1087 )
3 years ago
spencergibb
bed3e3de6e
Updates to use new boot 3 class in version verifier.
3 years ago
Olga Maciaszek-Sharma
63cbb815b0
Add missing properties to config and docs.
3 years ago
Olga Maciaszek-Sharma
fedd786417
Merge remote-tracking branch 'origin/3.1.x'
3 years ago
Olga Maciaszek-Sharma
395386414d
Add missing LB properties to additiona-spring-configuration-metadata and configprops. Fix typo. Fixes gh-1086.
3 years ago
Olga Maciaszek-Sharma
6d344c9581
Custom retry exceptions ( #1085 )
3 years ago
Olga Maciaszek-Sharma
66b295529e
Merge remote-tracking branch 'origin/3.1.x'
3 years ago
Olga Maciaszek-Sharma
294badc4bf
Reformat.
3 years ago
jizhuozhi
094514ec4b
Remove unnecessary sign check, whether positive or negative ( #1078 )
3 years ago
Olga Maciaszek-Sharma
14dd6425e7
Merge remote-tracking branch 'origin/3.1.x'
3 years ago
Olga Maciaszek-Sharma
71426cfa8a
Expose indicators map - needed for a bugfix in SC Netflix.
3 years ago
spencergibb
97033063e5
Adds TestSocketUtils which was removed from framework 6
3 years ago
Olga Maciaszek-Sharma
ab864281a3
Merge remote-tracking branch 'origin/3.1.x'
3 years ago
Olga Maciaszek-Sharma
6082154010
Reformat.
3 years ago
jizhuozhi
88c6a9e31f
Enforces the order of RoundRobinLoadBalancer when positive overflow ( #1077 )
3 years ago
Olga Maciaszek-Sharma
e5ae816204
Use raw status codes in ResponseData. ( #1073 )
3 years ago
spencergibb
a1f408c8e1
Fixes DefaultOkHttpClientFactoryTest to not use reflection
3 years ago
spencergibb
7817046f77
Fixes DefaultOkHttpClientFactoryTest to not use reflection
3 years ago
buildmaster
76d522c125
Bumping versions
3 years ago
Olga Maciaszek-Sharma
e7b8960b65
Merge remote-tracking branch 'origin/3.1.x', reformat. Fix OkHttpClient test.
...
# Conflicts:
# docs/pom.xml
# docs/src/main/asciidoc/_configprops.adoc
# pom.xml
# spring-cloud-commons-dependencies/pom.xml
# spring-cloud-commons/pom.xml
# spring-cloud-commons/src/main/java/org/springframework/cloud/client/DefaultServiceInstance.java
# spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientTests.java
# spring-cloud-context-integration-tests/pom.xml
# spring-cloud-context-webflux-integration-tests/pom.xml
# spring-cloud-context/pom.xml
# spring-cloud-loadbalancer/pom.xml
# spring-cloud-starter-bootstrap/pom.xml
# spring-cloud-starter-loadbalancer/pom.xml
# spring-cloud-starter/pom.xml
# spring-cloud-test-support/pom.xml
3 years ago
Olga Maciaszek-Sharma
9c3620b772
Reformat and regenerate docs.
3 years ago
Neil Powell
64b0d17e0b
Support uri without port for default service instance ( #1054 )
3 years ago
Neil Powell
757900e77a
Support uri without port for default service instance ( #1054 )
3 years ago
Ryan Baxter
f1be8803cc
Make class abstract. Fixes #1069
3 years ago
buildmaster
7b8e7d9050
Bumping versions to 3.1.2-SNAPSHOT after release
3 years ago
buildmaster
80338bc99b
Going back to snapshots
3 years ago
buildmaster
8925ab5e3f
Update SNAPSHOT to 3.1.1
3 years ago
buildmaster
a14efc17de
Bumping versions
3 years ago
Ryan Baxter
e69c61aee4
Merge branch '3.1.x'
3 years ago
L. Stitz
7401022838
Consider spring.profiles.active when resolving service ID. ( #1064 )
...
New constant IdUtils.DEFAULT_SERVICE_ID_WITH_ACTIVE_PROFILES_STRING refers to profiles in second position.
IdUtils.getResolvedServiceId chooses new constant as template only if profiles are active, and thus remains backwards-compatible.
Add unit tests for new behaviour.
Fixes gh-930.
3 years ago
buildmaster
171c0a4485
Bumping versions
3 years ago
spencergibb
9eae606b18
Merge branch '3.1.x'
3 years ago
spencergibb
b041b0a55d
Adds verifier support for boot 2.7
...
Fixes gh-1049
3 years ago
spencergibb
05382d3053
Return empty array if ConfigurationPropertySource.from returns null
...
Fixes gh-1062
3 years ago
spencergibb
c9ee1fab60
Return empty array if ConfigurationPropertySource.from returns null
...
Fixes gh-1062
3 years ago
buildmaster
1ce1201e9d
Going back to snapshots
3 years ago
buildmaster
d49432a406
Update SNAPSHOT to 4.0.0-M1
3 years ago
spencergibb
14efdc71c7
formatting
3 years ago
spencergibb
29ea80fae1
changes milestone repository
3 years ago
buildmaster
5fc44a17a3
Bumping versions
3 years ago
spencergibb
0d7722dec8
Restores bootstrap functionality.
3 years ago
buildmaster
e335b1245b
Bumping versions
3 years ago
spencergibb
14923ae268
Make token relay require servlet web app
...
since it depends on servlet classes)
3 years ago
spencergibb
cc99331339
Updates to 4.0.0-SNAPSHOT
3 years ago
spencergibb
5d0915b8ad
Removes old spring-security-oauth2.
...
See gh-1053
3 years ago
spencergibb
c93ffbf034
Removes old spring-security-oauth2.
...
See gh-1053
3 years ago
spencergibb
fedeb0aa4b
Removes old spring-security-oauth2.
...
See gh-1053
3 years ago
spencergibb
4d9d242841
Compatibility updates for framework 6 and boot 3
3 years ago