Marcin Grzejszczak
41755134b0
Bumping libs
2017-08-29 12:30:43 +02:00
Spencer Gibb
aa1185e152
remove erroneous configuration from WebClient docs
2017-08-24 15:38:53 -06:00
Ryan Baxter
d860724e3c
Updating sc-build release
2017-08-24 16:10:08 -04:00
Ryan Baxter
6ae5e0bec8
Going back to snapshots
2017-08-24 16:03:50 -04:00
Ryan Baxter
e6e5de275d
Update SNAPSHOT to 1.3.0.M1
2017-08-24 16:02:42 -04:00
Ryan Baxter
167e42e34c
Merge remote-tracking branch 'origin/1.2.x'
2017-08-24 15:31:42 -04:00
Ryan Baxter
d4bc52014c
Merge remote-tracking branch 'origin/master' into 2.0.x
2017-08-22 14:10:29 -04:00
Ryan Baxter
0865fd94a3
Merge pull request #244 from bijukunjummen/dep-prop-placeholder
...
Replaces deprecated o.s.b.a.PropertyPlaceholderAutoConfiguration
2017-08-22 13:28:50 -04:00
Biju Kunjummen
5aaafb19af
Replaces deprecated o.s.b.a.PropertyPlaceholderAutoConfiguration
2017-08-21 20:35:45 -07:00
Spencer Gibb
0972699040
Going back to snapshots
2017-08-17 15:25:48 -06:00
Spencer Gibb
ac2821db5f
Update SNAPSHOT to 2.0.0.M2
2017-08-17 15:17:19 -06:00
Sky Ao
44441b246b
move property definition to begin of class to improve code style ( #242 )
2017-08-16 05:32:59 -04:00
Sky Ao
72f9b83041
serviceRegistry should set to final to make code more clear ( #241 )
2017-08-16 04:45:57 -04:00
Spencer Gibb
09a5273096
Initial Load Balancer support for WebClient.
...
fixes gh-237
2017-08-15 17:28:45 -06:00
Biju Kunjummen
a6b7f70b8e
Show better message for missing config keystore props ( #232 )
...
* Show better message for missing config keystore props
* Removes unused ExpectedException
Fixes #230
2017-08-04 15:53:35 -04:00
Spencer Gibb
c44c28dcad
polish
2017-08-04 12:41:21 -06:00
Ryan Baxter
2b5860fe4f
Merge remote-tracking branch 'origin/master' into 2.0.x
2017-08-03 11:44:44 -04:00
Ryan Baxter
54d55010de
Merge pull request #222 from ryanjbaxter/http-client-factories
...
Implementation of factories to provide Apache HTTP Clients
2017-08-03 11:08:32 -04:00
Ryan Baxter
d00d0dbe7e
Merge remote-tracking branch 'Upstream/master' into http-client-factories
2017-08-01 15:26:15 -04:00
Johannes Edmeier
94a42737ec
Fix empty keys in EnvironmentChangedEvent on resetting the Environment ( #229 )
...
When the Environment is resetted the EnvironmentChangedEvent always
contains an empty keySet, since the live view of the cleared map was
used. This commit fixes this.
2017-07-25 11:58:15 -04:00
Biju Kunjummen
2250c836a4
Remove dependence on lombok ( #231 )
2017-07-21 14:40:07 -04:00
Ryan Baxter
e8a42e500e
Bumping versions to 1.2.4.BUILD-SNAPSHOT after release
2017-07-12 14:04:38 -04:00
Ryan Baxter
9a1c1bf634
Going back to snapshots
2017-07-12 14:04:38 -04:00
Ryan Baxter
7a9225619c
Update SNAPSHOT to 1.2.3.RELEASE
2017-07-12 14:03:27 -04:00
Ryan Baxter
18a5711fe4
Merge remote-tracking branch 'Upstream/master' into http-client-factories
2017-07-09 14:20:50 -04:00
Ryan Baxter
3d47188334
Added documentation
2017-07-09 14:15:11 -04:00
Ryan Baxter
9be3437005
Merge remote-tracking branch 'origin/master' into 2.0.x
...
# Conflicts:
# spring-cloud-commons/src/test/java/org/springframework/cloud/client/loadbalancer/RetryLoadBalancerInterceptorTest.java
2017-07-09 13:55:24 -04:00
Ryan Baxter
2661b343de
Eliminated deprecated constructors
2017-07-09 13:47:17 -04:00
Ryan Baxter
a59a5aec13
Merge remote-tracking branch 'origin/1.2.x'. Eliminated some deprecated constructors.
2017-07-09 13:46:58 -04:00
Ryan Baxter
8660abda5a
Merge pull request #225 from ryanjbaxter/static-retry-template
...
Create a new RetryTemplate for each request
2017-07-09 13:40:43 -04:00
Ryan Baxter
08c0c01774
Use a builder pattern to create clients.
2017-07-09 13:35:05 -04:00
Ryan Baxter
a375cb40f4
Merge remote-tracking branch 'Upstream/master' into http-client-factories
...
# Conflicts:
# spring-cloud-commons/src/main/resources/META-INF/spring.factories
2017-07-06 16:55:44 -04:00
Ryan Baxter
5d5a5edc3c
Fixes #224 . Create a new RetryTemplate for each request.
2017-07-05 11:32:52 -04:00
Spencer Gibb
f34498228d
Merge branch 'master' into 2.0.x
2017-06-30 20:20:16 -06:00
Spencer Gibb
2aa6c39322
Reinstate @ConditionalOnClass(EnvironmentEndpoint.class)
2017-06-30 20:19:35 -06:00
Spencer Gibb
80b91d0a03
fix merge error
2017-06-30 19:33:31 -06:00
Spencer Gibb
c44c3f37e4
Merge branch 'master' into 2.0.x
...
# Conflicts:
# spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/LifecycleMvcEndpointAutoConfiguration.java
# spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationClassPathTests.java
# spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationTests.java
2017-06-30 18:14:37 -06:00
Spencer Gibb
c75673110b
formatting
2017-06-30 17:47:08 -06:00
Spencer Gibb
2baa775f65
Make getDiscoveryClients() public
2017-06-30 17:45:46 -06:00
Fabio Matos
2e81db24cf
Disables endpoint creation ( #208 )
...
Fixes gh-117
2017-06-30 19:38:03 -04:00
Spencer Gibb
db7151918d
Merge branch 'master' into 2.0.x
...
# Conflicts:
# docs/pom.xml
# pom.xml
# spring-cloud-commons-dependencies/pom.xml
# spring-cloud-commons/pom.xml
# spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java
# spring-cloud-context/pom.xml
# spring-cloud-starter/pom.xml
2017-06-30 17:22:35 -06:00
Spencer Gibb
2b6ad4a118
bump to version 1.3.0
2017-06-30 17:19:48 -06:00
Biju Kunjummen
ca06452be0
GH-140: Support for Composite Discovery client ( #198 )
...
Add support for Composite Discovery client
* Test that the default discovery client is present
* Return a local Service instance from Composite Discovery Client
fixes gh-140
2017-06-30 19:09:44 -04:00
Spencer Gibb
ce2e751ca3
Merge remote-tracking branch 'origin/2.0.x' into 2.0.x
2017-06-29 16:24:51 -06:00
Spencer Gibb
7ae5cc1abd
Set discovery client health indicator description included to false.
...
see gh-223
2017-06-29 16:24:39 -06:00
Spencer Gibb
78511e19b4
Merge branch 'master' into 2.0.x
...
# Conflicts:
# spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthIndicatorTests.java
2017-06-29 16:16:32 -06:00
Spencer Gibb
c953240620
Allow Discovery HealthIndicator description to be disabled.
...
fixes gh-223
2017-06-29 16:15:09 -06:00
Ryan Baxter
787bea18e9
OK HTTP client factory implementations
2017-06-29 15:11:27 -04:00
Ryan Baxter
473c278983
Fixing code formatting
2017-06-28 11:53:33 -04:00
Ryan Baxter
8b6ec654ea
http client libraries are assumed to be present and not optional
2017-06-28 11:47:53 -04:00
