Commit Graph

27978 Commits (77578cd34db5cedec19b158b8703109b04e9d870)
 

Author SHA1 Message Date
Andy Wilkinson 39cb912819 Merge branch '2.2.x' into 2.3.x
Closes gh-22583
4 years ago
Andy Wilkinson 41954533b2 Fix Mock|SpyBean context caching
The fix for gh-20916 updated DefinitionsParser so that the
ResolvableType for each MockBean or SpyBean field included the
implementation class from which the field was found. Where the field
was declared with a variable generic signature that was made constant
by its implementation class, this allowed the correct concrete type to
be determined. It also had the unintended side-effect of preventing two
test classes with identical `@MockBean` and `@SpyBean` configuration
from sharing a context as the resolvable types for their mock and spy
bean fields would now be different.

This commit updates DefinitionsParser to only include the
implementation class in the ResolvableType if the field's generic type
is variable. For cases where it is not variable, this restores the
behaviour prior to the fix for gh-20916.

Fixes gh-22566
4 years ago
Andy Wilkinson 4827e84a12 Merge branch '2.3.x'
Closes gh-22581
4 years ago
Andy Wilkinson d0c75aef19 Merge branch '2.2.x' into 2.3.x
Closes gh-22580
4 years ago
Andy Wilkinson 16eaae0b2f Defer background pre-init till the environment is prepared
Previously, background pre-init was started in response to the
application starting event. This meant that it would be running while
the logging turbo filter was in place and was rejecting all logging.
As a result, any logging performed during pre-init would be lost.

This commit changes background pre-init so that it is now started
in response to the application environment prepared event. By this
point, the logging turbo filter has been removed as the logging levels
have been configured from the environment.

Closes gh-21897
4 years ago
Andy Wilkinson 3444a23765 Merge branch '2.3.x'
Closes gh-22579
4 years ago
Andy Wilkinson f0d90020e5 Merge branch '2.2.x' into 2.3.x
Closes gh-22578
4 years ago
Andy Wilkinson b98c3dccfd Fix property-based configuration of Undertow socket options
Previously, only UndertowOptions was used as the source of options for
both server and socket options, but it only contains server options.
As a result, attempting to configure any socket options defined by
XNIO's Options class would fail.

This commit updates the property-based configuration of options to use
UndertowOptions as the source for server options and XNIO's Options as
the source for socket options.

Fixes gh-22502
4 years ago
Andy Wilkinson 8a9cc64221 Merge branch '2.3.x'
Closes gh-22577
4 years ago
Andy Wilkinson 5279b90ced Merge branch '2.2.x' into 2.3.x
Closes gh-22576
4 years ago
Andy Wilkinson 1c3528f5a4 Include Jackson Modules in WebMvcTest and WebFluxTest
Fixes gh-22530
4 years ago
Andy Wilkinson 6b4114e4cf Merge branch '2.3.x'
Closes gh-22575
4 years ago
Andy Wilkinson 979aef1f68 Merge branch '2.2.x' into 2.3.x
Closes gh-22574
4 years ago
Andy Wilkinson 7b3c0a9e09 Advise against java.util.Optional configuration properties
Closes gh-21868
4 years ago
Stephane Nicoll 85ed16de13 Merge branch '2.3.x'
Closes gh-22568
4 years ago
Stephane Nicoll 6b32e62142 Fix CacheAutoConfiguration relative order for Couchbase
This commit fixes the auto-configuration of the Couchbase caching
support by configuring the cache once Spring Data Couchbase has gotten
a chance to be processed.

Closes gh-22542
4 years ago
Andy Wilkinson edca4be021 Merge branch '2.3.x' 4 years ago
Andy Wilkinson 43524575cc Merge branch '2.2.x' into 2.3.x 4 years ago
Andy Wilkinson 162253948a Merge branch '2.1.x' into 2.2.x 4 years ago
Andy Wilkinson 25866019c9 Polish pipeline env vars used by Gradle Enterprise 4 years ago
Andy Wilkinson 04777d06d9 Merge branch '2.3.x' 4 years ago
Andy Wilkinson 8d665a1eea Merge branch '2.2.x' into 2.3.x 4 years ago
Andy Wilkinson 750777db24 Merge branch '2.1.x' into 2.2.x 4 years ago
Andy Wilkinson 5d776f2a8b Set user.name in CI builds so it's picked up by Gradle Enterprise 4 years ago
Andy Wilkinson d5ec823454 Merge branch '2.3.x' 4 years ago
Andy Wilkinson 8b84f66132 Merge branch '2.2.x' into 2.3.x 4 years ago
Andy Wilkinson 1dfa21c99f Merge branch '2.1.x' into 2.2.x 4 years ago
Andy Wilkinson 141c59e348 Set BRANCH env var so it's available to Gradle Enterprise 4 years ago
Andy Wilkinson 4eb24754af Merge branch '2.3.x' 4 years ago
Andy Wilkinson 43316fa6b6 Merge branch '2.2.x' into 2.3.x 4 years ago
Andy Wilkinson 4a828c7db1 Merge branch '2.1.x' into 2.2.x 4 years ago
Andy Wilkinson 45d50e279e Disable build scans in custom layout sample's tests 4 years ago
Andy Wilkinson 9a4ed48627 Merge branch '2.3.x' 4 years ago
Andy Wilkinson 8eca4d9d8d Merge branch '2.2.x' into 2.3.x 4 years ago
Andy Wilkinson ce7210c4f0 Merge branch '2.1.x' into 2.2.x
Closes gh-22563
4 years ago
Andy Wilkinson ebfa26e3ac Merge pull request #22555 from runningcode
* gh-22555:
  Polish "Add generated-snippets as output to test goal"
  Add generated-snippets as output to test goal

Closes gh-22555
4 years ago
Andy Wilkinson d1ea5befea Polish "Add generated-snippets as output to test goal"
See gh-22555
4 years ago
Nelson Osacky 585aed8f8f Add generated-snippets as output to test goal
The generated snippets were not declared as an output to the
`spring-boot-actuator-autoconfigure` test goal so when the test was
pulled from the cache, it did not contain the `generated-snippets`
directory. This directory is required as an input to the Asciidoctor
plugin.

See gh-22555
4 years ago
Stephane Nicoll 71fbd794fa Merge pull request #22549 from izeye
* pr/22549:
  Polish

Closes gh-22549
4 years ago
izeye 6eba7c5f10 Polish
See gh-22549
4 years ago
Stephane Nicoll 42155321cb Merge branch '2.3.x'
Closes gh-22561
4 years ago
Stephane Nicoll 7ed54bda96 Fix typo for management.health.readinessstate.enabled
Closes gh-22560
4 years ago
Andy Wilkinson a1bfe217c9 Merge branch '2.3.x' 4 years ago
Spring Buildmaster 90809f266e Next development version (v2.3.3.BUILD-SNAPSHOT) 4 years ago
Andy Wilkinson 120db242a0 Merge branch '2.3.x' 4 years ago
Andy Wilkinson 2e1366f61f Make spring-boot-dependencies available when building test app 4 years ago
Andy Wilkinson e712d9a662 Merge branch '2.3.x' 4 years ago
Andy Wilkinson 98115239b3 Only create effective bom artifact when needed
Closes gh-22143
4 years ago
Andy Wilkinson d7c5956a7a Merge branch '2.3.x' 4 years ago
Andy Wilkinson 63cac4bedd Upgrade to Micrometer 1.5.3
Closes gh-22553
4 years ago