Spencer Gibb
2fdbc5a397
Merge branch '1.3.x'
7 years ago
Spencer Gibb
259aa437d7
Allow refresh auto config to be disabled by property.
...
fixes gh-276
7 years ago
Spencer Gibb
4e740c7050
Merge branch '1.3.x'
7 years ago
Spencer Gibb
4675df369c
Update docs branches
7 years ago
Spencer Gibb
6e9745b7a4
Updates for boot 2 actuator path changes
7 years ago
Spencer Gibb
a051c24bf2
Reinstate encryption test.
7 years ago
Spencer Gibb
ad9cfc665c
Updates to boot 2.0 compatibility
7 years ago
Spencer Gibb
39cb6be306
Merge branch 'master' into 2.0.x
7 years ago
Ryan Baxter
924d870081
Bumping versions to 1.3.1.BUILD-SNAPSHOT after release
7 years ago
Ryan Baxter
75d30e1847
Going back to snapshots
7 years ago
Ryan Baxter
695739d7a0
Update SNAPSHOT to 1.3.0.RELEASE
7 years ago
Ryan Baxter
2b9196667c
Provide support for BackOffPolicys when retrying requests. ( #270 )
7 years ago
Misagh Moayyed
4868cd3183
Update PropertySourceBootstrapProperties.java ( #274 )
7 years ago
buildmaster
0c7badb772
Going back to snapshots
7 years ago
buildmaster
54142ba2b4
Update SNAPSHOT to 2.0.0.M4
7 years ago
Spencer Gibb
5c5e6f4d65
Merge branch 'master' into 2.0.x
...
# Conflicts:
# spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherTests.java
7 years ago
Spencer Gibb
1bd2c3112a
Make sure cli args are copied to bootstrap.
7 years ago
Dave Syer
a513d0a4af
Explicitly copy over properties from bootstrap.properties
...
Fixes gh-273
7 years ago
Dave Syer
7eb310066a
Merge branch 'master' into 2.0.x
7 years ago
Dave Syer
4352d9a81a
Add test for profiles picked up from bootstrap.properties
7 years ago
Dave Syer
d43e0ba8c1
Ignore a test and revert a Boot change to work with M6
7 years ago
Dave Syer
46ea8e5754
Merge branch 'master' into 2.0.x
7 years ago
Dave Syer
1b219b086c
Tidy up compiler warnings
7 years ago
Dave Syer
49277b9e80
Merge branch 'master' into 2.0.x
7 years ago
Dave Syer
93a0365422
Prevent logging system from being pinged on context refresh
...
A context refresh is actually only trying to recalculate environment
properties. Spring Boot doesn't provide an explicit API for that so
we create a "mini application" to mimic the startup. There is no
need for the logging system to be touched at all, so we can try
and filter out the listeners we know might do that.
Fixes gh-260
7 years ago
Dave Syer
c7b907d9cd
Destroy beans before initializing them
...
Fixes gh-268
7 years ago
Dave Syer
2907f2facd
Uncomment ignored test and adapt to new name
...
Fixes gh-269 (actually fixed in Spring Boot).
7 years ago
Dave Syer
7096d6c36a
More changes in Spring Boot
...
This time they changed the way spring.config.location is handled
so you have to repeat the default value if you want those to be
read as well.
7 years ago
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