Dave Syer
92cabcdf1a
Skip stub property sources during bootstrap
...
The stub property sources from a web application context do not
contain any properties so they cab't have any effect on
bootstrap. It's cleaner to leave them out of the bootstrap
application context.
2017-10-20 08:46:36 +01:00
Spencer Gibb
74d9cd3060
Trying to fix tests
2017-10-19 23:54:18 -04:00
Dave Syer
20dd5da52c
Fix test to accommodate changed property source order
2017-10-19 13:59:13 +01:00
Dave Syer
484d68cfff
Merge branch 'master' into 2.0.x
2017-10-19 13:43:12 +01:00
Dave Syer
1add1067df
Fix ordering of property sources on refresh
...
If there were *no* bootstrapProperties (i.e. properties added by
PropertySourceLocators) on startup, and then in a refresh event
some new sources were picked up, they would have been added to the
end, instead of the beginning of the list.
Fixes https://github.com/spring-cloud/spring-cloud-config/issues/815
2017-10-19 13:41:05 +01:00
Dave Syer
ed409a6c9f
Merge branch 'master' into 2.0.x
2017-10-11 08:13:04 -04:00
Dave Syer
ccf613c29c
Make method accessible in GenericScope proxy target
...
Otherwise app crashes on first access of scoped proxy.
Fixes gh-261
2017-10-11 08:12:32 -04:00
Dave Syer
ff00aa8eee
Remove verbose logging in test
2017-10-05 09:21:56 +01:00
Dave Syer
51fb39e281
Use public methods on CPBPP
2017-10-04 14:36:49 +01:00
Dave Syer
4ee42f2cf2
Merge branch 'master' into 2.0.x
2017-10-04 14:34:13 +01:00
Dave Syer
a7caee5f1f
Protect refresh of single bean as well
2017-10-04 14:34:06 +01:00
Dave Syer
039c987cb1
Merge branch 'master' into 2.0.x
2017-10-04 14:21:05 +01:00
Dave Syer
c28ca5de91
Add extra concurrency test for refresh scope
...
The test passes (would have failed in parent commit)
because a lock is taken in the scoped proxy itself, not
in the target.
2017-10-04 14:14:45 +01:00
Dave Syer
9639787b03
Fix configuration properties in refresh scope for Boot 2.0
...
The old hack in RefreshScope has been replaced with a new hack.
It has to "reset" the ConfigurationProperties bean post processor
and the new rebinder API has changed the internals of that, so
we needed to adjust.
2017-09-29 13:44:41 +01:00
Dave Syer
115233a29c
Tidy imports
2017-09-26 16:24:48 +01:00
Dave Syer
8357724ad8
Use the new ConfigurationPropertiesBinder API from Spring Boot
...
Fixes gh-177
2017-09-26 16:06:57 +01:00
Spencer Gibb
883558fa07
Fix service-registry and refresh endpoint tests
2017-09-25 15:39:24 -04:00
Spencer Gibb
ea75972c98
Update post to /env
2017-09-25 12:42:40 -04: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
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
d4bc52014c
Merge remote-tracking branch 'origin/master' into 2.0.x
2017-08-22 14:10:29 -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
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
Ryan Baxter
2b5860fe4f
Merge remote-tracking branch 'origin/master' into 2.0.x
2017-08-03 11:44:44 -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
Spencer Gibb
f34498228d
Merge branch 'master' into 2.0.x
2017-06-30 20:20:16 -06:00
Spencer Gibb
2aa6c39322
Reinstate @ConditionalOnClass(EnvironmentEndpoint.class)
2017-06-30 20:19:35 -06:00
Spencer Gibb
80b91d0a03
fix merge error
2017-06-30 19:33:31 -06:00
Spencer Gibb
c44c3f37e4
Merge branch 'master' into 2.0.x
...
# Conflicts:
# spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/LifecycleMvcEndpointAutoConfiguration.java
# spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationClassPathTests.java
# spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationTests.java
2017-06-30 18:14:37 -06:00
Spencer Gibb
c75673110b
formatting
2017-06-30 17:47:08 -06:00
Fabio Matos
2e81db24cf
Disables endpoint creation ( #208 )
...
Fixes gh-117
2017-06-30 19:38:03 -04:00
Spencer Gibb
2b6ad4a118
bump to version 1.3.0
2017-06-30 17:19:48 -06:00
Spencer Gibb
d4326005f9
Going back to snapshots
2017-06-16 14:54:23 -06:00
Spencer Gibb
02c522d015
Update SNAPSHOT to 2.0.0.M1
2017-06-16 14:53:15 -06:00
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
0c041591d1
Bump to version 1.2.3.BUILD-SNAPSHOT
2017-05-19 14:59:52 -06:00
Spencer Gibb
6cfaea4bb7
Going back to snapshots
2017-05-19 14:57:35 -06:00
Spencer Gibb
79096fbf8d
Update SNAPSHOT to 1.2.2.RELEASE
2017-05-19 14:54:42 -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
Jon Schneider
c02398959d
Revert back to snapshots
2017-05-12 10:25:38 -05:00
