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.
2017-11-03 14:01:29 +00:00
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.
2017-11-01 16:54:16 +00:00
Spencer Gibb
707787dc13
Adds test for bootstrap context parent closing
2017-10-30 19:13:36 -04:00
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
2017-10-30 19:01:22 -04:00
Spencer Gibb
abe5374c79
Ensure parent context of bootstrap context is closed.
...
fixes gh-267
2017-10-30 18:56:01 -04:00
Dave Syer
942df8ed45
Remove lombok from spring-cloud-context
2017-10-24 08:49:10 +01:00
Spencer Gibb
892a6ee2bd
Going back to snapshots
2017-10-20 15:45:37 -04:00
Spencer Gibb
e47a557636
Update SNAPSHOT to 1.3.0.RC1
2017-10-20 15:44:28 -04:00
Spencer Gibb
ac37014f36
Add missing getters/setter
...
fixes gh-263
2017-10-20 12:51:40 -04: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
52a5c31c26
Update to build latest stable release
2017-10-19 13:39:38 +01:00
Spencer Gibb
e115e43e58
Registration now extends ServiceInstance
...
This allows for a true replacement of DiscoveryClient.getLocalServiceInstance().
fixes gh-265
2017-10-18 10:15:55 -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
Spencer Gibb
6149156fff
Fix type/name ordering in FeaturesEndpoint
...
fixes gh-258
2017-10-04 15:51:20 -04:00
Dave Syer
a7caee5f1f
Protect refresh of single bean as well
2017-10-04 14:34:06 +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
d0e56d2201
Fix test
2017-10-04 14:11:53 +01:00
Ryan Baxter
deb18d2eb9
Bumping versions to 1.2.5.BUILD-SNAPSHOT after release
2017-10-02 14:25:47 -04:00
Ryan Baxter
3c05d9754c
Going back to snapshots
2017-10-02 14:25:47 -04:00
Ryan Baxter
714747d240
Update SNAPSHOT to 1.2.4.RELEASE
2017-10-02 14:23:03 -04:00
Jonathan Oddy
f207bcad28
Fix connection leak when a status is retryable ( #253 )
2017-10-02 11:21:49 -04:00
Jonathan Oddy
93e912c7cb
Fix connection leak when a status is retryable ( #253 )
2017-10-02 10:57:03 -04:00
Ryan Baxter
dd16ce0a31
Remove the need for @EnableDiscoveryClient ( #245 )
...
Enable AutoServiceRegistrationConfiguration by default.
2017-09-25 12:21:02 -04:00
Marcin Grzejszczak
99488a163b
Merge branch '1.2.x'
2017-08-31 14:54:24 +02:00
Marcin Grzejszczak
8c42673d30
Referrencing resources from sc-build
2017-08-31 14:54:17 +02:00
Marcin Grzejszczak
8ce23984fe
Merge branch '1.2.x'
2017-08-29 15:46:03 +02:00
Marcin Grzejszczak
df3b9eee2e
Added 1.2.x to whitelist
2017-08-29 15:44:49 +02:00
Marcin Grzejszczak
0b4a56fc27
Migrated to new docs; fixes #248
2017-08-29 15:43:02 +02:00
Marcin Grzejszczak
8b7efcf92a
Bumped libs
2017-08-29 15:42:53 +02:00
Marcin Grzejszczak
64a697dd50
Updated gitignore
2017-08-29 13:50:59 +02:00
Dave Syer
a30d24083d
Pick up compiler plugin config from parent
2017-08-29 12:28:26 +01:00
Dave Syer
153360fa78
Fix Eclipse plugin declaration
2017-08-29 12:12:16 +01:00
Marcin Grzejszczak
5903c68396
Removed duplicated depenedncy
2017-08-29 13:01:39 +02:00
Marcin Grzejszczak
565a805bcb
Migrated to new docs; fixes #248
2017-08-29 12:33:06 +02:00
Marcin Grzejszczak
41755134b0
Bumping libs
2017-08-29 12:30:43 +02:00
Ryan Baxter
d860724e3c
Updating sc-build release
2017-08-24 16:10:08 -04: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
167e42e34c
Merge remote-tracking branch 'origin/1.2.x'
2017-08-24 15:31:42 -04:00
Ryan Baxter
0865fd94a3
Merge pull request #244 from bijukunjummen/dep-prop-placeholder
...
Replaces deprecated o.s.b.a.PropertyPlaceholderAutoConfiguration
2017-08-22 13:28:50 -04:00
Biju Kunjummen
5aaafb19af
Replaces deprecated o.s.b.a.PropertyPlaceholderAutoConfiguration
2017-08-21 20:35:45 -07:00
Sky Ao
44441b246b
move property definition to begin of class to improve code style ( #242 )
2017-08-16 05:32:59 -04:00
Sky Ao
72f9b83041
serviceRegistry should set to final to make code more clear ( #241 )
2017-08-16 04:45:57 -04: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
54d55010de
Merge pull request #222 from ryanjbaxter/http-client-factories
...
Implementation of factories to provide Apache HTTP Clients
2017-08-03 11:08:32 -04:00
Ryan Baxter
d00d0dbe7e
Merge remote-tracking branch 'Upstream/master' into http-client-factories
2017-08-01 15:26:15 -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
Biju Kunjummen
2250c836a4
Remove dependence on lombok ( #231 )
2017-07-21 14:40:07 -04:00
Ryan Baxter
e8a42e500e
Bumping versions to 1.2.4.BUILD-SNAPSHOT after release
2017-07-12 14:04:38 -04:00
Ryan Baxter
9a1c1bf634
Going back to snapshots
2017-07-12 14:04:38 -04:00