Commit Graph

28577 Commits (26daf3714e34060a2451d4a203fd524729fc3cfd)
 

Author SHA1 Message Date
Andy Wilkinson fbfb7df3e1 Merge branch '2.3.x'
Closes gh-22247
4 years ago
Andy Wilkinson 24e1a1dddf Merge branch '2.2.x' into 2.3.x
Closes gh-22246
4 years ago
Andy Wilkinson 1ad66cf92b Merge pull request #22207 from Sineaggi
* gh-22207:
  Polish "Rename NoneOfNestedConditions to NoneNestedConditions in example docs"
  Rename NoneOfNestedConditions to NoneNestedConditions in example docs

Closes gh-22207
4 years ago
Andy Wilkinson a8d3f9af31 Polish "Rename NoneOfNestedConditions to NoneNestedConditions in example docs"
See gh-22207
4 years ago
Clayton Walker 7fee70a625 Rename NoneOfNestedConditions to NoneNestedConditions in example docs
See gh-22207
4 years ago
Andy Wilkinson 0200a3783b Merge pull request #22212 from XenoAmess
* gh-22212:
  Polish "Remove redundant bitwise operations"
  Remove redundant bitwise operations

Closes gh-22212
4 years ago
Andy Wilkinson 7864a7da52 Polish "Remove redundant bitwise operations"
See gh-22212
4 years ago
XenoAmess de46d4bfd3 Remove redundant bitwise operations
See gh-22212
4 years ago
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
4 years ago
XenoAmess 7c73ed69e1 Use valueOf rather than parseInt as result is assigned to an int
See gh-22209
4 years ago
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
4 years ago
Andy Wilkinson 3c7f54b97f Polish "Remove redundant close() call from JarResourceManagerTests"
See gh-22213
4 years ago
XenoAmess 623b3ab96e Remove redundant close() call from JarResourceManagerTests
See gh-22213
4 years ago
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
4 years ago
Andy Wilkinson cd8081f952 Polish "Use new ArrayList(Collection) rather than new and addAll"
See gh-22211
4 years ago
XenoAmess fb70c529d4 Use new ArrayList(Collection) rather than new and addAll
See gh-22211
4 years ago
Andy Wilkinson 54ce2905af Merge pull request #22210 from XenoAmess
* gh-22210:
  Use new ArrayList(Collection) rather than new, iterate, and add

Closes gh-22210
4 years ago
XenoAmess 90d8480ffe Use new ArrayList(Collection) rather than new, iterate, and add
See gh-22210
4 years ago
Andy Wilkinson 597d6acabc Merge pull request #22218 from XenoAmess
* gh-22218:
  Fix typos in test code

Closes gh-22218
4 years ago
XenoAmess 66dc24062f Fix typos in test code
See gh-22218
4 years ago
Andy Wilkinson 2a9193f6d9 Merge branch '2.3.x'
Closes gh-22244
4 years ago
Andy Wilkinson 96e6b74894 Merge branch '2.2.x' into 2.3.x
Closes gh-22243
4 years ago
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
4 years ago
Andy Wilkinson a0f1424393 Polish "Fix unwrapping of captured PrintStream in test support's OutputCapture"
See gh-22214
4 years ago
XenoAmess 75a64bd901 Fix unwrapping of captured PrintStream in test support's OutputCapture
See gh-22214
4 years ago
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
4 years ago
Andy Wilkinson b627918011 Polish "Optionally ignore routing data sources when creating DB health indicators"
See gh-22222
4 years ago
Julio Gomez Diaz 13d1d2393d Optionally ignore routing data sources when creating DB health indicators
See gh-22222
4 years ago
Andy Wilkinson 523dd937cd Merge branch '2.3.x'
Closes gh-22238
4 years ago
Andy Wilkinson 28128a9577 Add support for ChronoUnit.WEEKS when using PeriodUnit
Fixes gh-22225
4 years ago
Andy Wilkinson 0141f554b8 Merge branch '2.3.x' 4 years ago
Andy Wilkinson d1f074858e Correct class name of StringToPeriodConverterTests 4 years ago
Andy Wilkinson aca609c4c5 Merge branch '2.3.x'
Closes gh-22235
4 years ago
Andy Wilkinson 2007490ce7 Merge branch '2.2.x' into 2.3.x
Closes gh-22234
4 years ago
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
4 years ago
Andy Wilkinson 6331a27822 Merge branch '2.3.x'
Closes gh-22228
4 years ago
Andy Wilkinson 40fc90e343 Merge pull request #22227 from anshlykov
* gh-22227:
  Update to Maven Shade Plugin 3.2.4

Closes gh-22227
4 years ago
anshlykov 683a7a851f Update to Maven Shade Plugin 3.2.4
See gh-22227
4 years ago
Andy Wilkinson b356bc830d Merge branch '2.3.x' 4 years ago
Andy Wilkinson dfea2f432a Polish
See gh-21921
4 years ago
Brian Clozel 3f93978e99 Merge branch '2.3.x'
Closes gh-22215
4 years ago
Brian Clozel 86d8366ee2 Polish support for reactive Elasticsearch healthcheck
Fixes gh-21042
4 years ago
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
4 years ago
Andy Wilkinson ecbc8ea2df Merge branch '2.3.x'
Closes gh-22202
4 years ago
Andy Wilkinson 79770b9615 Use source sets to determine configurations deprecated for resolution
Fixes gh-22200
4 years ago
Andy Wilkinson ecc50d179d Merge branch '2.3.x'
Closes gh-22198
4 years ago
Andy Wilkinson f6b3666b16 Merge branch '2.2.x' into 2.3.x
Closes gh-22197
4 years ago
Andy Wilkinson 21453b5016 Ignore scoped targets when finding matching beans
Fixes gh-22038
4 years ago
Andy Wilkinson 81d6751ba7 Use ApplicationContextRunner in ConditionalOnSingleCandidateTests 4 years ago
Andy Wilkinson 00a6d9098f Merge branch '2.3.x'
Closes gh-22191
4 years ago