Commit Graph
100 Commits
Author SHA1 Message Date
Spencer Gibb 5804d12511 Bumps spring cloud build to 2.1.2.BUILD-SNAPSHOT 2019-01-12 13:05:02 -05:00
Spencer Gibb e65f78f06b Merge branch '2.0.x' 2018-12-18 14:49:49 -05:00
Spencer Gibb 15bda96e91 Merge branch '2.0.x' 2018-09-05 16:09:38 -04:00
Spencer Gibb 7148cce790 Upgrades to openfeign 9.7.0
fixes gh-53
2018-08-06 11:52:45 -04:00
Spencer Gibb 88fae41f02 Updates to work with boot 2.1.0 2018-08-03 15:04:17 -04:00
Spencer Gibb 674b88b467 Updates to s-c-build 2.0.2.BUILD-SNAPSHOT 2018-06-05 15:42:52 -04:00
Spencer Gibb b2ebfc0ecb Updates to new ServletEndpoint and ControllerEndpoint 2018-01-29 18:56:11 -05:00
Spencer Gibb eb0681f9c2 Get dynamic instanceinfo in ServiceRegistry.getStatus()
See https://github.com/spring-cloud/spring-cloud-commons/issues/310
2018-01-29 17:48:35 -05:00
Spencer Gibb 041b493a25 polish 2018-01-26 17:09:16 -05:00
Spencer Gibb a81eb771e5 Updates for new HttpTraceRepository 2018-01-26 16:21:58 -05:00
Spencer Gibb 29ad943f0a Use scheme in load balancing if provided. 2018-01-23 00:44:28 -05:00
Spencer Gibb e0ad44f2f1 Updates to new location of SecurityAutoConfiguration 2018-01-22 13:38:09 -05:00
Spencer Gibb 6fd4f44125 Fix updates from micrometer 2018-01-17 12:28:01 -05:00
Spencer Gibb f7172dd0c5 Polish 2018-01-17 12:13:27 -05:00
Spencer Gibb 1c51c9fa5e Updates test to account for new application context id rules from boot 2 2018-01-17 11:45:56 -05:00
Spencer Gibb 736317e684 Fix test 2018-01-16 16:43:08 -05:00
Spencer Gibb 6a3c509768 Supports /hystrix.stream for webflux
fixes gh-2629
2018-01-11 16:02:07 -05:00
Spencer Gibb dd978169da Use new RibbonProperties consistently. 2018-01-09 17:11:01 -05:00
Spencer Gibb ca81bdf71e Ribbon utilities 2018-01-09 15:15:08 -05:00
Spencer Gibb db66e1c3d4 polish 2018-01-08 13:14:25 -05:00
Spencer Gibb 81aadc3e05 Add test dependency for spring-security-rsa
fixes no class def found error
2018-01-01 16:48:02 -05:00
Spencer Gibb 4165fe221b Allow overriding of initialize() 2017-12-20 14:55:03 -05:00
Spencer Gibb 50924f296f Moves from archaius to boot properties.
This fixes problems in testing while maintaining backwards compatibility.

Allows upgrade of zuul to 1.3.1
2017-12-20 14:31:36 -05:00
Spencer Gibb 0a689b5008 polish 2017-12-20 14:30:25 -05:00
Spencer Gibb ac1ac4d5b1 Reinstates upgrade to zuul 1.3.1 2017-12-20 14:29:55 -05:00
Spencer Gibb 170739e662 Fix compile error, ignore broken tests 2017-12-11 21:38:44 -08:00
Spencer Gibb eec4c8cf85 remove empty files 2017-12-01 21:46:27 -05:00
Spencer Gibb e3cdb76373 Revert "fix zuul filters package url in Edgware (#2493)" (#2495)
This reverts commit d5e3cad80e.
2017-11-30 21:26:21 -05:00
Spencer Gibb b8a357b685 Upgrade wiremock to 1.2.0.RELEASE 2017-11-28 14:45:11 -05:00
Spencer Gibb ff5bf153bf Merge branch '1.4.x'
# Conflicts:
#	docs/pom.xml
2017-11-28 12:39:24 -05:00
Spencer Gibb dde7ff4c45 Update docs branches 2017-11-28 12:38:23 -05:00
Spencer Gibb 1cf1f435a6 Update eureka to 1.8.6
fixes gh-2456
2017-11-28 12:25:02 -05:00
Spencer Gibb 4e40cad235 Polish test 2017-11-28 11:25:49 -05:00
Spencer Gibb 07c4604c9b Polish test 2017-11-28 01:16:34 -05:00
Spencer Gibb ef755f3ad3 Merge branch 'master' into 2.0.x 2017-11-27 22:52:09 -05:00
Spencer Gibb e19ecf71da Updates for boot 2.0 compatibility 2017-11-27 14:31:19 -05:00
Spencer Gibb 7c62bd8871 Updates for boot 2.0 compatibility 2017-11-27 13:44:59 -05:00
Spencer Gibb ae34b77371 Updates for boot 2.0 compatibility 2017-11-22 12:30:54 -05:00
Spencer Gibb 946a46f2b1 Merge branch 'master' into 2.0.x 2017-11-21 19:27:49 -05:00
Spencer Gibb 1e87b50998 Update releaser build to build docs 2017-11-21 18:37:48 -05:00
Spencer Gibb f59a228daf Pass system properties to releaser build command 2017-11-21 17:48:01 -05:00
Spencer Gibb aaec6c4ca1 polish 2017-11-13 15:17:58 -05:00
Spencer Gibb f511c267ce Fix circular reference during object creation. 2017-11-06 08:37:59 +02:00
Spencer Gibb 799fbf43d1 polish 2017-11-06 08:26:33 +02:00
Spencer Gibb c4b075b1c8 Removes log4j-to-slf4j exclusion 2017-11-01 17:13:10 -04:00
Spencer Gibb 8112ddfec2 Temporarily excludes log4j-to-slf4j 2017-11-01 16:28:06 -04:00
Spencer Gibb 5a1708185a Fix removal of getLocalServiceInstance() 2017-10-30 18:25:22 -04:00
Spencer Gibb 35e2af7711 Merge branch 'master' into 2.0.x 2017-10-30 18:20:45 -04:00
Spencer Gibb a805b53d86 Merge branch 'daniellavoie-no-eureka-fix' 2017-10-30 18:10:15 -04:00
Spencer Gibb 388ec98087 Updates for changes to boot 2 2017-10-30 17:45:40 -04:00
Spencer Gibb 271bfcfb31 Fix tests 2017-10-27 18:43:31 -04:00
Spencer Gibb 2be1fb5123 Fix test 2017-10-27 17:36:38 -04:00
Spencer Gibb 70b0c06349 Fix zuul tests 2017-10-27 17:13:32 -04:00
Spencer Gibb bd7d8c944c Going back to snapshots 2017-10-27 16:39:34 -04:00
Spencer Gibb 355adf8369 Update SNAPSHOT to 2.0.0.M3 2017-10-27 16:37:39 -04:00
Spencer Gibb c9ce7af0f2 Add repositories 2017-10-27 16:26:38 -04:00
Spencer Gibb 086aa43055 Trying to fix tests 2017-10-27 16:16:21 -04:00
Spencer Gibb 103bd6475f Trying to fix tests 2017-10-27 16:03:38 -04:00
Spencer Gibb 5cc94532a7 remote routes defined in file 2017-10-27 15:44:23 -04:00
Spencer Gibb e07ed0bd9c Attempt to debug test in jenkins 2017-10-27 15:29:37 -04:00
Spencer Gibb 391add0945 Attempt to debug test in jenkins 2017-10-27 15:15:53 -04:00
Spencer Gibb cf576055f6 rename potential conflicting ribbon contexts 2017-10-27 14:17:01 -04:00
Spencer Gibb 0d84e72d76 points build.sh at correct mvnw location 2017-10-27 12:26:28 -04:00
Spencer Gibb 4932eef1c9 Adds toObservable function to HystrixCommands.
Lets user have full control over how the Observable is created with
sane defaults for eager/non-eager cases.
2017-10-24 14:46:41 -04:00
Spencer Gibb c6a00c1a71 Move to proper reactor testing 2017-10-24 14:22:31 -04:00
Spencer Gibb eb07e2b058 remove java version property 2017-10-23 22:15:37 -04:00
Spencer Gibb a878472a73 Updates to boot 2.0.0 endpoint and properties. 2017-10-23 21:47:37 -04:00
Spencer Gibb ef508b4223 Merge branch 'master' into 2.0.x 2017-10-23 21:22:20 -04:00
Spencer Gibb df7f31098c Going back to snapshots 2017-10-23 17:44:26 -04:00
Spencer Gibb fa9524f9c9 Update SNAPSHOT to 1.4.0.RC1 2017-10-23 17:39:56 -04:00
Spencer Gibb 1368f059bb Change contract property name 2017-10-23 17:16:32 -04:00
Spencer Gibb 8701060355 Add workaround for locally failing test. 2017-10-23 17:05:30 -04:00
Spencer Gibb ee067ed3f2 Merge branch 'raiRaiyan-gh-2303' 2017-10-23 14:43:38 -04:00
Spencer Gibb d7c13adac0 Merge branch 'tiny-dancer-patch-1' 2017-10-23 14:19:13 -04:00
Spencer Gibb 4995844f04 Upgrade to eureka 1.8.4
fixes gh-2386
2017-10-21 17:45:12 -04:00
Spencer Gibb 67f887d870 Update HystrixCommands to use a builder.
Otherwise there would be an explosion of overloaded methods.
2017-10-19 15:52:04 -04:00
Spencer Gibb 5a337fd6c1 Move test to correct package 2017-10-19 14:27:58 -04:00
Spencer Gibb b71ecc1c24 Remove deprecated DiscoveryClient.getLocalServiceInstance() 2017-10-18 11:49:43 -04:00
Spencer Gibb 71bd19d5df Merge branch 'master' into 2.0.x
# Conflicts:
#	spring-cloud-netflix-hystrix-stream/src/test/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamTests.java
#	spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfiguration.java
2017-10-18 11:36:41 -04:00
Spencer Gibb 28de82e63c Use updated Registration rather than getLocalServiceInstance()
See https://github.com/spring-cloud/spring-cloud-commons/issues/265
2017-10-18 11:34:38 -04:00
Spencer Gibb b4709f5db5 Update to hystrix-contract.
Updates to 2.0.0
2017-10-17 15:07:07 -04:00
Spencer Gibb b0dccc0f81 Merge branch 'master' into 2.0.x
# Conflicts:
#	spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/metrics/DefaultMetricsTagProvider.java
#	spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/rx/DeferredResultSubscriber.java
#	spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/rx/ResponseBodyEmitterSubscriber.java
#	spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/rx/RxResponse.java
#	spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/support/RibbonCommandContextTest.java
#	spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/rx/ObservableReturnValueHandlerTests.java
#	spring-cloud-netflix-dependencies/pom.xml
2017-10-17 14:10:22 -04:00
Spencer Gibb 6c65266f05 Formatting spaces->tabs 2017-10-17 13:37:28 -04:00
Spencer Gibb 6ffe2f1af2 Downgrade archaius to 0.7.4 for java 7 compatibility.
see https://github.com/Netflix/archaius/pull/522
2017-10-17 13:12:26 -04:00
Spencer Gibb 7cff8ddbd3 Add missing jackson serialization for instanceinfo.
Port information was missing from data sent to eureka.

fixes gh-2372
2017-10-16 16:23:51 -04:00
Spencer Gibb 2870007392 Adds HystrixCommands helper object. 2017-10-11 23:18:06 -04:00
Spencer Gibb fc9d442599 No longer require spring-boot-starter-web in eureka-client starter.
See gh-2359
2017-10-11 23:17:47 -04:00
Spencer Gibb f4321dd3d6 Add dependency management for rxjava-reactive-streams
Allows for bridging webflux when using hystrix commands.

fixes gh-2355
2017-10-10 12:25:39 -04:00
Spencer Gibb d76416f03c Merge branch 'master' into 2.0.x 2017-10-04 19:35:34 -04:00
Spencer Gibb 6b6889b8b4 Fixes refresh scope bean type. 2017-10-04 19:32:57 -04:00
Spencer Gibb 070e4b5c50 Move to zuul.test package. 2017-10-04 19:16:30 -04:00
Spencer Gibb 94e8c5196c Fix hystrix stream servlet name. 2017-10-01 11:47:17 -04:00
Spencer Gibb 39b1c0fe0d Update routes endpoint to new endpoint infrastructure.
fixes gh-2318
2017-09-29 16:30:46 -04:00
Spencer Gibb 6f2fc1deae Update to BindingServiceProperties 2017-09-29 15:43:09 -04:00
Spencer Gibb a2d8f0639c Move zuul to its own module. (#2332)
fixes gh-2298
2017-09-29 15:35:57 -04:00
Spencer Gibb 91808bb042 Add support for feign OptionalDecoder
fixes gh-1982
2017-09-28 22:18:52 -04:00
Spencer Gibb ec25771453 Upgrade Eureka to v1.8.2
fixes gh-2216
2017-09-28 20:16:02 -04:00
Spencer Gibb c544f4aef6 Move zuul metrics to micrometer.
fixes gh-2317
2017-09-28 18:20:11 -04:00
Spencer Gibb 0ce21c4b15 Fix SpringMvcContractTests
fixes gh-2312
2017-09-28 17:38:39 -04:00
Spencer Gibb ce4d560dc1 Fix RibbonClientHttpRequestFactoryTests
fixes gh-2314
2017-09-28 17:25:47 -04:00