Andy Wilkinson
0200a3783b
Merge pull request #22212 from XenoAmess
...
* gh-22212:
Polish "Remove redundant bitwise operations"
Remove redundant bitwise operations
Closes gh-22212
2020-07-07 10:37:54 +01:00
Andy Wilkinson
7864a7da52
Polish "Remove redundant bitwise operations"
...
See gh-22212
2020-07-07 10:37:44 +01:00
XenoAmess
de46d4bfd3
Remove redundant bitwise operations
...
See gh-22212
2020-07-07 10:37:26 +01:00
Andy Wilkinson
a118668212
Merge pull request #22209 from XenoAmess
...
* gh-22209:
Use valueOf rather than parseInt as result is assigned to an int
Closes gh-22209
2020-07-07 10:27:14 +01:00
XenoAmess
7c73ed69e1
Use valueOf rather than parseInt as result is assigned to an int
...
See gh-22209
2020-07-07 10:26:25 +01:00
Andy Wilkinson
e5b5622b1f
Merge pull request #22213 from XenoAmess
...
* gh-22213:
Polish "Remove redundant close() call from JarResourceManagerTests"
Remove redundant close() call from JarResourceManagerTests
Closes gh-22213
2020-07-07 10:17:31 +01:00
Andy Wilkinson
3c7f54b97f
Polish "Remove redundant close() call from JarResourceManagerTests"
...
See gh-22213
2020-07-07 10:17:22 +01:00
XenoAmess
623b3ab96e
Remove redundant close() call from JarResourceManagerTests
...
See gh-22213
2020-07-07 10:16:20 +01:00
Andy Wilkinson
eb56bb5797
Merge pull request #22211 from XenoAmess
...
* gh-22211:
Polish "Use new ArrayList(Collection) rather than new and addAll"
Use new ArrayList(Collection) rather than new and addAll
Closes gh-22211
2020-07-07 10:14:21 +01:00
Andy Wilkinson
cd8081f952
Polish "Use new ArrayList(Collection) rather than new and addAll"
...
See gh-22211
2020-07-07 10:09:48 +01:00
XenoAmess
fb70c529d4
Use new ArrayList(Collection) rather than new and addAll
...
See gh-22211
2020-07-07 10:07:29 +01:00
Andy Wilkinson
54ce2905af
Merge pull request #22210 from XenoAmess
...
* gh-22210:
Use new ArrayList(Collection) rather than new, iterate, and add
Closes gh-22210
2020-07-07 10:05:56 +01:00
XenoAmess
90d8480ffe
Use new ArrayList(Collection) rather than new, iterate, and add
...
See gh-22210
2020-07-07 10:04:13 +01:00
Andy Wilkinson
597d6acabc
Merge pull request #22218 from XenoAmess
...
* gh-22218:
Fix typos in test code
Closes gh-22218
2020-07-07 10:02:13 +01:00
XenoAmess
66dc24062f
Fix typos in test code
...
See gh-22218
2020-07-07 10:01:48 +01:00
Andy Wilkinson
2a9193f6d9
Merge branch '2.3.x'
...
Closes gh-22244
2020-07-07 09:56:34 +01:00
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