Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
37,611 Commits 23 Branches 0 Tags
85a4c94dea9b70aaaed04aba9718cd9df65201ce
Commit Graph

17131 Commits

Author SHA1 Message Date
Andy Wilkinson
d1f074858e Correct class name of StringToPeriodConverterTests 2020-07-06 15:59:32 +01:00
Andy Wilkinson
aca609c4c5 Merge branch '2.3.x' 
Closes gh-22235
 2020-07-06 14:25:13 +01:00
Andy Wilkinson
2007490ce7 Merge branch '2.2.x' into 2.3.x 
Closes gh-22234
 2020-07-06 14:24:53 +01:00
Andy Wilkinson
4301580095 Improve testing of PropertyPlaceholderAutoConfiguration 
Since Spring Framework 4.3.0.RC2, a default embedded value resolver
has been registered with the bean factory when one is not otherwise
configured. This meant that placeholders in `@Value` would be resolved
with or without PropertyPlaceholderAutoConfiguration defining a
PropertySourcesPlaceholderConfigurer bean. However, placeholders in
bean definitions would only be resolved if a
PropertySourcesPlaceholderConfigurer was defined.

This commit updates PropertyPlaceholderAutoConfigurationTests to align
with this change in Framework. We now test that placeholders are
resolved in `@Value` annotations with or without the auto-configuration
and that placeholders in bean definitions are only resolved with the
auto-configured.

Closes gh-22230
 2020-07-06 14:24:36 +01:00
Andy Wilkinson
6331a27822 Merge branch '2.3.x' 
Closes gh-22228
 2020-07-06 09:51:44 +01:00
anshlykov
683a7a851f Update to Maven Shade Plugin 3.2.4 
See gh-22227
 2020-07-06 09:51:08 +01:00
Andy Wilkinson
b356bc830d Merge branch '2.3.x' 2020-07-06 09:47:08 +01:00
Andy Wilkinson
dfea2f432a Polish 
See gh-21921
 2020-07-06 09:41:39 +01:00
Brian Clozel
3f93978e99 Merge branch '2.3.x' 
Closes gh-22215
 2020-07-03 15:52:35 +02:00
Brian Clozel
86d8366ee2 Polish support for reactive Elasticsearch healthcheck 
Fixes gh-21042
 2020-07-03 15:25:18 +02:00
Aleksander Lech
203878a16f Add support for reactive Elasticsearch healthcheck 
Prior to this commit, configuring a reactive Elasticsearch client would
auto-configure an Actuator Health check using a synchronous client, with
the default configuration properties (so tarting localhost:9200).

This would lead to false reports of unhealthy Elasticsearch clusters
when using reactive clients.

This commit reproduces the logic for MongoDB repositories: if a reactive
variant is available, it is selected for the health check
infrastructure.

See gh-21042
 2020-07-03 15:16:38 +02:00
Andy Wilkinson
ecbc8ea2df Merge branch '2.3.x' 
Closes gh-22202
 2020-07-02 15:17:04 +01:00
Andy Wilkinson
79770b9615 Use source sets to determine configurations deprecated for resolution 
Fixes gh-22200
 2020-07-02 15:14:00 +01:00
Andy Wilkinson
ecc50d179d Merge branch '2.3.x' 
Closes gh-22198
 2020-07-02 10:41:09 +01:00
Andy Wilkinson
f6b3666b16 Merge branch '2.2.x' into 2.3.x 
Closes gh-22197
 2020-07-02 10:40:54 +01:00
Andy Wilkinson
21453b5016 Ignore scoped targets when finding matching beans 
Fixes gh-22038
 2020-07-02 10:39:56 +01:00
Andy Wilkinson
81d6751ba7 Use ApplicationContextRunner in ConditionalOnSingleCandidateTests 2020-07-02 10:10:28 +01:00
Andy Wilkinson
d85774ea77 Merge branch '2.3.x' 
Closes gh-22196
 2020-07-02 09:32:11 +01:00
Eddú Meléndez
54e0a61b42 Reinstate metrics for Kafka Streams 
See gh-21921
 2020-07-01 14:03:11 +01:00
Andy Wilkinson
d64337013f Upgrade to Spring Kafka 2.5.3.RELEASE 
Closes gh-22185
 2020-07-01 14:01:39 +01:00
Andy Wilkinson
9360ba168b Upgrade to Reactor Dysprosium-SR9 
Closes gh-21938
 2020-07-01 11:51:54 +01:00
Andy Wilkinson
a13acf9f2b Upgrade to Reactor Dysprosium-SR9 
Closes gh-21937
 2020-07-01 11:49:39 +01:00
Andy Wilkinson
160d8e49e3 Merge branch '2.3.x' 
Closes gh-22180
 2020-07-01 11:44:00 +01:00
Andy Wilkinson
9317135690 Improve error handling when builder image isn't a builder 
Fixes gh-22179
 2020-07-01 11:42:36 +01:00
Andy Wilkinson
8c341df73b Polish "Add properties to control exceptions ignored by LdapTemplate" 
See gh-21289
 2020-07-01 10:03:34 +01:00
Filip Hrisafov
6853320661 Add properties to control exceptions ignored by LdapTemplate 
See gh-21289
 2020-07-01 09:33:39 +01:00
dreis2211
20debcd471 Remove redundant deprecation suppression 
See gh-22178
 2020-07-01 09:03:28 +01:00
Andy Wilkinson
568f41e8e2 Merge branch '2.3.x' 
Closes gh-22176
 2020-06-30 17:40:02 +01:00
Andy Wilkinson
0e1ded6893 Merge branch '2.2.x' into 2.3.x 
Closes gh-22175
 2020-06-30 17:39:52 +01:00
dreis2211
8c0e302f2e Accept empty filter dispatcher types in auto-configurations 
Prior to this commit, the usage of EnumSet.copyOf resulted in exceptions when
the underlying collection was empty.

See gh-22138
 2020-06-30 17:39:21 +01:00
Andy Wilkinson
6da52a0d08 Suggest iso-offset as value for WebFlux time and date-time properties 
Closes gh-22174
 2020-06-30 17:35:45 +01:00
Andy Wilkinson
9230ea4ab7 Polish "Support iso-offset for date-time and time formatting with MVC" 
See gh-21630
 2020-06-30 17:25:16 +01:00
Gaurav Pareek
c3b1172aea Support iso-offset for date-time and time formatting with MVC 
See gh-21630
 2020-06-30 17:05:17 +01:00
Andy Wilkinson
bb1a0ffbd5 Merge branch '2.3.x' 
Closes gh-22173
 2020-06-30 17:02:10 +01:00
Andy Wilkinson
4566ac5c25 Add package info to o.s.b.autoconfigure.elasticsearch.rest 
Closes gh-22147
 2020-06-30 17:01:21 +01:00
Andy Wilkinson
4ea07f432d Merge branch '2.3.x' 
Closes gh-22168
 2020-06-30 14:13:07 +01:00
Andy Wilkinson
75fc140e2d Merge branch '2.2.x' into 2.3.x 
Closes gh-22167
 2020-06-30 14:09:57 +01:00
Andy Wilkinson
3922fb7164 Polish "Avoid NPE when binder is closed before started event" 
See gh-22141
 2020-06-30 13:26:30 +01:00
im47cn
b34c268547 Avoid NPE when binder is closed before started event 
Previously, if TomcatMetricsBinder destroy() was called before it had
received an ApplicationStartedEvent an NPE would be thrown due to
TomcatMetrics being null. This NPE was then caught and logged at
warning level by the disposable bean adapter.

This prevents the NPE by checking that the TomcatMetrics instance is
null before calling close() on it.

See gh-22141
 2020-06-30 13:23:58 +01:00
Andy Wilkinson
62aa8ce107 Support incremental annotation processing with Gradle 
Closes gh-22150
 2020-06-30 11:27:32 +01:00
Andy Wilkinson
27c458ca26 Merge branch '2.3.x' 
Closes gh-22160
 2020-06-30 10:53:49 +01:00
Andy Wilkinson
f86831da9c Use TCCL at time of access for resource loading 
Fixes gh-22119
 2020-06-30 10:51:13 +01:00
Madhura Bhave
255f8197ab Merge branch '2.3.x' 
Closes gh-22156
 2020-06-29 17:09:05 -07:00
Madhura Bhave
f19f2b8714 Merge branch '2.2.x' into 2.3.x 
Closes gh-22155
 2020-06-29 17:08:37 -07:00
May
c1b9d3c226 Simplify logic in ErrorPage's equals method 
See gh-22082
 2020-06-29 17:06:49 -07:00
Madhura Bhave
75abb9cc18 Merge branch '2.3.x' 
Closes gh-22153
 2020-06-29 16:36:25 -07:00
Johnny Lim
43aee1bddd Polish 
See gh-22090
 2020-06-29 16:35:23 -07:00
Madhura Bhave
a963bba0e4 Merge branch '2.3.x' 2020-06-29 16:29:32 -07:00
Madhura Bhave
62f5e44324 Fix typo 2020-06-29 16:29:09 -07:00
Madhura Bhave
fbf2beef6e Merge branch '2.3.x' 
Closes gh-22152
 2020-06-29 16:26:30 -07:00