Commit Graph

135 Commits

Author SHA1 Message Date
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
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
Spencer Gibb
216f744636 Update to SNAPSHOT 2016-11-01 12:57:06 -06:00
Spencer Gibb
bbba01a80d Update SNAPSHOT to 1.1.5.RELEASE 2016-11-01 12:42:26 -06:00
Spencer Gibb
d850aad13f Bump to 1.2.0.BUILD-SNAPSHOT 2016-10-27 15:58:59 -06:00
Dave Syer
65c00ecb93 Revert to snapshots 2016-10-17 09:15:38 +01:00
Dave Syer
5d2d2908db Update for 1.1.4 2016-10-17 09:08:50 +01:00
Dave Syer
8089c0d411 Revert to snapshots 2016-09-21 09:39:11 +01:00
Dave Syer
897555a57a Update to 1.1.3 2016-09-21 09:38:16 +01: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
Dave Syer
68c7fcf7d8 Apply correct ordering in logging system on startup
Completes the work started in 7f687b1, where the call to
LoggingSystem.beforeInitialization() was ommitted which results
in JUL logging never being available in the application.

Partial fix for #131 (but a /refresh is still broken)
2016-09-16 12:11:15 +01:00
Spencer Gibb
e13764db66 Fixes indexed properties merging problem.
Given the following in one property source
```
mine[0].someValue=Foo
mine[0].someKey={cipher}XXXX
mine[1].someValue=Bar
mine[1].someKey={cipher}XXXX
yours[0].anotherKey=Baz
```
only `mine[*].someKey` were added to "decrypted" property source. Due to house spring boot manages indexed properties, they can not be merged across property source. This change includes all indexed properties in the "decrypted" property source if any one of them is encrypted.

In the above example, `yours[*].*` is included even though unrelated.

fixes gh-466
2016-09-09 14:23:19 -06:00
Dave Syer
cff67e0a12 Revert to snapshots 2016-09-06 14:53:36 +01:00
Dave Syer
00a2f23c00 Update to 1.1.2 2016-09-06 14:36:20 +01:00
Dave Syer
7f687b10e3 Adjust the logging lifecycle during bootstrap
Anticipating a change in Spring Boot 1.4.1 to support child context
creation without (needless) re-initialization of the logging system,
we need to carefully manage the lifecycle, in particular calling
cleanUp() when we know there are changes in the pipeline.

Fixes gh-125
2016-08-25 18:04:14 +01:00
Matt Benson
8281c829e2 correct GenericScope#setName() Javadoc (#124) 2016-08-17 13:26:00 -04:00
Spencer Gibb
945f430efe Update to SNAPSHOT 2016-06-06 17:01:58 -06:00
Spencer Gibb
aaff352781 Update SNAPSHOT to 1.1.1.RELEASE 2016-06-06 16:31:03 -06:00
Dave Syer
ee56f22b20 Add comment about shutdown errors in context.close() 2016-06-01 12:06:28 +01:00
Dave Syer
01edfbf7f6 Revert to snapshots 2016-05-09 10:33:44 +01:00
Dave Syer
90c8a81611 Update for 1.1.0.RELEASE 2016-05-09 10:26:47 +01:00
Dave Syer
31a2b3ea0e Make some tests more robust so they pass with BOot 1.4 as well
A couple of tests here make assumptions about the property source
names added using @IntegrationTest. If we are a bit more defensive
and search for a source with a matching name instead of grabbing
one by the precise name, we can have tests that pass in Boot 1.3
and 1.4.
2016-05-05 14:05:46 +01:00