Commit Graph

162 Commits

Author SHA1 Message Date
Dave Syer
4b4e7650fa Switch to new class loader filter runner 2017-05-12 10:42:06 +01:00
Dave Syer
1850155bad Add link to comment 2017-05-11 12:03:39 +01:00
Dave Syer
f191110228 Hack the configuration properties to fix tests
See https://github.com/spring-projects/spring-boot/issues/9160
2017-05-11 11:34:24 +01:00
Dave Syer
c1972a8574 Simplify EnvironmentUtils (maybe could be deleted?) 2017-05-09 09:09:34 +01:00
Dave Syer
80555b3354 Updates to adapt to Spring Boot changes
Also adjusts bootstrap listener to be smarter about default
properties:

It's better not to use the default properties at all because the
user might pass some in and we don't want to overwrite them. Before
Boot 2.0 we got away with it, but since 2.0 we have to be more
cautious.
2017-05-09 07:01:46 +01:00
Spencer Gibb
ac16a94880 comment out broken test 2017-05-01 10:25:55 -06:00
Spencer Gibb
ef19c34666 Work around https://github.com/spring-projects/spring-boot/issues/9053#issuecomment-298362685 2017-05-01 10:25:39 -06:00
Spencer Gibb
f804361f38 Update to web app type enum 2017-05-01 09:08:31 -06:00
Spencer Gibb
6a4789a691 Update to new binder 2017-05-01 08:58:28 -06:00
Spencer Gibb
6abf2def40 Change type to String 2017-04-28 18:57:43 -06:00
Spencer Gibb
c6c391158f Removes RelaxedPropertyResolver 2017-04-28 15:29:49 -06:00
Spencer Gibb
b611e78075 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-context/pom.xml
#	spring-cloud-starter/pom.xml
2017-04-06 21:43:05 -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
43fe59489e Update test jar inclusion 2017-04-05 12:34:37 -06: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
d11abd8f5e make code compile 2017-03-17 18:46:39 -06: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
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
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
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
Spencer Gibb
b4bd6fdeff Revert "Update SNAPSHOT to 1.2.0.M1"
This reverts commit d9d3b5f74a.
2017-01-26 10:41:16 -07:00
Spencer Gibb
d9d3b5f74a Update SNAPSHOT to 1.2.0.M1 2017-01-26 10:39:31 -07:00
Matt Benson
941275ded2 consider spring.profiles.include values from bootstrap PropertySources (#123) 2017-01-26 12:14:43 -05:00
Spencer Gibb
210c7b9017 Update spring-cloud-build to 1.3.1.BUILD-SNAPSHOT 2017-01-09 18:25:48 -07:00
Matthew Reid
63e4e3b8d6 Allow lifecycle endpoints to be globally disabled using endpoints.enabled property (#148)
fixes gh-158
2017-01-09 14:37:48 -05:00
Ryan Baxter
710080cd47 Updated versions for next release 2017-01-09 10:44:20 -05:00
Ryan Baxter
009b6ee7f3 Revert "Updating versions for 1.1.7 release"
This reverts commit 5b4cbaa245.
2017-01-09 10:33:27 -05:00
Ryan Baxter
5b4cbaa245 Updating versions for 1.1.7 release 2017-01-09 10:17:40 -05:00
Anders Båtstrand
69192f6f67 Exposing context names, fixes https://github.com/spring-cloud/spring-cloud-netflix/issues/1585. 2017-01-04 11:00:51 +01:00
Ryan Baxter
cfa761c4c0 Bumped versions for next release 2016-11-23 14:45:14 -05:00
Ryan Baxter
3e0c8099a2 Revert "Version changes for 1.1.3 RELEASE"
This reverts commit 8a8d27ab6b.
2016-11-23 14:42:10 -05:00
Ryan Baxter
8a8d27ab6b Version changes for 1.1.3 RELEASE 2016-11-23 14:32:45 -05:00