SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,157 Commits 43 Branches 0 Tags
155c7d9131cebd30f6b96c824bee091eec3b95bb
Commit Graph

365 Commits

Author SHA1 Message Date
Spencer Gibb
6a1cc5b793 Merge branch '2.2.x' 2020-03-10 15:00:20 -04:00
Spencer Gibb
e8952fc66a Updates ContextRefresher to maintain property source ordering. (#705) 
Updates the targetName so that property sources maintain ordering from the bootstrap environment where they were refreshed.

Fixes gh-704
 2020-03-10 14:57:57 -04:00
Spencer Gibb
f6a4bebf91 Merge branch '2.2.x' 2020-03-03 17:55:32 -05:00
Spencer Gibb
69a8cece5f Ensures HikariDataSource is never re-bound. 
Removes HikariDataSource from extra-refreshable and adds it to a new property never-refreshable.

ConfigurationPropertiesRebinder now checks that property and does not rebind beans whose class is in never-refreshable.

fixes gh-687
 2020-03-03 17:54:58 -05:00
Ryan Baxter
fac994a454 Merge remote-tracking branch 'origin/2.2.x' 2020-02-27 16:19:44 -05:00
Ryan Baxter
fdfc0d5e9f Making constructor public 2020-02-27 12:18:08 -05:00
Ryan Baxter
987971a45b Merge remote-tracking branch 'origin/2.2.x' 2020-02-27 10:20:47 -05:00
Ryan Baxter
8127bab974 Move BootstrapPropertySource to its own class and expose delegate PropertySource via getter (#695) 2020-02-27 10:19:57 -05:00
Spencer Gibb
44dce764e8 Merge branch '2.2.x' 2020-01-30 14:35:41 -05:00
Spencer Gibb
744ad89177 Changes default value of management.endpoint.env.post.enabled to false. 
fixes gh-681
 2020-01-30 13:11:45 -05:00
shenjianeng
4678998351 fix double checked locking with volatile (#649) 2020-01-30 12:15:45 -05:00
Ryan Baxter
80e36d4b97 Merge remote-tracking branch 'origin/2.2.x' 2020-01-28 20:20:04 -05:00
Ryan Baxter
cb0a693cc9 merge 2.1.x into 2.2.x 2020-01-28 20:19:31 -05:00
Ryan Baxter
c982cd8798 Merge branch '466' of https://github.com/srempfer/spring-cloud-commons into srempfer-466 2020-01-28 20:15:16 -05:00
Spencer Gibb
7680957370 Merge branch '2.2.x' 2020-01-27 17:06:49 -05:00
Spencer Gibb
c69bf5c597 Merge branch '2.1.x' into 2.2.x 2020-01-27 17:06:31 -05:00
Spencer Gibb
b10e449279 Forces web-application-type=none in ContextRefresher. 
This allows apps with spring.main.web-application-type={REACTIVE|SERVLET} to function properly without error.

fixes gh-678
 2020-01-27 17:06:04 -05:00
Spencer Gibb
55e7ce5103 Migrates to new OutputCaptureRule 2020-01-21 12:45:30 -05:00
Spencer Gibb
8b53f2862a Swaps deprecated ConditionalOnEnabledEndpoint for updated annotation. 
Swaps with ConditionalOnAvailableEndpoint
 2020-01-21 12:45:30 -05:00
Spencer Gibb
0549a11cd3 Merge branch '2.2.x' 2020-01-17 15:52:49 -05:00
Spencer Gibb
e37b383c04 Migrates to new OutputCaptureRule 2020-01-17 15:52:35 -05:00
Spencer Gibb
1e27c58e85 Removes deprecated method 2020-01-17 15:50:45 -05:00
Spencer Gibb
95186267e6 Swaps deprecated ConditionalOnEnabledEndpoint for updated annotation. 
Swaps with ConditionalOnAvailableEndpoint
 2020-01-17 15:45:03 -05:00
Spencer Gibb
232c7f71d2 Adjusts ordering when override system properties is false. (#670) 
This fixes as reversed property source bug.

fixes gh-668
 2020-01-15 19:30:45 -05:00
Spencer Gibb
be0fa8f1b8 Merge branch '2.1.x' 2019-12-17 19:28:18 -05:00
Spencer Gibb
6c9bcb9f38 Adds static to ConfigurationPropertiesBeans bean. 
This avoids a bean post processor warning.

Fixes gh-657
 2019-12-17 19:26:49 -05:00
Spencer Gibb
5f3981bbfc Merge branch '2.1.x' 2019-12-17 17:18:01 -05:00
Spencer Gibb
d8db91206e Moves locateCollection impl to static method 2019-12-17 17:15:49 -05:00
Dave Syer
bfbadec0f0 Prevent listeners being added multiple times on restart 
(and at other times potentially - e.g. if 2 contexts share a parent).

Plus some general tidy up on compiler warnings.

Fixes gh-613
 2019-12-17 16:31:11 +00:00
Ryan Baxter
4cc23b4b71 Merge remote-tracking branch 'origin/2.1.x' 2019-12-13 19:38:27 -05:00
Ryan Baxter
d0ca983936 Removing the possibility of null propertysources being returned in the locator 2019-12-13 19:37:57 -05:00
Ryan Baxter
e4be432ec4 Merge remote-tracking branch 'origin/2.1.x' 2019-12-13 12:09:24 -05:00
Ryan Baxter
763b6c1711 Add each PropertySource from PropertySourceLocators individually (#652) 
* Add each PropertySource from PropertySourceLocators individually instead of as a CompositePropertySource.  Fixes #611
 2019-12-13 12:01:23 -05:00
srempfer
70129ecc07 Introduced property 'spring.cloud.bootstrap.additional-location' according to 'spring.config.additional-location' (#466) 2019-12-02 17:34:21 +01:00
Ryan Baxter
18a4227c4e Added proxyBeanMethods = false to configuration classes. Fixes #623 2019-11-14 20:04:28 -05:00
Phil Webb
2ded4eb554 Migrate from deprecate methods (#610) 
Migrate away from deprecated Spring Boot configuration property
bean classes and methods.
 2019-09-25 13:06:20 -04:00
Ryan Baxter
3acbb88756 Merge remote-tracking branch 'origin/2.1.x' 2019-08-22 12:14:50 -04:00
Ryan Baxter
656feb2758 Merge branch '2.1.x' of github.com:spring-cloud/spring-cloud-commons into 2.1.x 2019-08-22 12:11:58 -04:00
Ryan Baxter
e52736cef1 Merge branch 'master' of https://github.com/rhanton/spring-cloud-commons into rhanton-master 2019-08-22 11:42:56 -04:00
Spencer Gibb
2e714b6757 Adds OriginTrackedCompositePropertySource for bootstrap (#583) 
This allows the boot origin tracking mechanism to work if bootstrap loaded propertysources themselves are also origin tracked.

See https://github.com/spring-cloud/spring-cloud-config/issues/866
 2019-08-02 13:35:05 -04:00
Tim Ysewyn
f608dd74a7 Merge branch '2.1.x' 2019-07-26 16:26:49 +02:00
Tim Ysewyn
86650dc215 Updated license header 2019-07-26 15:08:53 +01:00
Tim Ysewyn
c19575b978 Added optimizations to EnvironmentDecryptApplicationInitializer 2019-07-26 15:08:53 +01:00
Olga Maciaszek-Sharma
883eb59d3e Merge branch '2.1.x' 2019-07-16 18:30:54 +02:00
Tim Ysewyn
28b9727250 Changed order of decrypting values. (#581) 
Reversed order of sources in CompositePropertySource to adhere to the order of sources returned by the Spring Cloud Config server.
 2019-07-16 18:28:26 +02:00
Ryan Baxter
8b57f1995b Changing default properties name to work around changes in boot, see Spring Boot #17141 2019-07-08 12:19:19 -04:00
Olga Maciaszek-Sharma
851a41cd89 Merge branch '2.1.x' 
# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-commons-dependencies/pom.xml
#	spring-cloud-commons/pom.xml
#	spring-cloud-context-integration-tests/pom.xml
#	spring-cloud-context/pom.xml
#	spring-cloud-loadbalancer/pom.xml
#	spring-cloud-starter/pom.xml
#	spring-cloud-test-support/pom.xml
 2019-07-01 14:13:17 +02:00
Olga Maciaszek-Sharma
3eeee62272 Apply Spring Boot's solution of coercing false LogLevel to OFF. (#575) 
Fixes gh-556.
 2019-07-01 14:01:39 +02:00
Ryan Baxter
df4d191856 Revert "Remove remove Ignore now that boot #17011 is fixed" 
This reverts commit 584b72587f.
 2019-06-13 11:10:12 -04:00
Ryan Baxter
584b72587f Remove remove Ignore now that boot #17011 is fixed 2019-06-13 11:04:28 -04:00