Commit Graph

401 Commits

Author SHA1 Message Date
Ryan Baxter
ecabe2bb8d Merge remote-tracking branch 'origin/2.0.x' 2019-01-07 12:43:08 -05:00
Jasper Aarts
59798f52ed Only attempt to decrypt properties that are not overridden (#462) 2019-01-07 12:33:09 -05:00
Jasper Aarts
4a66435d38 Allow overriding encrypted properties with unencrypted properties (#459) 2018-12-21 15:05:57 -05:00
buildmaster
bc521c4ab6 Going back to snapshots 2018-12-11 21:36:00 +00:00
buildmaster
57c2f9a154 Update SNAPSHOT to 2.1.0.RC2 2018-12-11 21:35:03 +00:00
buildmaster
c410aa749f Going back to snapshots 2018-12-11 16:10:18 +00:00
buildmaster
1251411295 Update SNAPSHOT to 2.1.0.RC1 2018-12-11 16:09:27 +00:00
Dave Syer
daff90f230 Ensure null order is not allowed to bubble up to annotation utils
Fixes gh-456
2018-12-11 11:00:31 +00:00
Ryan Baxter
8d0f64fd93 Add property to disable WritableEnvironmentEndpoint. Fixes #432. (#453) 2018-12-06 22:09:13 +01:00
Spencer Gibb
2515e45405 Closes bootstrap context on parent ApplicationFailedEvent. (#450)
Closes bootstrap context on parent ApplicationFailedEvent.

fixes gh-440
2018-11-29 10:59:11 -05:00
Spencer Gibb
1acb2b8b8b Moves away from Class.forName() to order. 2018-11-19 16:47:18 -05:00
Spencer Gibb
5df3c48fae Moves BootstrapConfiguration classes to ImportSelector. (#444)
This change moves a dynamic list of classes passed to
`SpringApplicationBuilder.sources` to a `DeferredImportSelector` loaded
by a simple `@Configuration` class. `BootstrapImportSelector` now loads
the classes and orders them and returns the class names so that
`@Conditional` annotations (such as `@ConditionalOnClass`) function
properly.

This was exposed while using java 11.

fixes gh-438
2018-11-19 11:12:23 -05:00
buildmaster
8ed921523b Going back to snapshots 2018-11-18 09:19:14 +00:00
buildmaster
275cdfa43a Update SNAPSHOT to 2.1.0.M2 2018-11-18 09:18:28 +00:00
Dave Syer
c5138b5bb8 Merge remote-tracking branch 'origin/2.0.x' 2018-10-29 08:47:09 +00:00
Ryan Baxter
9b8a70e557 Check type before invoking bean factory to prevent early creation of FactoryBeans. (#436) 2018-10-27 07:45:26 -04:00
buildmaster
e80bb61107 Bumping versions to 2.0.3.BUILD-SNAPSHOT after release 2018-10-23 15:46:50 +00:00
buildmaster
8c6e38b789 Going back to snapshots 2018-10-23 15:46:50 +00:00
buildmaster
080b4f77df Update SNAPSHOT to 2.0.2.RELEASE 2018-10-23 15:43:52 +00:00
Spencer Gibb
60d2a1ead3 Merge branch '2.0.x' 2018-10-22 16:00:25 -04:00
lxy
bbc82b423c Set MainApplicationClass if it is null (#426)
MainApplicationClass will be null, if it is booted from SpringBootServletInitializer. So we need to set it properly.

Fixes gh-425
2018-10-18 09:51:59 -04:00
Spencer Gibb
cd0ff1b1d5 Merge branch '2.0.x' 2018-10-05 17:46:12 -04:00
Spencer Gibb
b86b637f47 Removes previous bean definitions rather than calling setAllowBeanDefinitionOverriding
See gh-395
2018-10-05 14:31:39 -04:00
Spencer Gibb
6c9231a4da Verify ConfigProps is a bean and refreshables is actually tested. 2018-10-04 11:47:43 -04:00
Spencer Gibb
4da0d95e11 Restores refreshable support using BeanDefinitionRegistryPostProcessor 2018-10-04 11:42:19 -04:00
Spencer Gibb
1fa513194b Adds API and implementation of ReactiveLoadBalancer
API lives in spring-cloud-commons module and implementation in
spring-cloud-loadbalancer.
2018-10-03 12:38:12 -04:00
buildmaster
a4fdc8e117 Going back to snapshots 2018-09-21 19:28:07 +00:00
buildmaster
4c1aa2b2d4 Update SNAPSHOT to Greenwich.M1 2018-09-21 19:27:04 +00:00
durigon
b91313d913 Refactor String#replaceAll (#417)
If we repeatedly call String#replaceAll, we internally repeatedly call the regular expression pattern compilation every time as following:
```java
    public String replaceAll(String regex, String replacement) {
        return Pattern.compile(regex).matcher(this).replaceAll(replacement);
    }
```
The modifications are to keep the compiled pattern.
Therefore, compiling a relatively expensive regular expression pattern does not have to be done every time.
2018-09-19 20:41:07 -04:00
Jone
b606806066 Fixes decryption of CompositePropertySource
Since CompositePropertySource extends EnumerablePropertySource
the else statement in
EnvironmentDecryptApplicationInitializer.decrypt() was never reached.
2018-09-10 13:37:10 -04:00
Spencer Gibb
1d646290ab Moves away from @EventListener to interface implementations for framework 5.1 changes
fixes gh-405
2018-08-21 11:42:27 -04:00
Spencer Gibb
23d7eae038 Moves away from @EventListener to interface implementations for framework 5.1 changes 2018-08-21 11:14:48 -04:00
Spencer Gibb
75e504765f Merge branch '2.0.x' 2018-08-15 14:49:22 -04:00
Spencer Gibb
6533e0ca53 Makes ContextRefresher easier to extend.
Adds protected getters for context and scope.

Adds new refreshEnvironment() method.

fixes gh-382
2018-08-15 14:48:58 -04:00
Ben Klein
55c7833e4c Minor Javadoc cleanup (#401)
Nothing major found--mostly just polish.
2018-08-06 13:02:41 -04:00
Spencer Gibb
87bb8f1fa1 Upgrades to build 2.1.0.BUILD-SNAPSHOT and boot 2.1.x
Moves refresh scope proxy creation from BeanDefinitionRegistryPostProcessor to BeanPostProcessor

fixes gh-400
2018-08-02 11:19:17 -04:00
Spencer Gibb
69181c14d1 formatting 2018-08-01 13:20:28 -04:00
buildmaster
8efcb1577e Bumping versions to 2.0.2.BUILD-SNAPSHOT after release 2018-07-31 18:05:58 +00:00
buildmaster
36146312ab Going back to snapshots 2018-07-31 18:05:58 +00:00
buildmaster
1998ac2892 Update SNAPSHOT to 2.0.1.RELEASE 2018-07-31 18:03:14 +00:00
Ryan Baxter
7949aaa1b5 Merge remote-tracking branch 'origin/1.3.x' 2018-07-30 16:40:12 -04:00
Ryan Baxter
57ab7ed469 Add null check in RefreshScopeHealthIndicator. Fixes #397. (#398) 2018-07-26 15:09:05 -04:00
Ryan Baxter
1de9d12150 Extract target class code into utility class (#391)
* Extract target class code into utility class
2018-07-11 16:01:14 -04:00
buildmaster
d711556fe8 Bumping versions to 1.3.5.BUILD-SNAPSHOT after release 2018-06-28 14:20:22 +00:00
buildmaster
9896cb7062 Going back to snapshots 2018-06-28 14:20:21 +00:00
buildmaster
b9c04fb14b Update SNAPSHOT to 1.3.4.RELEASE 2018-06-28 14:19:20 +00:00
buildmaster
a707941e5c Bumping versions to 2.0.1.BUILD-SNAPSHOT after release 2018-06-18 13:29:50 +00:00
buildmaster
917c134350 Going back to snapshots 2018-06-18 13:29:49 +00:00
buildmaster
1ade0553ee Update SNAPSHOT to 2.0.0.RELEASE 2018-06-18 13:26:29 +00:00
Spencer Gibb
bd138dac44 fixes formatting 2018-06-13 16:09:30 -04:00