SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
897 Commits 43 Branches 0 Tags
d3dcabb480fbb324207d0e2ca729744e73d6009e
Commit Graph

434 Commits

Author SHA1 Message Date
Spencer Gibb
d3dcabb480 Updates for boot 2.2.x 2019-03-07 13:16:23 -05:00
Marcin Grzejszczak
167a97d390 Bumped commons to 2.2.0 2019-03-07 15:36:37 +01:00
buildmaster
54f496ecef Bumping versions to 2.1.2.BUILD-SNAPSHOT after release 2019-03-05 15:22:36 +00:00
buildmaster
f3fa713490 Going back to snapshots 2019-03-05 15:22:35 +00:00
buildmaster
41db03106f Update SNAPSHOT to 2.1.1.RELEASE 2019-03-05 14:55:27 +00:00
Ryan Baxter
911b9aa992 Merge remote-tracking branch 'origin/2.0.x' 2019-02-27 11:45:44 -05:00
Ryan Baxter
5e29ff1a6f Add new type property to KeyStore properties. (#486) 2019-02-27 11:31:56 -05:00
buildmaster
f19f4be761 Bumping versions to 2.0.4.BUILD-SNAPSHOT after release 2019-02-22 15:22:11 +00:00
buildmaster
ea5abfd3a5 Going back to snapshots 2019-02-22 15:22:11 +00:00
buildmaster
5ea5bdcf70 Update SNAPSHOT to 2.0.3.RELEASE 2019-02-22 15:19:33 +00:00
Ryan Baxter
bb1e769ce3 Revert #473 2019-02-14 18:51:22 -05:00
Ryan Baxter
fcf67be215 Merge remote-tracking branch 'origin/2.0.x' 2019-02-14 18:11:00 -05:00
Ryan Baxter
4413f136aa Revert "Only attempt to decrypt properties that are not overridden (#462)" 
This reverts commit 59798f52ed.
 2019-02-14 17:14:14 -05:00
Ryan Baxter
5e52806440 Revert "Allow overriding encrypted properties with unencrypted properties (#459)" 
This reverts commit 4a66435d38.
 2019-02-14 17:09:28 -05:00
Spencer Gibb
b38ce54410 Sets the child class loader to parent class loader. 
This prevents odd behavior in jdk 11 +

Fixes https://github.com/spring-cloud/spring-cloud-netflix/issues/3101
 2019-02-14 15:54:27 -05:00
Spencer Gibb
a7c344f83f formatting 2019-02-14 15:52:32 -05:00
Spencer Gibb
703c7c2bbf Ignores MapPropertySources not created by boot 
Prior to this change, any `MapPropertySource` created by an `EnvironmentPostProcessor` would be processed by `BootstrapApplicationListener`. If that property source had a conditional property that it created itself, the 2nd run (bootstrap causes EPPs to run twice) would not have the property and that property source would end up in the main `Environment` effectively deleting a property.

This change only deals with `MapPropertySource`s created by boot testing for a specific sub-type.

Fixes gh-476
 2019-02-13 11:34:26 -05:00
Spencer Gibb
109e5779e9 Ignores MapPropertySources not created by boot 
Prior to this change, any `MapPropertySource` created by an `EnvironmentPostProcessor` would be processed by `BootstrapApplicationListener`. If that property source had a conditional property that it created itself, the 2nd run (bootstrap causes EPPs to run twice) would not have the property and that property source would end up in the main `Environment` effectively deleting a property.

This change only deals with `MapPropertySource`s created by boot testing for a specific sub-type.

Fixes gh-476
 2019-02-13 11:33:06 -05:00
Marcin Grzejszczak
377eaad4a1 Checkstyle for tests 2019-02-03 15:13:41 +01:00
Marcin Grzejszczak
04d764d33a Updated copyrights 2019-02-01 14:41:18 +01:00
Marcin Grzejszczak
ae314100f5 Applied checkstyle and turned it on by default 2019-02-01 12:50:02 +01:00
Jasper Aarts
e024f6f5c2 Fix override behaviour when using CompositePropertySource. (#473) 
* Fix override behaviour when using CompositePropertySource.
Fixes gh-471

* Improve imports
 2019-01-31 20:51:37 -05:00
buildmaster
0c9f9f1d6e Bumping versions to 2.1.1.BUILD-SNAPSHOT after release 2019-01-22 17:52:15 +00:00
buildmaster
de56340e7b Going back to snapshots 2019-01-22 17:52:15 +00:00
buildmaster
5c64a6d02c Update SNAPSHOT to 2.1.0.RELEASE 2019-01-22 17:49:47 +00:00
Ryan Baxter
ddcd40736f Merge remote-tracking branch 'origin/2.0.x' 2019-01-18 16:14:12 -05:00
Ryan Baxter
d7d0320905 Merge remote-tracking branch 'origin/1.3.x' into 2.0.x 2019-01-18 16:13:43 -05:00
Ryan Baxter
b91e2ab731 Trim profile names in array (#469) 
* Trim profile names in array.  Fixes #460

* Use tokenizeToStringArray
 2019-01-18 16:12:52 -05:00
Ryan Baxter
43c270a53c Provide exact error when there is a problem opening the logging config file. Fixes #464 (#470) 2019-01-18 10:30:05 -05:00
Ryan Baxter
7ee51d9bc8 Provide exact error when there is a problem opening the logging config file. Fixes #464 (#470) 2019-01-18 10:29:14 -05:00
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