Commit Graph

1161 Commits

Author SHA1 Message Date
Spencer Gibb
a5d9810016 Merge branch '2.2.x' 2020-03-20 14:42:12 -04:00
Spencer Gibb
d5dc4465b2 Ignores flaky test.
See gh-1627
2020-03-20 14:40:24 -04:00
buildmaster
9441a25938 Bumping versions 2020-03-19 16:06:11 +00:00
Spencer Gibb
128ca4392a Bumps to build 2.3.0.BUILD-SNAPSHOT 2020-03-19 10:48:57 -04:00
Spencer Gibb
155c7d9131 Updates ilford boot compatibility 2020-03-18 17:42:24 -04:00
Spencer Gibb
bcdd56e74b Merge branch '2.2.x' 2020-03-18 17:41:45 -04:00
Spencer Gibb
7dd88a6e7f Verifies current boot version is in CompatibilityVerifierProperties.
Also fixes support for wildcard 2.2.x beyond boot 2.1.x

fixes gh-715
2020-03-18 17:31:29 -04:00
Spencer Gibb
d679add055 Updates compatible versions to 2.2.x and 2.3.x
see https://github.com/spring-cloud/spring-cloud-build/issues/153
2020-03-18 17:30:13 -04:00
Spencer Gibb
41208021ed Bumps to build 2.2.4.BUILD-SNAPSHOT 2020-03-18 16:55:30 -04:00
Spencer Gibb
e946ef1e79 Adds boot 2.3 compatiblity 2020-03-18 16:48:02 -04:00
Olga Maciaszek-Sharma
dd0aa3f7f1 Merge remote-tracking branch 'origin/2.2.x' 2020-03-17 18:44:53 +01:00
Olga Maciaszek-Sharma
c30b424e5d Minor refactoring to adjust to team conventions. 2020-03-17 18:42:20 +01:00
Spencer Gibb
589d6d0ca2 Merge branch '2.2.x' 2020-03-16 15:43:28 -04:00
Timothy
b85f7375d1 Adds reconstructURI method to ReactorLoadBalancerExchangeFilterFunction
fixes gh-711
2020-03-16 15:42:50 -04:00
Spencer Gibb
289d1dbae5 Increase timeout for CI tests 2020-03-10 15:31:01 -04:00
Spencer Gibb
7d84168da5 Removes references to Hystrix 2020-03-10 15:29:38 -04:00
Spencer Gibb
75c78754bf Merge branch '2.2.x' 2020-03-10 15:27:36 -04:00
JinSoo Han
3863d389bb Typo correction in document (#708)
Co-authored-by: jinsoohan <jinsoo.han@gmail.com>
2020-03-10 15:24:21 -04:00
Spencer Gibb
6a1cc5b793 Merge branch '2.2.x' 2020-03-10 15:00:20 -04:00
Spencer Gibb
e8952fc66a Updates ContextRefresher to maintain property source ordering. (#705)
Updates the targetName so that property sources maintain ordering from the bootstrap environment where they were refreshed.

Fixes gh-704
2020-03-10 14:57:57 -04:00
Spencer Gibb
38fdd36a6d formatting 2020-03-09 16:22:36 -04:00
Spencer Gibb
09a2e62737 Increase timeout for CI tests 2020-03-04 17:19:19 -05:00
buildmaster
c6b069d72d Bumping versions 2020-03-04 16:05:15 +00:00
buildmaster
86d9fc762f Bumping versions to 2.2.3.BUILD-SNAPSHOT after release 2020-03-04 15:28:35 +00:00
buildmaster
f18c131bb8 Going back to snapshots 2020-03-04 15:28:35 +00:00
buildmaster
562088c03d Update SNAPSHOT to 2.2.2.RELEASE 2020-03-04 15:21:54 +00:00
Spencer Gibb
f6a4bebf91 Merge branch '2.2.x' 2020-03-03 17:55:32 -05:00
Spencer Gibb
69a8cece5f Ensures HikariDataSource is never re-bound.
Removes HikariDataSource from extra-refreshable and adds it to a new property never-refreshable.

ConfigurationPropertiesRebinder now checks that property and does not rebind beans whose class is in never-refreshable.

fixes gh-687
2020-03-03 17:54:58 -05:00
Spencer Gibb
5ea26e13a3 formatting 2020-03-03 17:52:52 -05:00
Spencer Gibb
0f78c5b4ad Pass SimpleDiscoveryProperties as parameter.
18a4227c4e turned proxying off which broke this.

fixes gh-687
2020-03-03 17:51:22 -05:00
Spencer Gibb
773888fcad Updates javadoc to mention WebClient.
fixes gh-645
2020-03-03 16:04:07 -05:00
Spencer Gibb
4667587016 formatting 2020-03-03 15:13:57 -05:00
Spencer Gibb
893921473b Merge branch '2.2.x' 2020-03-03 15:12:48 -05:00
robotmrv
6db6a81d82 Fixes issues in HealthCheckServiceInstanceListSupplier (#685)
- WebClient response leaks
- potential Scheduled task leak
- rework polling to plain reactor operators
- remove non atomic operations on ServiceInstance lists

related to gh-629
fixes issues from gh-683
2020-03-03 15:12:07 -05:00
Ryan Baxter
fac994a454 Merge remote-tracking branch 'origin/2.2.x' 2020-02-27 16:19:44 -05:00
Ryan Baxter
fdfc0d5e9f Making constructor public 2020-02-27 12:18:08 -05:00
Ryan Baxter
987971a45b Merge remote-tracking branch 'origin/2.2.x' 2020-02-27 10:20:47 -05:00
Ryan Baxter
8127bab974 Move BootstrapPropertySource to its own class and expose delegate PropertySource via getter (#695) 2020-02-27 10:19:57 -05:00
Olga Maciaszek-Sharma
2710c8251d Remove ribbon integration (#691)
* Remove Ribbon-specific configuration.

* Remove Ribbon-specific docs. Refactor.
2020-02-22 14:04:55 +01:00
Olga Maciaszek-Sharma
8a899f0bb0 Merge remote-tracking branch 'origin/2.2.x' 2020-02-10 18:01:46 +01:00
Olga Maciaszek-Sharma
def41f4540 Allow overriding choose(String serviceId) method. 2020-02-10 17:59:38 +01:00
Olga Maciaszek-Sharma
f9179824bc Merge remote-tracking branch 'origin/2.2.x' 2020-02-10 13:20:10 +01:00
Olga Maciaszek-Sharma
7716c939b7 Allow overriding ReactorLoadBalancerExchangeFilterFunction. 2020-02-10 13:19:13 +01:00
Olga Maciaszek-Sharma
d0b6278f87 Merge branch '2.2.x' 2020-02-04 18:27:27 +01:00
Olga Maciaszek-Sharma
070e0a8518 Add info on SimpleDiscoveryClient in the docs. Remove redundant param. (#684)
* Add info on SimpleDiscoveryClient in the docs. Remove redundant parameter.

* Remove warning after discussion.
2020-02-04 18:26:44 +01:00
Olga Maciaszek-Sharma
7a648c3582 Merge branch '2.2.x' 2020-02-04 17:00:26 +01:00
Olga Maciaszek-Sharma
22efb79776 Fix warning wording. 2020-02-04 16:32:30 +01:00
Olga Maciaszek-Sharma
1170910112 Merge branch '2.2.x' 2020-02-04 10:15:17 +01:00
Olga Maciaszek-Sharma
47a810606d Fix gh 629 new (#683)
* Swaps deprecated ConditionalOnEnabledEndpoint for updated annotation.

Swaps with ConditionalOnAvailableEndpoint

* Migrates to new OutputCaptureRule

* Migrates to new OutputCaptureRule

* Add health check loadBalancing implementation.

* Make isAlive() method protected.

Co-authored-by: Spencer Gibb <spencer@gibb.tech>
2020-02-04 10:14:08 +01:00
Spencer Gibb
44dce764e8 Merge branch '2.2.x' 2020-01-30 14:35:41 -05:00