Commit Graph

531 Commits

Author SHA1 Message Date
Ryan Baxter
8f2d372d4d Merge pull request #252 from michael-wirth/bugfix/fix-connection-factory-ssl-support
Add SSL support for connection factory with SSL validation
2017-09-15 11:40:46 -04:00
Michael Wirth
0fb5dbb40a Add SSL support for connection factory with SSL validation 2017-09-14 07:40:53 +02:00
Spencer Gibb
19adf5f11d Update to new Boot 2 actuator @Endpoint.
Again.
2017-09-12 14:31:07 -06:00
Spencer Gibb
fa71529ea0 Ignore broken tests 2017-09-11 17:06:46 -06:00
Spencer Gibb
e1f8f3a5a5 Fix broken refresh auto-config without actuator test. 2017-09-11 16:29:24 -06:00
Spencer Gibb
f8d9e18fb9 Update to new Boot 2 actuator @Endpoint.
Some tests are still broken.

Fixes gh-238
2017-09-07 21:21:37 -06:00
Marcin Grzejszczak
752148fea5 Merge branch 'master' into 2.0.x 2017-08-31 14:55:05 +02:00
Marcin Grzejszczak
99488a163b Merge branch '1.2.x' 2017-08-31 14:54:24 +02:00
Marcin Grzejszczak
8c42673d30 Referrencing resources from sc-build 2017-08-31 14:54:17 +02:00
Marcin Grzejszczak
b1a79ce2bc Merge branch 'master' into 2.0.x 2017-08-29 15:46:20 +02:00
Marcin Grzejszczak
8ce23984fe Merge branch '1.2.x' 2017-08-29 15:46:03 +02:00
Marcin Grzejszczak
df3b9eee2e Added 1.2.x to whitelist 2017-08-29 15:44:49 +02:00
Marcin Grzejszczak
0b4a56fc27 Migrated to new docs; fixes #248 2017-08-29 15:43:02 +02:00
Marcin Grzejszczak
8b7efcf92a Bumped libs 2017-08-29 15:42:53 +02:00
Marcin Grzejszczak
64a697dd50 Updated gitignore 2017-08-29 13:50:59 +02:00
Dave Syer
f412768f55 Merge branch 'master' into 2.0.x 2017-08-29 12:32:42 +01:00
Dave Syer
a30d24083d Pick up compiler plugin config from parent 2017-08-29 12:28:26 +01:00
Dave Syer
dae260bfb1 Pick up compiler plugin config from parent 2017-08-29 12:27:19 +01:00
Dave Syer
153360fa78 Fix Eclipse plugin declaration 2017-08-29 12:12:16 +01:00
Marcin Grzejszczak
f39eebb3ed Merge branch 'master' into 2.0.x 2017-08-29 13:03:49 +02:00
Marcin Grzejszczak
5903c68396 Removed duplicated depenedncy 2017-08-29 13:01:39 +02:00
Marcin Grzejszczak
0f895b8c1b Merge branch 'master' into 2.0.x 2017-08-29 12:35:17 +02:00
Marcin Grzejszczak
565a805bcb Migrated to new docs; fixes #248 2017-08-29 12:33:06 +02:00
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