Commit Graph

524 Commits

Author SHA1 Message Date
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
buildmaster
d0febfbfba Bumping versions 2020-01-21 18:07:45 +00: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
buildmaster
c2fc64a3e5 Bumping versions 2020-01-20 16:05:03 +00:00
buildmaster
39921b2d33 Bumping versions 2020-01-20 13:11:59 +00:00
buildmaster
83d6912076 Bumping versions 2020-01-18 16:04:59 +00: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
0c370bf5b4 Merge branch '2.2.x' 2020-01-17 15:45:56 -05:00
Spencer Gibb
95186267e6 Swaps deprecated ConditionalOnEnabledEndpoint for updated annotation.
Swaps with ConditionalOnAvailableEndpoint
2020-01-17 15:45:03 -05:00
Spencer Gibb
188b98a659 Updates to 3.0.0.BUILD-SNAPSHOT 2020-01-17 14:53: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
buildmaster
2e40fcec41 Bumping versions to 2.2.2.BUILD-SNAPSHOT after release 2019-12-20 11:59:03 +00:00
buildmaster
980ce49895 Going back to snapshots 2019-12-20 11:59:03 +00:00
buildmaster
f533ef1553 Update SNAPSHOT to 2.2.1.RELEASE 2019-12-20 11:53:32 +00: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
buildmaster
8ab3c2723a Bumping versions to 2.2.1.BUILD-SNAPSHOT after release 2019-11-26 09:34:55 +00:00
buildmaster
a70b9f30bd Going back to snapshots 2019-11-26 09:34:54 +00:00
buildmaster
a20cde9672 Update SNAPSHOT to 2.2.0.RELEASE 2019-11-26 09:28:58 +00:00
Olga Maciaszek-Sharma
da0e06eb7a Add evictor based loadbalancer caching (#644)
* Add Evictor dependency. Implement EvictorCache.

* Add EvictorBasedLoadBalancerCacheManager. Add evictor to starter.

* Set caffeine InitialCapacity from properties.

* Add tests. Add javadocs. Fix creating multiple cache instances.

* Reformat. Change property name. Add documentation.

* Add more tests.

* Move evictor version to parent. Add more tests.

* Ignore .flattened-pom.xml.

* Encapsulate Evictor and switch to non-evictor specific class naming.

* Adjust the docs.

* Fix after code review.
2019-11-25 20:34:19 +01:00
buildmaster
4bd752192c Bumping versions to 2.1.5.BUILD-SNAPSHOT after release 2019-11-18 14:33:52 +00:00
buildmaster
178395f6c9 Going back to snapshots 2019-11-18 14:33:52 +00:00
buildmaster
4bba3d1a80 Update SNAPSHOT to 2.1.4.RELEASE 2019-11-18 14:32:51 +00:00
Ryan Baxter
18a4227c4e Added proxyBeanMethods = false to configuration classes. Fixes #623 2019-11-14 20:04:28 -05:00
buildmaster
80a9a38712 Going back to snapshots 2019-11-08 19:57:32 +00:00
buildmaster
9ec71f275e Update SNAPSHOT to 2.2.0.RC2 2019-11-08 19:56:19 +00:00
buildmaster
efcb959e8c Bumping versions 2019-11-07 13:47:04 +00:00
buildmaster
8e2374140a Going back to snapshots 2019-10-24 20:20:04 +00:00
buildmaster
338649716f Update SNAPSHOT to 2.2.0.RC1 2019-10-24 20:18:53 +00:00
buildmaster
dd08f97b93 Going back to snapshots 2019-10-03 18:56:14 +00:00
buildmaster
191a2724a4 Update SNAPSHOT to 2.2.0.M3 2019-10-03 18:55:07 +00: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
buildmaster
d8b1abe02f Bumping versions to 2.1.4.BUILD-SNAPSHOT after release 2019-09-09 18:22:04 +00:00
buildmaster
fff96f4a8c Going back to snapshots 2019-09-09 18:22:04 +00:00