Spencer Gibb
ac2821db5f
Update SNAPSHOT to 2.0.0.M2
2017-08-17 15:17:19 -06: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
Jon Schneider
9d53dd46bb
Update SNAPSHOT to 1.2.1.RELEASE
2017-05-12 09:18:36 -05: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
922608651a
fix test path
2017-05-01 09:27:37 -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
9675df02f6
Bumping versions to 1.2.1.BUILD-SNAPSHOT after release
2017-04-05 14:19:30 -06:00
Spencer Gibb
72685376a9
Going back to snapshots
2017-04-05 14:19:29 -06:00
Spencer Gibb
6b30820b09
Update SNAPSHOT to 1.2.0.RELEASE
2017-04-05 14:16:21 -06:00
Spencer Gibb
43fe59489e
Update test jar inclusion
2017-04-05 12:34:37 -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
23f3e461ac
Going back to snapshots
2017-03-15 17:40:06 -06:00
Spencer Gibb
e75034a6fc
Update SNAPSHOT to 1.2.0.RC1
2017-03-15 17:32:18 -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
