Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,456 Commits 22 Branches 322 Tags 248 MiB
ef2ccbc7d6
Commit Graph

27456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson
96e6b74894 Merge branch '2.2.x' into 2.3.x 
Closes gh-22243
 2020-07-07 09:56:21 +01:00
Andy Wilkinson
ae043285d8 Merge pull request #22214 from XenoAmess 
* gh-22214:
  Polish "Fix unwrapping of captured PrintStream in test support's OutputCapture"
  Fix unwrapping of captured PrintStream in test support's OutputCapture

Closes gh-22214
 2020-07-07 09:55:01 +01:00
Andy Wilkinson
a0f1424393 Polish "Fix unwrapping of captured PrintStream in test support's OutputCapture" 
See gh-22214
 2020-07-07 09:54:52 +01:00
XenoAmess
75a64bd901 Fix unwrapping of captured PrintStream in test support's OutputCapture 
See gh-22214
 2020-07-07 09:53:34 +01:00
Andy Wilkinson
fe1919063f Merge pull request #22222 from juliojgd 
* gh-22222:
  Polish "Optionally ignore routing data sources when creating DB health indicators"
  Optionally ignore routing data sources when creating DB health indicators

Closes gh-22222
 2020-07-07 09:45:07 +01:00
Andy Wilkinson
b627918011 Polish "Optionally ignore routing data sources when creating DB health indicators" 
See gh-22222
 2020-07-07 09:42:36 +01:00
Julio Gomez Diaz
13d1d2393d Optionally ignore routing data sources when creating DB health indicators 
See gh-22222
 2020-07-07 09:36:06 +01:00
Andy Wilkinson
523dd937cd Merge branch '2.3.x' 
Closes gh-22238
 2020-07-06 19:58:45 +01:00
Andy Wilkinson
28128a9577 Add support for ChronoUnit.WEEKS when using PeriodUnit 
Fixes gh-22225
 2020-07-06 19:57:26 +01:00
Andy Wilkinson
0141f554b8 Merge branch '2.3.x' 2020-07-06 16:00:10 +01:00
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
Andy Wilkinson
40fc90e343 Merge pull request #22227 from anshlykov 
* gh-22227:
  Update to Maven Shade Plugin 3.2.4

Closes gh-22227
 2020-07-06 09:51:37 +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
00a6d9098f Merge branch '2.3.x' 
Closes gh-22191
 2020-07-02 09:43:13 +01:00
Andy Wilkinson
f0b78fb3c4 Merge branch '2.2.x' into 2.3.x 
Closes gh-22190
 2020-07-02 09:42:50 +01:00
Andy Wilkinson
1410ef2911 Merge branch '2.1.x' into 2.2.x 
Closes gh-22193
 2020-07-02 09:42:03 +01:00
Andy Wilkinson
c9958c2ab4 Upgrade CI to Docker 19.03.12 
Closes gh-22189
 2020-07-02 09:39:13 +01:00
Andy Wilkinson
b6ceb56023 Update JDK 15 CI to use 2020-07-01-07-28 
Closes gh-22192
 2020-07-02 09:36:47 +01:00
Andy Wilkinson
d85774ea77 Merge branch '2.3.x' 
Closes gh-22196
 2020-07-02 09:32:11 +01:00
Andy Wilkinson
b9bfcdd4e9 Merge pull request #21921 from eddumelendez 
* gh-21921:
  Reinstate metrics for Kafka Streams

Closes gh-21921
 2020-07-01 14:03:24 +01:00
Eddú Meléndez
54e0a61b42 Reinstate metrics for Kafka Streams 
See gh-21921
 2020-07-01 14:03:11 +01:00
Andy Wilkinson
e1564edbee Merge branch '2.3.x' 2020-07-01 14:01:58 +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
c16b21f6ec Merge branch '2.3.x' 
Closes gh-22184
 2020-07-01 13:48:40 +01:00
Andy Wilkinson
f4cbdf556d Merge branch '2.2.x' into 2.3.x 
Closes gh-22183
 2020-07-01 13:48:27 +01:00
Andy Wilkinson
e44640de89 Merge branch '2.1.x' into 2.2.x 
Closes gh-22182
 2020-07-01 13:48:08 +01:00
Andy Wilkinson
25777360b2 Merge pull request #22110 from dreis2211 
* gh-22110:
  Improve error handling in JDK upgrade checks

Closes gh-22110
 2020-07-01 13:47:15 +01:00
dreis2211
24072bed96 Improve error handling in JDK upgrade checks 
See gh-22110
 2020-07-01 13:45:50 +01:00
Andy Wilkinson
00a9357624 Merge branch '2.3.x' 2020-07-01 11:52:33 +01:00
Andy Wilkinson
9360ba168b Upgrade to Reactor Dysprosium-SR9 
Closes gh-21938
 2020-07-01 11:51:54 +01:00
Andy Wilkinson
f3b273b09e Merge branch '2.2.x' into 2.3.x 2020-07-01 11:50:55 +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
9981f01a13 Merge pull request #21289 from filiphr 
* gh-21289:
  Polish "Add properties to control exceptions ignored by LdapTemplate"
  Add properties to control exceptions ignored by LdapTemplate

Closes gh-21289
 2020-07-01 10:03:53 +01:00