Commit Graph

409 Commits

Author SHA1 Message Date
Jon Schneider
9d53dd46bb Update SNAPSHOT to 1.2.1.RELEASE 2017-05-12 09:18:36 -05:00
Jon Schneider
15aad9ca5f Point build badge to CircleCI 2017-05-11 14:20:47 -05:00
Dave Syer
fc2355b985 Make sure SimpleDiscoveryClient has a local service instance
Also allow user to configure it via application.yml, or default
to something sensible, the same way the Noop client used to.

Fixes https://github.com/spring-cloud/spring-cloud-netflix/issues/1909
2017-05-05 17:27:26 +01:00
Spencer Gibb
922608651a fix test path 2017-05-01 09:27:37 -06:00
Spencer Gibb
a4169d451e Only registerManagement if registration is non-null.
fixes https://github.com/spring-cloud/spring-cloud-zookeeper/issues/122
2017-04-19 20:01:04 -06:00
Spencer Gibb
9675df02f6 Bumping versions to 1.2.1.BUILD-SNAPSHOT after release 2017-04-05 14:19:30 -06:00
Spencer Gibb
72685376a9 Going back to snapshots 2017-04-05 14:19:29 -06:00
Spencer Gibb
6b30820b09 Update SNAPSHOT to 1.2.0.RELEASE 2017-04-05 14:16:21 -06:00
Spencer Gibb
fe360307fa remove aggregate javadoc generation 2017-04-05 14:05:28 -06:00
Spencer Gibb
807e5c3ffd Move test-jar plugin to s-c-commons module 2017-04-05 12:48:58 -06:00
Spencer Gibb
c7c3f55ae8 Update mvnw for central profile detection 2017-04-05 12:35:46 -06:00
Spencer Gibb
43fe59489e Update test jar inclusion 2017-04-05 12:34:37 -06:00
Ryan Baxter
0dd6214ba4 Add retryable status code check (#197)
* Added API

* Add method to check response code retry in the policy.
2017-04-05 12:14:15 -04:00
Spencer Gibb
fb9e11b377 polish 2017-04-03 20:22:47 -06:00
Biju Kunjummen
930b927723 Support for config driven Discovery Client
Making SimpleDiscoveryClient the default, marking NoOpDiscoveryClient as deprecated

fixes gh-180
2017-04-03 22:17:02 -04:00
Spencer Gibb
b40ceef356 RefreshEventListener no longer depends on RefreshEndpoint.
Instead it depends on ContextRefresher with actually does the work.

This allows applications to use the listener even if they don't depend
on actuator.

fixes gh-171
2017-04-03 20:13:11 -06:00
Spencer Gibb
78d10fc223 Use relaxed property resolver in KeyCondition
Allows users to define properties like encrypt.key-store.password=letmein

fixes gh-191

(cherry picked from commit 7744b63)
2017-04-03 19:52:17 -06:00
Spencer Gibb
61199a151c Adds ServiceRegistry documentation.
fixes gh-170
fixes gh-196
2017-04-03 19:15:40 -06:00
Ryan Baxter
8b9821dd90 Merge pull request #194 from ryanjbaxter/make-retry-enabled-default-true
Set spring.cloud.loadbalancer.retry.enabled to true by default
2017-03-30 19:32:09 -04:00
Ryan Baxter
414b1704e1 Documenting property to disable retry logic with Spring Retry on the class path 2017-03-30 19:11:03 -04:00
Ryan Baxter
8e34e0c5e4 Set spring.cloud.loadbalancer.retry.enabled to true by default 2017-03-30 16:30:40 -04:00
Ryan Baxter
b896f22c3e Fixing documentation to add Spring Retry
Addresses documentation bug in #193
2017-03-29 19:34:46 -04:00
Spencer Gibb
23f3e461ac Going back to snapshots 2017-03-15 17:40:06 -06:00
Spencer Gibb
e75034a6fc Update SNAPSHOT to 1.2.0.RC1 2017-03-15 17:32:18 -06:00
Spencer Gibb
1eddbc125b fix compile errors in tests 2017-03-15 12:08:04 -06:00
Dave Syer
45b0c078eb Merge branch '1.1.x' 2017-03-15 12:18:14 +00:00
Dave Syer
ba281228f6 Apply bootstrap initializers to all contexts in a hierarchy
The fix for gh-153 was sensible, but has now exposed another issue
which is that the bootstrap initializers, whilst they are now only
created once, actually only get applied to the parent context
in a hierarchy.

Most of the time this doesn't matter because the child contexts all
benefit from environment changes and additional beans added
to the parent. If the children are supposed to actually have
different environments, though, there is a problem. So this change
locates the existing bootstrap context and applies it to each
new context created separately.

Unfortunately we have to use reflection to do that for now because
there is no way to discover the parent with a public API before
the context is refreshed.

See gh-190
2017-03-15 12:16:32 +00:00
Dave Syer
70d601df84 Register a BeanDefinition manually instead of using @Bean
For RefreshScope this stops Spring from moaning about the @Bean
method with a WARN log (which is benign but hard to get rid of
and confusing for users).

See gh-401
2017-03-15 12:15:51 +00:00
Spencer Gibb
d998fdbeb5 Use boot ConditionalOnClass rather than ClassUtils.isPresent
This is defensive forward compatibility
2017-03-14 18:24:11 -06:00
Spencer Gibb
d63074d124 Merge branch '1.1.x' 2017-03-07 10:34:32 -07:00
linzhaoming
e1a3fcad69 Update javadoc term to fix copy/paste error 2017-03-07 12:33:03 -05:00
Dave Syer
a546ee3185 Merge branch '1.1.x' 2017-03-07 10:34:55 +00:00
Dave Syer
046c0f879e Revert to snapshots 2017-03-07 10:31:41 +00:00
Dave Syer
d2e6d56cee Update for 1.1.8 2017-03-07 10:28:44 +00:00
Biju Kunjummen
d2721ef199 HostInfo is now extensible (#181)
Fixes gh-151
2017-03-01 12:47:22 -05:00
Spencer Gibb
1865bc6306 polish 2017-03-01 10:43:01 -07:00
Biju Kunjummen
4e0d2e520f Fixes possible infinite loop
Fixes edge case of an infinite loop in decrypting properties in a hierarchy of application contexts.


fixes gh-178
2017-03-01 12:41:00 -05:00
Dave Syer
d2ab1c6de9 Merge branch '1.1.x' 2017-02-24 09:42:36 +00:00
Dave Syer
331e790026 Ensure there is a single bootstrap parent context
Only one neds to be created, and once it is in place in the hierarchy
it should be usable by all the child contexts that get added.

Fixes gh-153
2017-02-24 09:38:30 +00:00
Spencer Gibb
dcaef01b27 Update to boot 1.5 test classes 2017-02-21 08:19:24 -07:00
Dave Syer
d5a63c988d Merge branch '1.1.x' 2017-02-21 10:18:29 +00:00
Dave Syer
8347c5741c Extract target from @ConfigurationProperties proxy
Fixes gh-175 (more of a workaround really and gh-177 is still open
to track further changes).
2017-02-21 10:01:05 +00:00
Dave Syer
68c2d59afc Merge branch '1.1.x' 2017-02-20 11:13:15 +00:00
Dave Syer
c683393efa Manage version of jar plugin to not break STS 2017-02-20 10:56:32 +00:00
Spencer Gibb
a86356327c fix tests for boot 1.4.x 2017-02-14 14:23:27 -07:00
Spencer Gibb
5b8ae3a96a Make sure bootstrap sources are ordered before use.
Make call to sort() before setting on builder.sources().

fixes gh-176

(cherry picked from commit 6dc35d1)
2017-02-14 14:18:48 -07:00
Spencer Gibb
6dc35d1edc Make sure bootstrap sources are ordered before use.
Make call to sort() before setting on builder.sources().

fixes gh-176
2017-02-14 14:17:11 -07:00
Dave Syer
3269b8df54 Fix line endings 2017-02-10 10:55:37 +00:00
Dave Syer
de6c517d4d Use a sane version of jar plugin 2017-02-10 10:54:16 +00:00
Spencer Gibb
10a0d0f21e Add Registration.getServiceId() 2017-02-01 13:12:11 -07:00