Commit Graph

2595 Commits

Author SHA1 Message Date
izeye 3aea8b37a0 Polish
See gh-24862
2021-01-18 10:58:27 +01:00
Stephane Nicoll bcc1331f85 Restore missing deprecated metadata for Bitronix
See gh-24806
2021-01-18 10:29:21 +01:00
izeye e7350503b8 Polish
See gh-24837
2021-01-15 14:37:33 +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
Stephane Nicoll a788ef4958 Merge branch '2.4.x'
Closes gh-24842
2021-01-14 18:03:38 +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
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
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 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
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
Stephane Nicoll 8a6e79dc8b Configure Couchbase to use the application's ObjectMapper
Closes gh-24616
2021-01-10 10:10:42 +01: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
Stephane Nicoll 8cd07dbc60 Polish
See gh-21286
2020-12-24 11:10:37 +01:00
Stephane Nicoll e4618cfb8d Delete ErrorProperties.IncludeStacktrace
Closes gh-21286
2020-12-24 10:35:04 +01:00
Stephane Nicoll 1fd17cf641 Add support for Elasticsearch sniffer
Closes gh-24174
2020-12-23 17:11:40 +01:00
Stephane Nicoll ad6b01d6d0 Add control connection timeout property for Cassandra
Closes gh-24189
2020-12-22 15:20:44 +01:00
Stephane Nicoll 5000051891 Merge branch '2.4.x'
Closes gh-24589
2020-12-22 12:32:24 +01:00
Stephane Nicoll 0691ba600f Polish "Detect Persistent and RelationshipProperties with Neo4j"
See gh-24239
2020-12-22 12:30:48 +01:00
Gerrit Meier ab4b1c4e61 Detect Persistent and RelationshipProperties with Neo4j
See gh-24239
2020-12-22 12:15:03 +01:00
Stephane Nicoll ec683605d4 Polish "Allow to configure Kafka Listener's onlyLogRecordMetadata"
See gh-24582
2020-12-22 09:53:53 +01:00
Martín Dacosta b539e2e749 Allow to configure Kafka Listener's onlyLogRecordMetadata
See gh-24582
2020-12-22 09:53:07 +01:00
Stephane Nicoll 490a40af20 Polish 2020-12-22 08:33:59 +01:00
Stephane Nicoll 338c8c4fc8 Polish "Allow to configure ActiveMQ Artemis with a broker url"
See gh-24302
2020-12-21 17:53:10 +01:00
Justin Bertram 99b43cb690 Allow to configure ActiveMQ Artemis with a broker url
See gh-24302
2020-12-21 17:32:49 +01:00
Stephane Nicoll a6c6655c82 Polish "Upgrade to Jackson 2.12.0"
Guard breaking change to PropertyNamingStrategies so that we tolerate
older Jackson versions.

See gh-24415
2020-12-21 15:51:52 +01:00
Valery Yatsynovich 1f63b82c5b Upgrade to Jackson 2.12.0
See gh-24415
2020-12-21 15:27:44 +01:00
Stephane Nicoll abbdbb07f6 Polish "Upgrade to Embedded Mongo 3.0.0"
See gh-24254
2020-12-21 10:45:18 +01:00
paulius 2f6b51babd Upgrade to Embedded Mongo 3.0.0
See gh-24254
2020-12-21 10:44:52 +01:00
Phillip Webb 308c2042ee Merge branch '2.4.x' 2020-12-15 19:49:15 -08:00
Phillip Webb 4fba7d0c60 Merge branch '2.3.x' into 2.4.x 2020-12-15 19:48:52 -08:00
Andy Wilkinson fb0f27ce2d Move EMFDependsOnPostProcessor into autoconfigure.orm.jpa
Closes gh-24452
2020-12-15 14:20:50 +00:00
Stephane Nicoll 0dcd9efdac Merge branch '2.4.x'
Closes gh-24509
2020-12-15 11:30:04 +01:00
izeye 8e69a821d5 Use BindResult.orElseGet() where beneficial
See gh-24477
2020-12-15 11:26:15 +01:00
Stephane Nicoll 59910338c9 Polish "Add configuration for Rabbit's key store and trust store algorithm"
See gh-24076
2020-12-15 10:59:39 +01:00
Gong Yi 489062b203 Add configuration for Rabbit's key store and trust store algorithm
See gh-24076
2020-12-15 10:50:17 +01:00
Phillip Webb 72d36e0c07 Update copyright year of changed files 2020-12-10 10:46:04 -08:00
Stephane Nicoll 0d472d6f74 Start building against Spring Data 2020.0.2 snapshots
See gh-24284
2020-12-09 14:16:47 +01:00
Phillip Webb e95c514661 Merge branch '2.3.x'
Closes gh-24412
2020-12-08 17:28:18 -08:00
Phillip Webb 49e754f48b Merge branch '2.2.x' into 2.3.x
Closes gh-24411
2020-12-08 17:23:33 -08:00
Phillip Webb 286ef61071 Narrow auto-configure checkstyle suppressions
Closes gh-21015
2020-12-08 17:04:03 -08:00
Phillip Webb cd5ff6e4af Merge branch '2.3.x'
Closes gh-24404
2020-12-08 12:13:02 -08:00
Phillip Webb 11f285bde5 Merge branch '2.2.x' into 2.3.x
Closes gh-24403
2020-12-08 12:12:51 -08:00
Stephane Nicoll 93d83342d2 Merge branch '2.3.x'
Closes gh-24401
2020-12-08 15:42:52 +01:00
Stephane Nicoll 06671aa50e Stop deferring JPA bootstrap mode by default
This commit changes the default value of bootstrap-mode to "default"
rather than "deferred" so that the JPA infrastructure starts in the
main thread rather than asynchronously.

Closes gh-24249
2020-12-08 15:42:14 +01:00
Phillip Webb 30c27274e2 Merge branch '2.3.x'
Closes gh-24339
2020-12-04 18:31:55 -08:00
Phillip Webb 5f351a6983 Merge branch '2.2.x' into 2.3.x
Closes gh-24338
2020-12-04 18:21:57 -08:00
Phillip Webb 837fc83527 Fix checkstyle header violations
See gh-24337
2020-12-04 18:05:53 -08:00
Andy Wilkinson 4a7bc3d096 Require bean name match for Locale(Context)Resolver to back off
Web MVC and WebFlux look up by name the Locale(Context)Resolver beans
that they use. Previously, the auto-configured resolvers for MVC and
WebFlux would back off when any bean of the required type was defined,
irrespective of its name. If the name of the user's bean didn't match
the name used by MVC and WebFlux to find the custom resolver, the
custom resolver would be ignored and MVC and WebFlux would use their
defaults. There was no indication of this happening in the condition
evaluation report as all it would show is that the auto-configured
resolver had backed off in favour of the custom resolver. It wouldn't
show anything to explain why the custom resolver had not been used.

This commit updates the auto-configured resolvers to be conditional
on a missing bean of the name required by MVC and WebFlux. If the
user then defines a custom resolver with a different name, the
condition evaluation report will show that the auto-configured
resolver remained as the bean name didn't match.

Fixes gh-24209
2020-11-20 10:35:30 +00:00
dreis2211 5ef6e09c64 Fix deprecation warnings in javadoc comments
See gh-24120
2020-11-11 20:09:23 +00:00
Stephane Nicoll b6fc0913cf Merge branch '2.3.x'
Closes gh-24104
2020-11-10 17:44:05 +01:00
Stephane Nicoll 515b18e142 Merge branch '2.3.x'
Closes gh-24108
2020-11-10 17:10:26 +01:00
Stephane Nicoll 9e901b6e07 Upgrade to Testcontainers 1.15.0
Closes gh-24103
2020-11-10 16:24:16 +01:00
Stephane Nicoll 23ad2b4156 Rationalize Testcontainers image versions
This commit rationalizes the Docker image names used in integration
tests.

Closes gh-24107
2020-11-10 16:04:27 +01:00
Brian Clozel 24f29a6516 Polish
See gh-24099
2020-11-10 15:52:17 +01:00
Stephane Nicoll 78fb3ccc53 Polish 2020-11-10 14:12:37 +01:00
Brian Clozel f0a6128db3 Add spring.web.resources.cache.use-last-modified
Prior to this commit, packaging a Spring Boot application as a container
image with Cloud Native Buildpacks could result in unwanted browser
caching behavior, with "Last-Modified" HTTP response headers pointing to
dates in the far past.

This is due to CNB resetting the last-modified date metadata for static
files (for build reproducibility and container layer caching) and Spring
static resource handling relying on that information when serving static
resources.

This commit introduces a new configuration property
`spring.web.resources.cache.use-last-modified` that can be used to
disable this behavior in Spring if the application is meant to run as a
container image built by CNB.

The default value for this property remains `true` since this remains
the default value in Spring Framework and using that information in
other deployment models is a perfectly valid use case.

Fixes gh-24099
2020-11-10 13:40:25 +01:00
Stephane Nicoll 45f1133e1e Merge branch '2.3.x' 2020-11-10 09:49:49 +01:00
Stephane Nicoll 339c8d0a26 Revert "Upgrade to Testcontainers 1.15.0" 2020-11-10 09:47:46 +01:00
Stephane Nicoll 5123eb0c74 Fix deprecation in Testcontainers 1.15.0
See gh-24103
2020-11-10 09:39:18 +01:00
Stephane Nicoll 7fb21fbff3 Merge branch '2.3.x'
Closes gh-24104
2020-11-10 08:47:51 +01:00
Stephane Nicoll c1a1b5fe71 Upgrade to Testcontainers 1.15.0
Closes gh-24103
2020-11-10 08:46:15 +01:00
Andy Wilkinson f3648d6fe1 Merge branch '2.3.x'
Closes gh-24030
2020-11-04 16:47:38 +00:00
Andy Wilkinson e83f3f40be Merge branch '2.2.x' into 2.3.x
Closes gh-24029
2020-11-04 16:47:23 +00:00
Andy Wilkinson a8b8f43180 Improve description of spring.datasource.initialization-mode
Closes gh-21121
2020-11-04 16:46:28 +00:00
Andy Wilkinson a1af99640e Merge branch '2.3.x'
Closes gh-24026
2020-11-04 10:15:26 +00:00
Andy Wilkinson 28f7bc37a5 Merge branch '2.2.x' into 2.3.x
Closes gh-24025
2020-11-04 10:15:07 +00:00
Andy Wilkinson c289ba0c2c Recommend disabling context root redirects with proxied Tomcat
Closes gh-22908
2020-11-04 10:13:55 +00:00
Andy Wilkinson f4e90f4512 Merge branch '2.3.x'
Closes gh-24016
2020-11-03 17:29:14 +00:00
Andy Wilkinson d1a9dba25d Polish "Avoid repeated calls of WebFlux and MVC registrations' getters"
See gh-23999
2020-11-03 17:23:16 +00:00
Michal Růžička 2aac5c0095 Avoid repeated calls of WebFlux and MVC registrations' getters
See gh-23999
2020-11-03 16:51:39 +00:00
Andy Wilkinson 73c444262b Merge branch '2.3.x'
Closes gh-24015
2020-11-03 16:38:49 +00:00
Andy Wilkinson f9ff39a7a6 Merge branch '2.2.x' into 2.3.x
Closes gh-24014
2020-11-03 16:38:33 +00:00
Andy Wilkinson 35bff55097 Ensure that Quartz can be auto-configured with a Quartz-specific TM
Previously, Quartz could be configured with a specific DataSource
using `@QuartzDataSource` but it was not possible to configure a
Quartz-specific transaction manager. This could result in the
different DataSources being used by Quartz itself and Quart'z
DataSourceTransactionManager.

This commit introduces a new qualifier, `@QuartzTransactionManager`,
that can be used to avoid the above-described problem. Any
`@QuartzTransactionManager`-annotated bean will be used by the
Quartz auto-configure configuration instead of the application's main
`TransactionManager`. If no such qualified bean is present, the
application's main TransactionManager, if any, will be used as before.

Fixes gh-20184
2020-11-03 15:56:44 +00:00
Andy Wilkinson 699f03d5a6 Merge branch '2.3.x'
Closes gh-24010
2020-11-03 14:04:38 +00:00
Andy Wilkinson 2dce4aa42b Merge branch '2.2.x' into 2.3.x
Closes gh-24009
2020-11-03 14:04:08 +00:00
Andy Wilkinson 30a0ccab02 Remove use of `@PostConstruct` from main code
When running on Java 11 (where `@PostConstruct` is no longer part of
the JRE) and without a dependency on jakarta-annotation-api,
`@PostContruct` annotions are silently dropped. This leads to obscure and
hard-to-track down changes in the behaviour of our auto-configuration
as the `@PostConstruct`-annotated methods are not invoked.

To allow users to run on Java 11 without having jakarta-annotation-api
on the classpath, this commit removes use of `@PostConstruct` from main
code. A Checkstyle rule has also been added to prevent its usage in
main code from being reintroduced.

Closes gh-23723
2020-11-03 13:59:38 +00:00
Andy Wilkinson dbb954734e Correct replacement for stale-while-revalidate config property
Fixes gh-23980
2020-11-02 20:49:00 +00:00
Stephane Nicoll 62f26ee36f Remove code that's no longer used
Closes gh-23993
2020-11-02 10:55:12 +01:00
Stephane Nicoll 339b21cee7 Merge branch '2.3.x'
Closes gh-23992
2020-11-02 10:48:32 +01:00
Stephane Nicoll 1e9c9b9d73 Add missing default values in configuration properties metadata
Closes gh-23991
2020-11-02 10:44:06 +01:00
Andy Wilkinson c22e655848 Move spring.resources.* properties to spring.web.resources.*
Closes gh-23917
2020-10-29 16:08:50 +00:00
Phillip Webb 929d8fcd3c Update copyright year of changed files 2020-10-29 09:08:13 -07:00
Phillip Webb b0c2687aa9 Update copyright year of changed files 2020-10-29 09:07:42 -07:00
Andy Wilkinson a8705d19e5 Upgrade to Flyway 7.1.1
Closes gh-23932
2020-10-29 13:04:00 +00:00
Andy Wilkinson 2db8e7eebe Polish "Add liquibase driver class name property"
See gh-23958
2020-10-29 10:06:43 +00:00
Evgeniy Cheban 8a9b31aa69 Add liquibase driver class name property
See gh-23958
2020-10-29 09:11:41 +00:00