Commit Graph

122 Commits

Author SHA1 Message Date
Spencer Gibb
ed91ad845f Programmatically set context id rather than using spring.application.name.
This allows other bootstrap application listeners to resolve the
spring.application.name during the bootstrap phase, but allows bootstrap
to determine if the context is the bootstrap context.

fixes gh-214
2017-06-16 13:42:17 -06:00
Spencer Gibb
b5f5912125 add back removing of spring.application.name of bootstrap
see gh-214
2017-06-06 10:05:53 -06:00
Spencer Gibb
853d7c43a7 Comment out broken tests 2017-05-31 14:18:05 -06:00
Spencer Gibb
ebf4112116 Updates to boot 2.0 changes 2017-05-16 13:23:21 -06:00
Dave Syer
3f005ab238 Update to fix issues introduced in Boot 2.0.0.M1 2017-05-16 18:16:14 +01:00
Dave Syer
021a77d997 Uningnored some tests to do with binding to lists
See https://github.com/spring-projects/spring-boot/issues/9137
2017-05-14 11:06:37 +01:00
Dave Syer
d030225d46 Split out ModifiedClassPathRunner into a separate jar 2017-05-12 11:05:17 +01:00
Dave Syer
c3f9b1a821 Fix more Spring Boot related mayhem 2017-05-12 10:42:06 +01:00
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
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
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
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
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
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
8d3d07bde6 We no longer need InfoEndpointRebinderConfiguration since we will not be supporting Boot 1.3.x in Dalston. See #145. 2016-11-21 12:07:01 -05:00
Ryan Baxter
dde952982e Revert "Make sure we copy variables to new InfoEndpoint. Fixes #143."
This reverts commit 30f34cf3bc.
2016-11-21 12:01:31 -05:00
Ryan Baxter
0a6466d9c0 Revert "Added TODO to remove InfoEndpointRebinderConfiguration"
This reverts commit 2266cc9c1a.
2016-11-21 12:01:21 -05:00
Ryan Baxter
2266cc9c1a Added TODO to remove InfoEndpointRebinderConfiguration 2016-11-21 11:47:12 -05:00
Ryan Baxter
30f34cf3bc Make sure we copy variables to new InfoEndpoint. Fixes #143. 2016-11-21 11:47:12 -05:00
Ryan Baxter
607b6a9b0c Added TODO to remove InfoEndpointRebinderConfiguration 2016-11-21 11:01:02 -05:00
Ryan Baxter
982df797f0 Make sure we copy variables to new InfoEndpoint. Fixes #143. 2016-11-18 11:53:34 -05:00
Dave Syer
d4fd2b7aa5 Extract logging system shutdown into a separate listener
LoggingSystemShutdownListener runs immediately after
BootstrapApplicationListener and contains the code which used to be
in that to clean up the logging system (and make it go dark). That
is still a little bit of a hack to work around some limitations in
the static logging libraries (via the Spring Boot Logging System
and LoggingApplicationListener).

If the LoggingApplicationListener is then *not* applied in the
ContextRefresher, then we don't need the LoggingSystemShutdownListener
either. In fact we can narrow down the ContextRefresher to be only
interested in the listeners that affect the Environment (of which
we know of only 2). It means that any listeners that are added that
affect the Environment will not be applied, but there are plenty of
more "official" channels for modifying the Environment
(EnvironmentPostProcessor and PropertySourceLocator), so users can
easily migrate to a better implementation.
2016-09-16 13:44:48 +01:00