Dave Syer
0d16cf0f83
Merge branch 'master' into 2.0.x
7 years ago
Dave Syer
91f60b3f4c
Be more selective with the property sources in a context refresh
...
We need to tread a very fine line. Ideally the process of refreshing
the Environment builds it back exactly as happened on startup.
In particular we probably don't want to have things like
application.properties already there when we start the process.
This change replaces the more liberal copy of all property sources
only a select few (actually only one), paremeterized as a constant.
7 years ago
Spencer Gibb
e9722e2c73
Ports ModifiedClassPathRunner changes from boot 2
7 years ago
Dave Syer
f94d20e7eb
Add temporary exclusion
7 years ago
Dave Syer
cdcf42ed60
Merge branch 'master' into 2.0.x
7 years ago
Dave Syer
e388b5c4d2
Make nested ckass public
...
So that it is fully introspectable with BeanInfo (Java Beans).
Prevents a WARN log on startup about ambiguous write methods.
7 years ago
Dave Syer
77befcd7c5
Temporary exclusion to workaround bug in test
7 years ago
Dave Syer
b29539e865
Simplify ConfigurationPropertiesRebinder
...
It actually doesn't need to use the public Binder API now
because Spring Boot faithfully uses the Environment state as it is
at runtime.
7 years ago
Dave Syer
fb36b67913
Add failing test for decrypting and rebinding
...
See gh-269
7 years ago
Spencer Gibb
8f9dfd38e3
Update tests for 2.0.x
7 years ago
Spencer Gibb
f302c166a5
Merge branch 'master' into 2.0.x
7 years ago
Spencer Gibb
707787dc13
Adds test for bootstrap context parent closing
7 years ago
Spencer Gibb
449f51a748
Merge branch '1.2.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
7 years ago
Spencer Gibb
abe5374c79
Ensure parent context of bootstrap context is closed.
...
fixes gh-267
7 years ago
Spencer Gibb
c9e8f02188
Remove reflection hack.
...
All tests pass, just with the call to afterPropertiesSet()
7 years ago
Spencer Gibb
d31e7ae499
Adds reflection hack back.
...
Hopefully not for long.
7 years ago
buildmaster
3a780623c1
Going back to snapshots
7 years ago
buildmaster
698124544c
Update SNAPSHOT to 2.0.0.M3
7 years ago
Dave Syer
ff6fa5a65d
Merge branch 'master' into 2.0.x
7 years ago
Dave Syer
942df8ed45
Remove lombok from spring-cloud-context
7 years ago
Dave Syer
880c1160e6
Replace lombok logger
7 years ago
Spencer Gibb
de1925b3d6
Merge branch 'master' into 2.0.x
7 years ago
Spencer Gibb
892a6ee2bd
Going back to snapshots
7 years ago
Spencer Gibb
e47a557636
Update SNAPSHOT to 1.3.0.RC1
7 years ago
Spencer Gibb
ac37014f36
Add missing getters/setter
...
fixes gh-263
7 years ago
Dave Syer
801183e01b
Fix nasty state bug in BootstrapApplicationListener
...
In Spring 5.0.0 the SpringFactoriesLoader is stateful and
BootstrapApplicationListener inadvertently modifies the state
by adding class names to a list loaded from spring.factories.
Probably harmless in most apps, but caused some tests to fail
(depending on the order they were run in).
7 years ago
Dave Syer
2fd2f99c9d
Suppress use of configuration properties source in refresh
7 years ago
Dave Syer
1f28206158
Fix compiler warnings in tests
7 years ago
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.
7 years ago
Spencer Gibb
74d9cd3060
Trying to fix tests
7 years ago
Dave Syer
20dd5da52c
Fix test to accommodate changed property source order
7 years ago
Dave Syer
484d68cfff
Merge branch 'master' into 2.0.x
7 years ago
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
7 years ago
Dave Syer
1d5fc961f5
Merge branch 'master' into 2.0.x
7 years ago
Dave Syer
52a5c31c26
Update to build latest stable release
7 years ago
Spencer Gibb
89170d127d
Remove deprecated DiscoveryClient.getLocalServiceInstance()
7 years ago
Spencer Gibb
a52f64076c
Merge branch 'master' into 2.0.x
...
# Conflicts:
# spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointTests.java
7 years ago
Spencer Gibb
e115e43e58
Registration now extends ServiceInstance
...
This allows for a true replacement of DiscoveryClient.getLocalServiceInstance().
fixes gh-265
7 years ago
Dave Syer
ed409a6c9f
Merge branch 'master' into 2.0.x
7 years ago
Dave Syer
ccf613c29c
Make method accessible in GenericScope proxy target
...
Otherwise app crashes on first access of scoped proxy.
Fixes gh-261
7 years ago
Dave Syer
ff00aa8eee
Remove verbose logging in test
7 years ago
Spencer Gibb
8f9b553ae8
Merge branch 'master' into 2.0.x
7 years ago
Spencer Gibb
6149156fff
Fix type/name ordering in FeaturesEndpoint
...
fixes gh-258
7 years ago
Dave Syer
51fb39e281
Use public methods on CPBPP
7 years ago
Dave Syer
4ee42f2cf2
Merge branch 'master' into 2.0.x
7 years ago
Dave Syer
a7caee5f1f
Protect refresh of single bean as well
7 years ago
Dave Syer
039c987cb1
Merge branch 'master' into 2.0.x
7 years ago
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.
7 years ago
Dave Syer
d0e56d2201
Fix test
7 years ago
Ryan Baxter
deb18d2eb9
Bumping versions to 1.2.5.BUILD-SNAPSHOT after release
7 years ago