Commit Graph

3171 Commits

Author SHA1 Message Date
Haytham Mohamed
e820a484d6 add WebClient as opt-in option 2020-04-16 23:44:32 -05:00
buildmaster
fd702085f5 Bumping versions 2020-04-17 02:26:13 +00:00
XiaoZiShan
2afba0977f 😀typo I found reading zuul source code (#3776)
a little excited but seeing the current module into the maintenance phase and not knowing if it will be merged, I would like to be involved in the spring community to contribute.
2020-04-15 20:25:46 +02:00
Olga Maciaszek-Sharma
30c7556339 Merge branch '2.2.x' 2020-04-14 21:39:33 +02:00
Olga Maciaszek-Sharma
61d2f956e3 Remove superfluous directive. Fixes gh-3756. 2020-04-14 21:38:46 +02:00
Olga Maciaszek-Sharma
b40abd805f Merge branch '2.2.x'
# Conflicts:
#	spring-cloud-netflix-hystrix-dashboard/pom.xml
#	spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/index.ftlh
#	spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/monitor.ftlh
#	spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardContextTests.java
2020-04-10 17:37:16 +02:00
Olga Maciaszek-Sharma
17b9002fef Upgrade jQuery. Fixes gh-3773. 2020-04-10 17:35:43 +02:00
buildmaster
2bab1f468b Going back to snapshots 2020-04-09 22:20:03 +00:00
buildmaster
57d4adcb71 Update SNAPSHOT to 3.0.0.M1 2020-04-09 22:19:25 +00:00
Spencer Gibb
3a69892446 Merge branch '2.2.x' 2020-04-07 15:21:18 -04:00
Eduard Wirch
d6f375490a Fix circular dependency in ZuulProxyAutoConfiguration (#3769)
ZuulProxyAutoConfiguration declared a ServiceRouteMapper bean and required it for a field injection at the same time.

Fixes gh-3733
2020-04-07 15:20:07 -04:00
Spencer Gibb
bee39ec1bf Updates eureka to 1.9.19
fixes gh-3770
2020-04-07 15:19:33 -04:00
Spencer Gibb
a48c47a669 Removes commented out dependency 2020-04-07 12:05:23 -04:00
Spencer Gibb
3bbec714a7 Removes unused stream property 2020-04-07 12:05:11 -04:00
Spencer Gibb
0dc755518c Adds maintenance mode info for concurrency-limits module.
see gh-3767
2020-04-07 11:46:48 -04:00
Spencer Gibb
e67361f821 Removes concurrency-limits module.
fixes gh-3768
2020-04-07 11:40:45 -04:00
Spencer Gibb
27b42c45d7 Merge branch '2.2.x' 2020-04-07 11:36:44 -04:00
Spencer Gibb
ad3f2cb53a Deprecates concurrency-limits module.
fixes gh-3767
2020-04-07 11:31:44 -04:00
Marcin Grzejszczak
76638be446 Updated docs 2020-04-01 13:43:31 +02:00
Spencer Gibb
74f9fd4f9d bumps build to 2.3.0.BUILD-SNAPSHOT 2020-03-19 10:59:24 -04:00
Spencer Gibb
c69a3eed70 Makes springClientFactory conditional on missing bean 2020-03-18 18:20:38 -04:00
Spencer Gibb
0c12ec9132 Adds validation starter 2020-03-18 18:05:38 -04:00
Spencer Gibb
2f6f0a0f05 Fixes assertion to use valid class 2020-03-18 18:03:21 -04:00
Spencer Gibb
c0174be906 bumps build to 2.2.4.BUILD-SNAPSHOT 2020-03-18 18:00:49 -04:00
Spencer Gibb
7e96ed15f2 Updates docs branches 2020-03-06 12:42:52 -05:00
Spencer Gibb
9da98fd58b Merge branch '2.2.x' 2020-03-04 17:50:00 -05:00
Spencer Gibb
1b07143fde Removes management of spring-cloud-netflix-hystrix-contract
spring-cloud-netflix-hystrix-contract is not a published artifact and can make validating the bom more complicated than needed.

Fixes gh-3740
2020-03-04 17:46:57 -05:00
buildmaster
ea31d78891 Bumping versions to 2.2.3.BUILD-SNAPSHOT after release 2020-03-04 16:14:34 +00:00
buildmaster
492731632c Going back to snapshots 2020-03-04 16:14:33 +00:00
buildmaster
551fecde83 Update SNAPSHOT to 2.2.2.RELEASE 2020-03-04 16:05:27 +00:00
Spencer Gibb
04769a1b48 Removes unneeded dependencies, stream and contract 2020-02-04 18:44:44 -05:00
Spencer Gibb
74a1d2acf3 Merge branch '2.2.x' 2020-02-04 18:27:20 -05:00
Spencer Gibb
aed8d19aea Updates contract version to 2.2.1.RELEASE 2020-02-04 18:23:35 -05:00
Olga Maciaszek-Sharma
de854d492a Fix checkstyle. 2020-02-04 19:55:46 +01:00
Olga Maciaszek-Sharma
8d3f87c87c Merge branch '2.2.x'
# Conflicts:
#	spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/loadbalancer/EurekaLoadBalancerClientConfiguration.java
2020-02-04 19:45:45 +01:00
Olga Maciaszek-Sharma
ff6b50d0a8 Adjust to changes in commons. 2020-02-04 19:40:28 +01:00
Spencer Gibb
c669868b36 Merge branch '2.2.x' 2020-01-29 12:20:20 -05:00
Spencer Gibb
3cb98b70ce Updates eureka to 1.9.17
Doesn't shutdown servo for AbstractDocumentationTests.

fixes gh-3743
2020-01-29 12:17:00 -05:00
Spencer Gibb
f2ec43b318 Merge branch '2.2.x' 2020-01-27 15:43:44 -05:00
Spencer Gibb
d1ffc8d72e Revert "Updates eureka to 1.9.17"
This reverts commit 49f88c4e
2020-01-27 15:42:45 -05:00
Spencer Gibb
8028878d1c Merge branch '2.2.x' 2020-01-27 14:15:09 -05:00
Spencer Gibb
49f88c4e7c Updates eureka to 1.9.17
fixes gh-3743
2020-01-27 14:14:03 -05:00
Spencer Gibb
41ac1e7b89 Removes deprecated EurekaDiscoveryClient.EurekaServiceInstance
fixes gh-3742
2020-01-27 12:48:48 -05:00
Spencer Gibb
41f69f51f3 Merge branch '2.2.x' 2020-01-27 12:29:17 -05:00
Spencer Gibb
53bffa7f04 formatting 2020-01-27 12:26:33 -05:00
Spencer Gibb
8e1ada2b3d formatting 2020-01-27 12:26:17 -05:00
Spencer Gibb
4122aadb73 Removes implementation in preference of parent class 2020-01-27 12:24:42 -05:00
Spencer Gibb
92c0c7d503 Merge branch '2.1.x' into 2.2.x 2020-01-27 12:24:15 -05:00
Dmitrii_Priporov
34b1a07124 Implements ServiceInstance.getScheme() using InstanceInfo.
fixes gh-3727
2020-01-27 12:24:07 -05:00
Spencer Gibb
ae637ab3e5 Implements getScheme 2020-01-27 12:23:41 -05:00