Commit Graph

12065 Commits

Author SHA1 Message Date
dreis2211 b8b5e4cebf Fix configuration metadata for logging.charset.* properties
See gh-24851
2021-01-17 17:02:24 +01:00
Stephane Nicoll 600be08225 Merge branch '2.4.x'
Closes gh-24855
2021-01-15 16:51:27 +01:00
Stephane Nicoll 7ec7569939 Merge branch '2.3.x' into 2.4.x
Closes gh-24854
2021-01-15 16:51:10 +01:00
Stephane Nicoll b3ab77a5c3 Move Spring Boot version to main index in reference guide
Closes gh-24848
2021-01-15 16:50:45 +01:00
izeye e7350503b8 Polish
See gh-24837
2021-01-15 14:37:33 +01:00
Stephane Nicoll 1a2a3d6598 Merge branch '2.4.x' 2021-01-15 14:37:25 +01:00
Stephane Nicoll e8ae18ae11 Polish
See gh-24837
2021-01-15 14:36:53 +01:00
Stephane Nicoll 2c2c160579 Remove deprecated code
See gh-24806
2021-01-15 14:14:33 +01:00
Stephane Nicoll a18f01addf Remove bitronix support
See gh-24806
2021-01-15 14:14:27 +01:00
Andy Wilkinson 4b0d5c31de Switch to the Apache Tomcat EL implementation by default
Previously we used org.glassfish:jakarta.el as our default EL
implementation. Since adopting it we have learned that it can be
significantly slower than Apache Tomcat's EL implementation in some
scenarios. This commit switches to using
org.apache.tomcat.embed:tomcat-embed-el by default instead of the
Glassfish implementation.

Closes gh-24744
2021-01-15 09:30:54 +00:00
Stephane Nicoll e2033992c7 Merge branch '2.4.x' 2021-01-15 08:25:41 +01:00
Stephane Nicoll 9343633582 Merge branch '2.3.x' into 2.4.x 2021-01-15 08:25:27 +01:00
Stephane Nicoll 9a53865c8f Polish 2021-01-15 08:24:57 +01:00
Phillip Webb 0fd3cd5ed5 Merge branch '2.4.x' 2021-01-14 17:25:22 -08:00
Phillip Webb 26f2caca22 Update copyright year of changed files 2021-01-14 17:25:09 -08:00
Phillip Webb daf2b2fea3 Merge branch '2.4.x'
Fixes gh-24846
2021-01-14 17:23:24 -08:00
Phillip Webb c0aef4c35f Apply SystemProperties to LoggerContext
Update `LoggingSystemProperties` so that system environment properties
are also applied to the `LoggerContext`. This is required when multiple
applications are deployed to the same Servlet container. In such setups
there's only a single JVM and the System Environment can be changed
when multiple applications start at the same time.

Fixes gh-24835
2021-01-14 17:22:37 -08:00
Madhura Bhave b7843f9399 Merge branch '2.4.x'
Closes gh-24846
2021-01-14 16:15:15 -08:00
Madhura Bhave 68fc2329c8 Revert "Remove unnecessary code"
Fixes gh-24835
2021-01-14 16:13:30 -08:00
Brian Clozel 4dd60684c9 Merge branch '2.4.x'
Closes gh-24844
2021-01-14 18:36:31 +01:00
Brian Clozel 6f51831001 Fix docs on probe state during graceful shutdown
This commit improves the "Application lifefycle and Probes states"
section and underlines the difference between `AvailabilityState` and
the availability of Probes over HTTP.

Closes gh-24843
2021-01-14 18:30:15 +01:00
Stephane Nicoll a788ef4958 Merge branch '2.4.x'
Closes gh-24842
2021-01-14 18:03:38 +01:00
Stephane Nicoll dda8b5d287 Revert "Upgrade to Kafka 2.6.1"
See gh-24247
2021-01-14 18:03:09 +01:00
Stephane Nicoll 2072e7242a Merge branch '2.3.x' into 2.4.x
Closes gh-24841
2021-01-14 18:02:28 +01:00
Stephane Nicoll 283ed48d63 Unwrap Datasource against an actual interface
This commit updates DataSourceUnwrapper to take a separate interface
type argument if the target datasource has to be unwrapped, given that
the target type is usually not an interface.

Closes gh-24697
2021-01-14 18:00:35 +01:00
Stephane Nicoll 9f40b9de7b Merge branch '2.4.x'
Closes gh-24832
2021-01-14 10:55:31 +01:00
Stephane Nicoll 5d85ac6838 Complete configuration metadata for spring.config.*
Closes gh-24816
2021-01-14 10:54:51 +01:00
Stephane Nicoll 03844c00cc Upgrade to Dependency Management Plugin 1.0.11
Closes gh-24830
2021-01-14 09:05:34 +01:00
Stephane Nicoll 3aa960a060 Upgrade to Spring Kafka 2.6.5
Closes gh-24703
2021-01-14 08:54:02 +01:00
Stephane Nicoll d6d0abcfd5 Upgrade to Spring AMQP 2.3.4
Closes gh-24702
2021-01-14 08:53:30 +01:00
Stephane Nicoll da8a8b9712 Upgrade to Spring Integration 5.4.3
Closes gh-24701
2021-01-14 08:52:51 +01:00
Stephane Nicoll bb33574ad4 Upgrade to Netty tcNative 2.0.36.Final
Closes gh-24829
2021-01-14 08:52:16 +01:00
Stephane Nicoll e73c124b2d Upgrade to Netty 4.1.58.Final
Closes gh-24828
2021-01-14 08:52:15 +01:00
Stephane Nicoll 27162bc3b9 Upgrade to Dependency Management Plugin 1.0.11.RELEASE
Closes gh-24827
2021-01-14 08:52:14 +01:00
Stephane Nicoll 3ecd1001a1 Upgrade to Spring Kafka 2.5.11.RELEASE
Closes gh-24826
2021-01-14 08:38:29 +01:00
Stephane Nicoll 696539c68f Upgrade to Spring Integration 5.3.5.RELEASE
Closes gh-24825
2021-01-14 08:38:27 +01:00
Stephane Nicoll 8908969a6c Upgrade to Spring AMQP 2.2.14.RELEASE
Closes gh-24824
2021-01-14 08:38:26 +01:00
Stephane Nicoll 92f132ae35 Upgrade to Netty tcNative 2.0.36.Final
Closes gh-24823
2021-01-14 08:38:25 +01:00
Stephane Nicoll 6f9e3a6e94 Upgrade to Netty 4.1.58.Final
Closes gh-24822
2021-01-14 08:38:24 +01:00
Stephane Nicoll 1dd445b6ca Upgrade to Dependency Management Plugin 1.0.11.RELEASE
Closes gh-24821
2021-01-14 08:38:23 +01:00
Madhura Bhave b1c6829707 Merge branch '2.4.x'
Closes gh-24812
2021-01-13 15:18:45 -08:00
Madhura Bhave ceff47afba Fix ordering of properties and yaml files
Fixes gh-24719
2021-01-13 15:17:12 -08:00
Stephane Nicoll 9a48423a1d Upgrade to Spring Data 2020.0.3
Closes gh-24700
2021-01-13 17:50:18 +01:00
Stephane Nicoll e01fdf91bd Upgrade to Spring HATEOAS 1.2.3
Closes gh-24803
2021-01-13 14:05:40 +01:00
Stephane Nicoll f9e59abe8b Upgrade to Lettuce 6.0.2.RELEASE
Closes gh-24802
2021-01-13 14:05:39 +01:00
Stephane Nicoll beec43cda5 Upgrade to Micrometer 1.6.3
Closes gh-24786
2021-01-13 14:04:33 +01:00
Stephane Nicoll 6d5d8cbc2c Upgrade to Lettuce 5.3.6.RELEASE
Closes gh-24801
2021-01-13 14:02:36 +01:00
Stephane Nicoll 6b353aee8d Upgrade to Micrometer 1.5.10
Closes gh-24785
2021-01-13 14:01:19 +01:00
Andy Wilkinson f2ebf10a4a Merge branch '2.4.x'
Closes gh-24800
2021-01-13 11:14:58 +00:00
Andy Wilkinson a95a7e3d40 Allow restart to be enabled when CL not named AppClassLoader
Previously, the restart initializer that enables restart when
-Dspring.devtools.restart.enabled=true is set had no effect when the
ClassLoader's name did not contain AppClassLoader. This commit updates
RestartApplicationListener to use the correct RestartInitializer when
the system property has forcibly enabled restart.

When restart is enabled a SilentExitException is thrown and it should be
caught and handled by the SilentExitExceptionHandler. When the
application is invoked via one of the loader's LauncherClasses
reflection is used and this exception becomes wrapped in an
InvocationTargetEception. Previously, this wrapping prevented
SilentExitExceptionHandler from handling the exception. This commit
updates the handler to look for an InvocationTargetException with a
SilentExitException target in addition to continuing to look for a
SilentExitException directly.

Fixes gh-24797
2021-01-13 10:12:12 +00:00
Phillip Webb 304c49d73f Merge branch '2.4.x'
Closes gh-24795
2021-01-12 17:38:27 -08:00
Phillip Webb 26f143b8d3 Support @Name annotation on /actuator/configprops
Update `ConfigurationPropertiesReportEndpoint` so that supports
constructor parameters annotated with `@Name`.

Fixes gh-24713
2021-01-12 17:38:17 -08:00
Phillip Webb 635c087694 Merge branch '2.4.x' 2021-01-12 17:33:16 -08:00
Phillip Webb 6c2ff56fba Fix tests to also work in IDE 2021-01-12 17:31:53 -08:00
Scott Frederick 9925c4ccd2 Merge branch '2.4.x'
Closes gh-24794
2021-01-12 17:50:55 -06:00
Scott Frederick a9e711e503 Enforce builder and run images in the same registry
Previously, when an authenticated Docker builder registry was
configured in the Maven or Gradle plugin and the builder and run
images specified different registries, the authentication credentials
would be sent to both registries. This could cause confusion if both
registries don't recognize the same credentials. This commit enforces
that both images are in the same registry when authentication
is configured.

Fixes gh-24552
2021-01-12 17:50:28 -06:00
Phillip Webb 4cc1467aba Merge branch '2.4.x' 2021-01-12 12:04:40 -08:00
Phillip Webb a6a7c06e55 Merge branch '2.3.x' into 2.4.x 2021-01-12 12:04:11 -08:00
Phillip Webb 9da0bd8523 Update copyright year of changed files 2021-01-12 12:02:57 -08:00
Phillip Webb 48e00fc7f4 Merge branch '2.4.x'
Closes gh-24793
2021-01-12 11:49:15 -08:00
Phillip Webb b6cb9c016f Detect bad properties in profile specific files
Throw an `InvalidConfigDataPropertyException` if bad properties are
detected in profile specific files. The following properties will now
trigger an exception if used in a profile specific file:

	`spring.profiles.include`
	`spring.profiles.active`
	`spring.profiles.default`
	`spring.config.activate.on-profile`
	`spring.profiles`

Prior to this commit, profile based properties in a profile specific
file would be silently ignored, making them hard to find.

Fixes gh-24733
2021-01-12 11:48:19 -08:00
Madhura Bhave 5d8b760996 Merge branch '2.4.x' 2021-01-12 11:00:23 -08:00
Madhura Bhave 5ed2b11e34 Fix typo 2021-01-12 10:59:59 -08:00
Andy Wilkinson 31fe24c451 Merge branch '2.4.x'
Closes gh-24791
2021-01-12 16:04:04 +00:00
Andy Wilkinson 5cae1a2842 Merge branch '2.3.x' into 2.4.x
Closes gh-24790
2021-01-12 16:03:48 +00:00
Andy Wilkinson 7b1d07fa98 Use SpringSessionDataSource-annotated DataSource when one is available
Fixes gh-24624
2021-01-12 15:47:33 +00:00
Stephane Nicoll c5d4ca933b Upgrade to Reactor Dysprosium-SR16
Closes gh-24765
2021-01-12 15:00:11 +01:00
Andy Wilkinson 8281f404d1 Merge branch '2.4.x'
Closes gh-24769
2021-01-12 13:12:25 +00:00
Andy Wilkinson c3dfb9bd29 Merge branch '2.3.x' into 2.4.x
Closes gh-24768
2021-01-12 13:12:10 +00:00
Andy Wilkinson 997505005b Handle files larger than Integer.MAX_VALUE bytes in bootJar and bootWar
Fixes gh-24618
2021-01-12 13:11:46 +00:00
Stephane Nicoll f02951fb17 Upgrade to Netty 4.1.56.Final
Closes gh-24764
2021-01-12 09:55:44 +01:00
Stephane Nicoll 2e69198f97 Upgrade to Neo4j OGM 3.2.19
Closes gh-24763
2021-01-12 09:55:43 +01:00
Stephane Nicoll 5fb1ca6043 Upgrade to Johnzon 1.2.9
Closes gh-24762
2021-01-12 09:55:41 +01:00
Stephane Nicoll 37f653121f Upgrade to Jetty Reactive HTTPClient 1.1.5
Closes gh-24761
2021-01-12 09:55:40 +01:00
Stephane Nicoll 3ae9639cbb Upgrade to Jackson Bom 2.11.4
Closes gh-24760
2021-01-12 09:55:38 +01:00
Stephane Nicoll 371e59cd80 Upgrade to Hibernate Validator 6.1.7.Final
Closes gh-24759
2021-01-12 09:55:37 +01:00
Stephane Nicoll e48e48988a Upgrade to Hibernate 5.4.27.Final
Closes gh-24758
2021-01-12 09:55:35 +01:00
Stephane Nicoll 66daeab221 Upgrade to Hazelcast 3.12.11
Closes gh-24757
2021-01-12 09:55:34 +01:00
Stephane Nicoll 682c952306 Upgrade to Dropwizard Metrics 4.1.17
Closes gh-24756
2021-01-12 09:55:32 +01:00
Stephane Nicoll 7ab9fad062 Upgrade to Byte Buddy 1.10.19
Closes gh-24755
2021-01-12 09:55:31 +01:00
Stephane Nicoll b3bc79b10f Upgrade to AppEngine SDK 1.9.84
Closes gh-24754
2021-01-12 09:55:29 +01:00
Stephane Nicoll d14921968b Upgrade to Spring Framework 5.3.3
Closes gh-24750
2021-01-12 08:33:31 +01:00
Stephane Nicoll 8058370f3e Upgrade to Spring Framework 5.3.3
Closes gh-24699
2021-01-12 08:28:33 +01:00
Phillip Webb 66598ed4ad Merge branch '2.4.x' 2021-01-11 16:42:17 -08:00
Phillip Webb bd21c43d71 Simplify resource registration
Simplify resource registration by using the new Spring Framework API
that allows `Resource` instances to be registered directly.

See gh-24745
2021-01-11 16:40:42 -08:00
Phillip Webb e50d61a78d Start building against Spring Framework 5.3.3 snapshots
See gh-24750
2021-01-11 16:30:35 -08:00
Phillip Webb a8f291b252 Merge branch '2.4.x'
Closes gh-24749
2021-01-11 15:24:25 -08:00
Phillip Webb f1fcfa6fc3 Merge branch '2.3.x' into 2.4.x
Closes gh-24748
2021-01-11 14:53:57 -08:00
Phillip Webb 72dd3b5628 Merge branch '2.2.x' into 2.3.x
Closes gh-24747
2021-01-11 14:21:56 -08:00
Phillip Webb f9e3e0d532 Register default resource path using a Resource
Update `WebMvcAutoConfiguration` so that the default "/" resource path
is registered directly as a `ServletContextResource`.

Closes gh-24745
2021-01-11 14:20:46 -08:00
Phillip Webb 21a08ed37d Merge branch '2.4.x'
Closes gh-24746
2021-01-11 13:58:48 -08:00
Phillip Webb 53a6fa2fed Respect spring.dao.exceptiontranslation setting
Update `DataSourceTransactionManagerAutoConfiguration` to respect
the `spring.dao.exceptiontranslation` setting. If `exceptiontranslation`
is `false` then we create a classic `DataSourceTransactionManager`
rather than a `JdbcTransactionManager`.

Fixes gh-24321
2021-01-11 13:57:47 -08:00
Phillip Webb 3fc1d319fe Merge branch '2.4.x' 2021-01-11 13:40:32 -08:00
Phillip Webb cff3e4c831 Fix tests following upstream framework changes 2021-01-11 13:39:21 -08:00
Phillip Webb 3301f6b6ee Merge branch '2.4.x' 2021-01-11 12:05:01 -08:00
Phillip Webb 039df1d96d Test spring.profiles.include in profile file
Add a test to ensure that `spring.profiles.include` is not silently
ignored when used in a profile-specific file.

See gh-24733
2021-01-11 12:04:14 -08:00
Phillip Webb 26a68ca2cf Polish 2021-01-11 12:04:07 -08:00
Stephane Nicoll 7ad8646153 Merge branch '2.4.x'
Closes gh-24740
2021-01-11 16:34:50 +01:00
Stephane Nicoll 31de36565f Upgrade to Reactor 2020.0.3
Closes gh-24698
2021-01-11 16:29:13 +01:00
Stephane Nicoll 6bf74e5752 Polish 2021-01-11 14:39:56 +01:00
Stephane Nicoll 0897af0dfa Add customizer for jOOQ's configuration
This commit adds a customizer hook point for jOOQ's configuration. When
such a bean is present, it is invoked with the auto-configuration
`Configuration`. This effectively supersedes checking for a number of
jOOQ `*Provider`beans. The existing beans are still honoured, in a
deprecated fashion.

Closes gh-24732
2021-01-11 14:16:34 +01:00
Pascal Schumacher aa24f78d85 Polish "Add support for GET requests for /actuator/startup"
See gh-24717
See gh-24734
2021-01-11 13:11:26 +01:00
Andy Wilkinson f34eb86a21 Merge branch '2.4.x'
Closes gh-24739
2021-01-11 11:49:59 +00:00
Andy Wilkinson 5ae9fbedcd Merge branch '2.3.x' into 2.4.x
Closes gh-24738
2021-01-11 11:33:30 +00:00
Andy Wilkinson 7625a979db Configure bootRun to use project's Java toolchain by default
Previously, unlike the application plugin's run task, our bootRun task
ignored the project's Java toolchain. This meant that the application
was run on a JVM with the same Java version as the one being used by
Gradle itself. This could result in a failure if the application
required a more modern JVM.

This commit updates the plugin to configure the bootRun task's
JavaLauncher convention to be one derived from the project's Java
toolchain. Toolchain support was introduced in Gradle 6.7 so this is
only done when using Gradle 6.7 and later.

Fixes gh-24517
2021-01-11 11:21:53 +00:00
Andy Wilkinson f07e470765 Merge branch '2.4.x'
Closes gh-24736
2021-01-11 11:05:03 +00:00
Andy Wilkinson 3c3aa9e486 Merge branch '2.3.x' into 2.4.x
Closes gh-24735
2021-01-11 11:03:35 +00:00
Andy Wilkinson 064de4e073 Check configured JavaLauncher when determining version of the JVM
Previously, bootRun assumed that the Java version of the JVM that would
run the application would be the same as the Java version of the JVM
that is running the build. This assumption does not hold true when
Gradle's toolchain support is used to configure tasks that fork a new
JVM to use a version other than that being used by Gradle itself.

This commit updates the BootRun task to query the JavaLauncher property
when determining the version of Java on which the application will be
run. Toolchain support and the JavaLauncher property are new in Gradle
6.7. To support earlier versions of Gradle, NoSuchMethodError is caught
we continue as if no JavaLauncher has been configured and use the local
JVM's Java version.

Fixes gh-24512
2021-01-11 10:36:16 +00:00
Stephane Nicoll 097f878981 Upgrade to Kafka 2.6.1
Closes gh-24247
2021-01-11 09:20:59 +01:00
Stephane Nicoll 50019a7f44 Upgrade to Thymeleaf Layout Dialect 2.5.2
Closes gh-24731
2021-01-11 09:20:24 +01:00
Stephane Nicoll aad3de2ba7 Upgrade to Spring Retry 1.3.1
Closes gh-24730
2021-01-11 09:20:22 +01:00
Stephane Nicoll d7e6f963ab Upgrade to Netty 4.1.56.Final
Closes gh-24729
2021-01-11 09:20:20 +01:00
Stephane Nicoll 5f63b22286 Upgrade to Johnzon 1.2.9
Closes gh-24728
2021-01-11 09:20:19 +01:00
Stephane Nicoll 8867544d0d Upgrade to Jetty Reactive HTTPClient 1.1.5
Closes gh-24727
2021-01-11 09:20:17 +01:00
Stephane Nicoll fc6fa74691 Upgrade to Jackson Bom 2.11.4
Closes gh-24726
2021-01-11 09:20:16 +01:00
Stephane Nicoll d691d63b1e Upgrade to Hibernate Validator 6.1.7.Final
Closes gh-24725
2021-01-11 09:20:14 +01:00
Stephane Nicoll bc0a1ff852 Upgrade to Hibernate 5.4.27.Final
Closes gh-24724
2021-01-11 09:20:13 +01:00
Stephane Nicoll 487f694872 Upgrade to Dropwizard Metrics 4.1.17
Closes gh-24723
2021-01-11 09:20:11 +01:00
Stephane Nicoll a60b5e0f70 Upgrade to Byte Buddy 1.10.19
Closes gh-24722
2021-01-11 09:20:10 +01:00
Stephane Nicoll 180493422d Upgrade to AppEngine SDK 1.9.84
Closes gh-24721
2021-01-11 09:20:08 +01:00
Stephane Nicoll 632c1239e6 Polish "Add support for GET requests for /actuator/startup"
See gh-24717
2021-01-11 09:12:53 +01:00
bono007 4b8d6efc12 Add support for GET requests for /actuator/startup
See gh-24717
2021-01-11 08:49:06 +01:00
Stephane Nicoll 8a6e79dc8b Configure Couchbase to use the application's ObjectMapper
Closes gh-24616
2021-01-10 10:10:42 +01:00
Andy Wilkinson 45f298bc7a Merge branch '2.4.x'
Closes gh-24711
2021-01-08 17:08:52 +00:00
Andy Wilkinson 9e389c8376 Merge branch '2.3.x' into 2.4.x
Closes gh-24710
2021-01-08 17:07:45 +00:00
Andy Wilkinson 5ad4d627fd Fix classpath index so entries match those expected by the launcher
This reverts commit ad164269e9 and adds
some additional tests.

Fixes gh-24192
2021-01-08 15:32:19 +00:00
Stephane Nicoll 1d30a4716e Merge branch '2.4.x'
Closes gh-24708
2021-01-08 15:54:36 +01:00
Stephane Nicoll b8a1869569 Merge branch '2.3.x' into 2.4.x
Closes gh-24707
2021-01-08 15:53:53 +01:00
Stephane Nicoll 826d79be3e Clarify behaviour of WebServerFactory in reference guide
Closes gh-24705
2021-01-08 15:50:16 +01:00
Stephane Nicoll 40f1f9a25c Start building against Spring Kafka 2.6.5 snapshots
See gh-24703
2021-01-08 09:24:42 +01:00
Stephane Nicoll a27b87a118 Start building against Spring AMQP 2.3.3 snapshots
See gh-24702
2021-01-08 09:23:34 +01:00
Stephane Nicoll 0bfb072467 Start building against Spring Integration 5.4.3 snapshots
See gh-24701
2021-01-08 09:22:59 +01:00
Stephane Nicoll 5bfc0285c6 Start building against Spring Data 2020.0.3 snapshots
See gh-24700
2021-01-08 09:22:03 +01:00
Stephane Nicoll 11d20eba82 Start building against Spring Framework 5.3.3 snapshots
See gh-24699
2021-01-08 08:36:21 +01:00
Stephane Nicoll 9f70b71036 Start building against Reactor 2020.0.3 snapshots
See gh-24698
2021-01-08 08:35:34 +01:00
Scott Frederick c82165694d Merge branch '2.4.x'
Closes gh-24690
2021-01-07 16:00:03 -06:00
Scott Frederick 210438ee5b Merge branch '2.3.x' into 2.4.x
Closes gh-24689
2021-01-07 15:59:37 -06:00
Scott Frederick a302238e21 Remove layout parameters from build-image Maven goal
This commit removes the `layout` and `layoutFactory` parameters
from the `build-image` goal in the Maven plugin while retaining
them for the `repackage` goal. The `build-image` goal currently
only supports jar archives, so allowing other layout types to be
configured for the goal could cause confusion.

Fixes gh-24105
2021-01-07 15:59:02 -06:00
Scott Frederick bd4c6e51fa Merge branch '2.4.x'
Closes gh-24687
2021-01-07 10:36:06 -06:00
Scott Frederick ef7a82756e Allow overriding ThemeResolver and FlashMapManager beans
Previously, an error would occur when a user contributed a
`ThemeResolver` or `FlashMapManager` bean because those beans would
would not properly override the default beans provided by Spring
Framework. This commit adds conditional auto-configuration of these
bean types, preferring user-provided beans and falling back to
Framework-provided defaults.

Fixes gh-24207
2021-01-07 10:29:13 -06:00
Phillip Webb bd027de736 Merge branch '2.4.x'
Closes gh-24685
2021-01-06 17:40:20 -08:00
asheCarry 17c0c7d9d6 Fix javadoc typo in ConfigDataLocation
See gh-24660
2021-01-06 17:39:39 -08:00
Phillip Webb fdeee9776e Merge branch '2.4.x'
Closes gh-24684
2021-01-06 17:31:09 -08:00
Phillip Webb 48661e79f5 Merge branch '2.3.x' into 2.4.x
Closes gh-24683
2021-01-06 17:30:55 -08:00
Phillip Webb 7cbd57b635 Log FailureAnalyzer errors at trace level
Update `FailureAnalyzers` to log errors at `trace` rather than `debug`.
This should reduce noise when an analyzer unexpectedly fails and the
user is running with `--debug`.

Fixes gh-24630
2021-01-06 17:29:24 -08:00
Phillip Webb 86bb3b7dcd Merge branch '2.4.x' 2021-01-06 17:02:13 -08:00
Phillip Webb 76aa33b65a Merge branch '2.3.x' into 2.4.x 2021-01-06 17:01:53 -08:00
Phillip Webb a24ec9d372 Merge branch '2.2.x' into 2.3.x 2021-01-06 17:01:22 -08:00
Phillip Webb 46629ef5e4 Migrate away from pivotal-legacy/homebrew-tap
Update formula to use spring-boot rather than springboot. This will
allow both taps to be used at the same time.

See gh-24659
2021-01-06 16:58:05 -08:00
Phillip Webb 42e649debe Merge branch '2.4.x'
Closes gh-24682
2021-01-06 16:47:46 -08:00