Commit Graph

303 Commits

Author SHA1 Message Date
Spencer Gibb
db00e13e74 Update to boot renamed class in 2.0.0.BUILD-SNAPSHOT 2018-02-09 20:25:22 -05:00
buildmaster
12d778f330 Going back to snapshots 2018-02-09 17:47:33 +00:00
buildmaster
5ad8288e85 Update SNAPSHOT to 2.0.0.M6 2018-02-09 17:46:50 +00:00
Spencer Gibb
16c43dd0d9 Temporary fix for hikari datasource sealed causing refresh errors.
See gh-318
2018-02-06 13:03:44 -05:00
Spencer Gibb
3a390a35fa Guard against missing EndpointAutoConfiguration class
fixes gh-319
2018-02-06 11:29:55 -05:00
Spencer Gibb
3866806a2c Install refresh scope health indicator.
RefreshScope bean is not available during auto-config, so get the bean lazily at runtime.
2018-02-05 23:07:26 -05:00
Bertrand Renuart
361494b70f Give application context a friendly display name. (#316)
Fixes gh307
2018-02-02 13:05:43 -05:00
Biju Kunjummen
cdd4268b4a Adds additional test for encyptor with RSA private key (#315) 2018-02-02 13:03:39 -05:00
Spencer Gibb
00eadf47f0 Merge branch '1.3.x' 2018-02-01 23:42:19 -05:00
Spencer Gibb
f7695c7d15 Moves declaration of EnvironmentManager
fixes gh-314
2018-02-01 23:36:59 -05:00
Spencer Gibb
e21d30772d Remove JPA logging 2018-02-01 19:18:54 -05:00
Spencer Gibb
ca2e5e0405 Merge branch '1.3.x' 2018-02-01 19:12:51 -05:00
Spencer Gibb
cd436c7d15 Avoid proxy error if bean implements ScopedObject
fixes gh-277
2018-02-01 19:09:11 -05:00
Spencer Gibb
528ce8dca1 polish 2018-01-17 12:09:30 -05:00
Spencer Gibb
4aa2050b4b Updates for new context id generation in boot 2 2018-01-17 12:05:36 -05:00
buildmaster
0b01ca13bb Bumping versions to 1.3.2.BUILD-SNAPSHOT after release 2018-01-11 21:23:03 +00:00
buildmaster
dd34b7f189 Going back to snapshots 2018-01-11 21:23:03 +00:00
buildmaster
b60d21a076 Update SNAPSHOT to 1.3.1.RELEASE 2018-01-11 21:21:26 +00:00
Spencer Gibb
7f0791a79a Force bootstrap env to set web-application-type=none
Ff an app (or test) uses spring.main.web-application-type=reactive, bootstrap will fail. This commit forces the environment to use none, because the environment overrides the setter on SpringApplication.
2018-01-11 15:05:01 -05:00
Dave Syer
aef42a65f3 Housekeeping with KeyProperties - change default settings
N.B. this change will make existing encrypted properties undecryptable.
User would need to explicitly configure the old defaults for
encrypt.rsa.algorithm=DEFAULT and encrypt.rsa.strong=false.
2017-12-27 08:56:55 +00:00
Spencer Gibb
17adaf51d2 Test for NPE when calling getClass() in RefreshScope
fixes gh-297
2017-12-20 17:55:53 -05:00
Spencer Gibb
fb76beb3f2 Test for NPE when calling getClass() in RefreshScope
fixes gh-297
2017-12-20 17:55:25 -05:00
Spencer Gibb
53bf31ecb9 Merge branch '1.3.x' 2017-12-20 12:00:27 -05:00
Spencer Gibb
464624e375 Avoids potential NPE when calling getClass() in RefreshScope
fixes gh-297
2017-12-20 11:57:40 -05:00
Spencer Gibb
6dfb37e77c polish 2017-12-15 11:41:22 -05:00
Dave Syer
4660ae7d14 Merge branch '1.3.x' 2017-12-15 16:20:56 +00:00
Dave Syer
8a0261f275 Test for AOP proxy generally, not just CGlib
Fixes gh-288, closes gh-289
2017-12-15 16:19:48 +00:00
Dave Syer
29cb7f3500 Merge branch '1.3.x'
Test failure in spring-cloud-commons seems unrelated.
2017-12-15 16:06:56 +00:00
Dave Syer
c5382ccfd6 Refactor ConfigurationPropertiesRebinder a bit
It's not super expensive, but it all adds up, and rebinding beans
that don't need to be rebound is wasteful. This change should improve
things in three places:

The ConfigurationPropertiesRebinder
has always done a pre-emptive re-bind on startup, which was a bit
of a blunt instrument, since all we really wanted as to rebind the
beans in the parent context (to the current context's Environment).

The rebinding always happened twice for every bean because we
explicitly called into the ConfigurationPropertiesPostProcessor
directly as well as indirectly through the initialization callbacks.

Rebinding in response to an EnvironmentChangeEvent was not able to
distinguish between events published locally and by child contexts.
The child context always binds the parent's beans anyway, so you
don't need to do it twice.
2017-12-15 15:58:17 +00:00
buildmaster
1725550349 Going back to snapshots 2017-12-01 21:42:39 +00:00
buildmaster
9558b7651d Update SNAPSHOT to 2.0.0.M5 2017-12-01 21:41:58 +00:00
Spencer Gibb
b1a83c40f9 Allow refresh auto config to be disabled by property.
fixes gh-276
2017-11-28 20:14:30 -05:00
Spencer Gibb
2fdbc5a397 Merge branch '1.3.x' 2017-11-28 20:04:25 -05:00
Spencer Gibb
259aa437d7 Allow refresh auto config to be disabled by property.
fixes gh-276
2017-11-28 19:57:54 -05:00
Spencer Gibb
6e9745b7a4 Updates for boot 2 actuator path changes 2017-11-27 13:33:41 -05:00
Spencer Gibb
a051c24bf2 Reinstate encryption test. 2017-11-22 11:41:18 -05:00
Spencer Gibb
ad9cfc665c Updates to boot 2.0 compatibility 2017-11-22 11:31:00 -05:00
Spencer Gibb
39cb6be306 Merge branch 'master' into 2.0.x 2017-11-21 19:19:50 -05:00
Ryan Baxter
924d870081 Bumping versions to 1.3.1.BUILD-SNAPSHOT after release 2017-11-20 14:17:02 -05:00
Ryan Baxter
75d30e1847 Going back to snapshots 2017-11-20 14:17:01 -05:00
Ryan Baxter
695739d7a0 Update SNAPSHOT to 1.3.0.RELEASE 2017-11-20 14:14:04 -05:00
Misagh Moayyed
4868cd3183 Update PropertySourceBootstrapProperties.java (#274) 2017-11-16 12:42:45 -05:00
buildmaster
0c7badb772 Going back to snapshots 2017-11-14 21:54:31 +00:00
buildmaster
54142ba2b4 Update SNAPSHOT to 2.0.0.M4 2017-11-14 21:53:46 +00:00
Spencer Gibb
5c5e6f4d65 Merge branch 'master' into 2.0.x
# Conflicts:
#	spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/ContextRefresherTests.java
2017-11-14 11:13:12 -05:00
Spencer Gibb
1bd2c3112a Make sure cli args are copied to bootstrap. 2017-11-14 11:11:12 -05:00
Dave Syer
a513d0a4af Explicitly copy over properties from bootstrap.properties
Fixes gh-273
2017-11-14 12:49:31 +00:00
Dave Syer
7eb310066a Merge branch 'master' into 2.0.x 2017-11-14 12:48:54 +00:00
Dave Syer
4352d9a81a Add test for profiles picked up from bootstrap.properties 2017-11-14 12:47:41 +00:00
Dave Syer
d43e0ba8c1 Ignore a test and revert a Boot change to work with M6 2017-11-07 17:31:26 +00:00