2559 Commits

Author SHA1 Message Date
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
Andy Wilkinson
ab21b55dc4 Revert "Upgrade to Flyway 7.1.0"
This reverts commit a6c6aba40d3e8af6dc4bdbcab9ead5eb88b997cc.

See gh-23932
2020-10-28 19:45:19 +00:00
Stephane Nicoll
a6c6aba40d Upgrade to Flyway 7.1.0
Closes gh-23932
2020-10-28 17:51:27 +01:00
Andy Wilkinson
8f2e58e301 Merge branch '2.3.x'
Closes gh-23933
2020-10-28 16:03:11 +00:00
Andy Wilkinson
58aa34489f Wait for DataSource init before allowing context refresh to complete
Closes gh-22852
2020-10-28 16:01:14 +00:00
Andy Wilkinson
f60f3cb38e Exclude property beans from method validation
Exclude `@ConfigurationProperties` beans from method validation so
that `@Validated` can be used on final classes without the method
validation post-processor throwing an exception.

This commit introduces a `FilteredMethodValidationPostProcessor` class
which will use `MethodValidationExcludeFilters` to exclude beans from
method validation processing. Using `@EnableConfigurationProperties`
will automatically register an appropriate filter.

Closes gh-21454
2020-10-27 15:43:00 -07:00
Andy Wilkinson
1c4b4cb0cd Provide config properties for configuring WebFlux's locale resolution
Previously, the locale context resolver used with WebFlux could only be
configured by provided a custom LocaleContextResolver bean. By
constrast, when using Spring MVC, the spring.mvc.locale and
spring.mvc.locale-resolver properties could be used to configure the
locale and the resolver (fixed or Accept header) respectively.

This commit introduces spring.web.locale and spring.web.locale-resolver
properties and deprecates their spring.mvc equivalents. The new
properties can be used to configure locale resolution with either
Spring MVC or WebFlux.

Closes gh-23449
2020-10-27 11:12:00 +00:00
Phillip Webb
ef89eb6dfb Add @ConditionalOnDefaultWebSecurity annotation
Add a dedicate condition annotation to detect when Spring Security is
available but has not been configured by the user. The new annotation
helps simplify quite a few of our auto-configuration classes.

See gh-23421
2020-10-26 23:47:14 -07:00
Madhura Bhave
0818f27f44 Configure WebSecurity using WebSecurityCustomizer
Replace `WebSecurityConfigurer` and `WebSecurityConfigurerAdapter`
configurations with `WebSecurityCustomizer` or `SecurityFilterChain`
beans.

Closes gh-23421
2020-10-26 23:47:14 -07:00
Stephane Nicoll
e6c63b5b4e Polish
See gh-23914
2020-10-27 04:25:17 +01:00
Andy Wilkinson
fafc0a91e3 Register @WebListeners in a way that allows them to register components
Previously, @WebListeners were discovered via custom component scanning
and then registered programmatically via the ServletContext. The servlet
spec requires any ServletContextListener registered in this manner to be
prohibited from programatically configuring servlets, filters, and
listeners. This left us not strictly complying with the servlet spec
as a ServletContextListener registered via a @WebListener annotation
should be able to programatically configure other components.

This commit updates WebListenerHandler to register each @WebListener
component directly with Jetty, Tomcat, or Undertow rather than via the
ServletContext API. This ensure that any @WebListener-annoated
ServletContextListener registered via servlet component scanning is
able to programatically register servlets, filters, and listeners.

There is a small chance that this will be a breaking change for some
users:

1. The ServletListenerRegistrationBeans that were previously defined
   for each @WebListener will now be
   WebListenerHandler.WebListenerRegistrars
2. Each @WebListener-annotated class will now be instantiated by
   Jetty, Tomcat, or Undertow. Jetty and Tomcat both require the class
   to be public and have a public default constructor. Previously,
   a package-private class or default constructor could be used as the
   instantiation was performed by Spring Framework. Undertow is not
   affected as it can instantiate a package-private type.

Fixes gh-18303
2020-10-26 13:26:52 -07:00
Stephane Nicoll
9ab3abb728 Add support for SAML2 relying party registration's decryption credentials
Closes gh-23705
2020-10-26 15:43:35 +01:00
Andy Wilkinson
708c43a8d1 Upgrade to Flyway 7.0.4
Closes gh-23892
2020-10-26 13:38:58 +00:00
Stephane Nicoll
e0f123e676 Do not use servlet session timeout for reactive web applications
This commit fixes the auto-configuration of Spring Session to use
"server.servlet.session.timeout" as a fallback for Servlet-based web
applications only.

Closes gh-23752
2020-10-26 11:58:49 +01:00
Stephane Nicoll
cb31d9547c Merge branch '2.3.x' 2020-10-24 07:40:48 +02:00
Stephane Nicoll
d1e503602b Polish 2020-10-24 07:39:50 +02:00
Brian Clozel
5fceb9d5b7 Change favicon StaticResourceLocation
Prior to this commit, the `StaticResourceLocation` for favicons would
point to `"/**/favicon.ico"`. This location does not reflect the current
web development landscape, since the png format and size variants are
not supported here. Also, the `"**"` pattern can be costly at runtime
and is deprecated by the new path pattern support in Spring Framework
(see gh-22833).

This commit changes the default locations to `"/favicon.*","/*/icon-*"`,
supporting common use cases such as `"/favicon.ico"`, `"/favicon.png"`
and `"/icons/icon-48x48.png"`.

Closes gh-23126
2020-10-23 12:03:32 +02:00
Stephane Nicoll
d0975d659f Polish "Remove RabbitMQ AutoConfig Boolean Coercion"
See gh-23799
2020-10-23 08:35:17 +02:00
Gary Russell
32ce453997 Remove RabbitMQ AutoConfig Boolean Coercion
See gh-23799
2020-10-23 08:32:41 +02:00
Andy Wilkinson
2d8528d5bd Adapt to deprecation of StringUtils.isEmpty(Object)
See gh-23774
2020-10-22 17:09:33 +01:00
Stephane Nicoll
17e12ea025 Polish "Add configuration options for RabbitMQ's batch listener config"
See gh-23766
2020-10-21 08:50:03 +02:00
Gary Russell
3aa247f1ca Add configuration options for RabbitMQ's batch listener config
See gh-23766
2020-10-21 08:50:03 +02:00
Stephane Nicoll
e77dc60744 Add configuration properties for SAML2 relying party registration's ASM
This commit allows to configure the location and binding of the
Assertion Consumer Service used by a SAML2 relying party.

Closes gh-23746
2020-10-20 16:42:30 +02:00
Stephane Nicoll
72eaf93dba Polish assertions
See gh-23762
2020-10-20 14:37:15 +02:00
izeye
0e50e87e58 Polish
See gh-23762
2020-10-20 14:28:15 +02:00
Andy Wilkinson
a0afb73923 Merge branch '2.3.x'
Closes gh-23751
2020-10-19 14:32:38 +01:00
Andy Wilkinson
a754b791a2 Merge branch '2.2.x' into 2.3.x
Closes gh-23750
2020-10-19 14:32:23 +01:00
Andy Wilkinson
11bc62fb83 Stop using PostConstruct to default session timeout to ServerProperties'
Fixes gh-23716
2020-10-19 14:31:01 +01:00
Andy Wilkinson
4a38401cef Align relying party entity ID property with Spring Security
Closes gh-23745
2020-10-19 14:02:04 +01:00
Stephane Nicoll
dd74810c80 Revert "Fix detection logic for embedded databases"
This reverts commit c4a5a347028b827ea53975d1ec80f52a14223c5c.

See gh-23721
2020-10-19 12:25:00 +02:00
Asha Somayajula
c4a5a34702 Fix detection logic for embedded databases
Closes gh-23721
2020-10-17 07:51:24 +02:00
Stephane Nicoll
c0b267feb4 Polish "Fix detection logic for embedded databases"
See gh-23693
2020-10-16 16:32:29 +02:00
Asha Somayajula
ab02084e7b Fix detection logic for embedded databases
See gh-23693
2020-10-16 15:54:54 +02:00
Andy Wilkinson
d0c6dbc2c7 Rename eagerInitFilters to align with Undertow's naming
Closes gh-23674
2020-10-14 18:03:06 +01:00
Stephane Nicoll
b960fa3237 Polish "Add configuration options for Kafka Stream's CleanupConfig"
See gh-23636
2020-10-14 14:30:10 +02:00
Adrien Bennadji
f4799c7484 Add configuration options for Kafka Stream's CleanupConfig
See gh-23636
2020-10-14 14:26:37 +02:00
Johnny Lim
4a26e11268 Polish
See gh-23634

Closes gh-23634
2020-10-13 12:44:00 -07:00