2767 Commits

Author SHA1 Message Date
Andy Wilkinson
d9ce30b15c Merge branch '2.3.x' into 2.4.x
See gh-25825
2021-03-30 09:23:24 +01:00
Andy Wilkinson
8b6eef6f1d Consistent use of @deprecated since
See gh-25808
2021-03-30 09:22:45 +01:00
Phillip Webb
4ad87a861d Restore deprecated JobLauncherCommandLineRunner
Restore the deprecated `JobLauncherCommandLineRunner` class and extend
removal until 2.6. The class is still needed by spring-cloud-task.

Closes gh-25807
2021-03-29 15:56:38 -07:00
Phillip Webb
44b1751bb4 Merge branch '2.4.x'
Closes gh-25826
2021-03-29 15:48:20 -07:00
Phillip Webb
363f5829d1 Merge branch '2.3.x' into 2.4.x
Closes gh-25825
2021-03-29 15:46:50 -07:00
Phillip Webb
26dd1b9a26 Update deprecations with for removal targets
Update all deprecation tags to include a removal target.

Closes gh-25808
2021-03-29 15:44:58 -07:00
Andy Wilkinson
9b65409e23 Generalize database initialization detection and include R2DBC
Closes gh-25818
2021-03-29 20:07:54 +01:00
Stephane Nicoll
9087c24713 Merge branch '2.4.x'
See gh-25820
2021-03-29 14:38:57 +02:00
Stephane Nicoll
8bb4020bd4 Polish
See gh-25819
2021-03-29 14:36:26 +02:00
Andy Wilkinson
676713be3f Merge branch '2.4.x'
Closes gh-25820
2021-03-29 13:01:02 +01:00
Andy Wilkinson
403e747c46 Use constructor injection in SpringBootRepositoryRestConfigurer
Closes gh-25819
2021-03-29 13:00:02 +01:00
Andy Wilkinson
e49a88cb9b Auto-configure script-based R2DBC database initialization
See gh-24741
2021-03-29 12:01:19 +01:00
Andy Wilkinson
9cc7f0b54d Generalize script-based DB initialization and add R2DBC initializer
See gh-24741
2021-03-29 11:51:02 +01:00
Andy Wilkinson
eb1200415d Derive a ConnectionFactoryBuilder from an existing ConnectionFactory
Closes gh-25788
2021-03-29 09:17:05 +01:00
Stephane Nicoll
870d9b191a Merge branch '2.4.x'
Closes gh-25813
2021-03-27 08:06:21 +01:00
Stephane Nicoll
d1aaee46bb Merge branch '2.3.x' into 2.4.x
Closes gh-25812
2021-03-27 08:06:02 +01:00
dreis2211
be4491959b Fix flaky QuartzAutoConfigurationTests
See gh-25810
2021-03-27 08:00:52 +01:00
Phillip Webb
02a6de4498 Merge branch '2.4.x'
Closes gh-25787
2021-03-24 12:53:06 -07:00
Phillip Webb
ddf5c9f5d1 Merge branch '2.3.x' into 2.4.x
Closes gh-25786
2021-03-24 12:52:51 -07:00
Phillip Webb
88b74097ba Polish 'Ignore quality value when removing MediaType.ALL'
See gh-25778
2021-03-24 12:35:56 -07:00
Fábio Ramon
3090a3a71f Ignore quality value when removing MediaType.ALL
Update the default reactive exception handler so that `MediaType.ALL`
is removed regardless of any quality setting. Prior to this commit,
the "match-all" media type was not properly ignored if it has a quality
value and would show HTML content if the accept header was
`application/json, */*;q=0.9`.

See gh-25778
2021-03-24 12:35:32 -07:00
Andy Wilkinson
90b4ced7a6 Move DataSource init auto-config out of DataSourceAutoConfiguration
Previously, the auto-configuration for DataSource initialization and
the properties used to configure it were part of the general
DataSource auto-configuration and properties.

This commit moves the auto-configuration of DataSource initialization
out into a separate top-level auto-configuration class. Similarly,
the properties for configuring DataSource initialization have been
moved from `spring.datasource.*` into `spring.sql.init.*`.

The old initialization-related `spring.datasource.*` properties have
been deprecated but can still be used. When they are used, they new,
separate initialization auto-configuration will back off. In other
words, the initialization related `spring.datasource.*` properties
and the `spring.sql.init.*` properties cannot be used in combination.

Closes gh-25323
2021-03-24 14:57:29 +00:00
Andy Wilkinson
5758a5aa39 Rename DDL/DML script location properties
See gh-25756
2021-03-24 12:20:36 +00:00
Stephane Nicoll
36b63eec4b Polish "Expose Spring Integration global properties"
See gh-25377
2021-03-24 11:03:26 +01:00
Artem Bilan
e2df9bce84 Expose Spring Integration global properties
Spring Integration comes with some global properties which can be
configured via `META-INF/spring.integration.properties`. The framework
then provides an `integrationGlobalProperties` bean as an
`org.springframework.integration.context.IntegrationProperties`
instance.

This commit allows users to configure these using regular
`application.properties`. If a `META-INF/spring.integration.properties`
file exists, the values are used as fallback.

See gh-25377
2021-03-24 11:03:26 +01:00
Phillip Webb
77ddb45704 Merge branch '2.4.x' 2021-03-23 12:53:59 -07:00
Phillip Webb
11a94ee6f0 Merge branch '2.3.x' into 2.4.x 2021-03-23 12:52:07 -07:00
Phillip Webb
82127fdaa3 Update copyright year of changed files 2021-03-23 12:50:49 -07:00
Andy Wilkinson
5dee68c925 Move script-based DataSource initializer into spring-boot
Closes gh-25487
Closes gh-25756
2021-03-22 20:14:30 +00:00
Andy Wilkinson
fa336bb565 Move DataSource dependency detection into dedicated package
Closes gh-25757
2021-03-22 14:23:14 +00:00
Stephane Nicoll
a900306b17 Merge branch '2.4.x'
Closes gh-25755
2021-03-22 14:46:37 +01:00
Stephane Nicoll
2ecae2df77 Merge branch '2.3.x' into 2.4.x
Closes gh-25754
2021-03-22 14:44:48 +01:00
Stephane Nicoll
c2f452a87a Polish "Take JPA database action into account when setting ddlAuto"
See gh-25129
2021-03-22 14:41:25 +01:00
bono007
674b01cb06 Take JPA database action into account when setting ddlAuto
See gh-25129
2021-03-22 13:53:28 +01:00
Andy Wilkinson
64f9d8d4fe Deprecate support for Mustache's Environment fallback
Closes gh-21045
2021-03-22 11:45:01 +00:00
Phillip Webb
663fd8ce5e Update copyright year of changed files 2021-03-18 14:49:52 -07:00
Stephane Nicoll
eff3a4f1a6 Upgrade to Spring Kafka 2.7.0-RC1
Closes gh-25582
2021-03-18 08:14:09 +01:00
Phillip Webb
8ba45cc6b5 Allow DB migrations without DataSourceProperties
Update `FlywayAutoConfiguration`, `LiquibaseAutoConfiguration` and
`DataSourceInitializer` classes so that they no longer depend on
`DataSourceProperties`. DB migrations can now be performed against
a `@Bean` defined primary `DataSource` with an alternative
username/password.

This update also removed using fallback properties when a custom
connection `url` is defined with Flyway or Liquibase. We now assume
that `username`, `password` and `driver-class-name` will be provided
if the default values are unacceptable. Our previous logic was
particularly flawed if a custom URL caused a change of driver type.

Closes gh-25643
2021-03-17 17:05:04 -07:00
Phillip Webb
6e92daa0a0 Change Kafka cleanup.on-shutdown default to false
Align our property with the recently changed spring-kafka default.

Closes gh-25730
2021-03-17 16:38:46 -07:00
Stephane Nicoll
54e7d7f060 Promote ConnectionFactoryBuilder to the "spring-boot" module
Closes gh-25492
2021-03-17 16:26:54 +00:00
Andy Wilkinson
7ef9ca02c1 Merge branch '2.4.x'
Closes gh-25718
2021-03-17 12:26:58 +00:00
Andy Wilkinson
758a2ee7ca Don't pass null exception translation result into jOOQ
Closes gh-25717
2021-03-17 12:25:50 +00:00
Andy Wilkinson
b1f5f34617 Merge branch '2.4.x'
Closes gh-25693
2021-03-16 16:35:47 +00:00
Andy Wilkinson
2560f261cd Merge branch '2.3.x' into 2.4.x
Closes gh-25692
2021-03-16 16:35:31 +00:00
Andy Wilkinson
a832cc9ccd Polish "Improve error message when no resources exist at a script location"
See gh-25620
2021-03-16 16:20:11 +00:00
Yuta Saito
42841b895f Improve error message when no resources exist at a script location
See gh-25620
2021-03-16 16:19:27 +00:00
Andy Wilkinson
17ecf18a15 Upgrade to MongoDB 4.2.2
Closes gh-25675
2021-03-16 13:54:29 +00:00
Andy Wilkinson
4a75798acc Upgrade to Flyway 7.7.0
Closes gh-25660
2021-03-16 13:54:27 +00:00
Stephane Nicoll
9b0cdac97a Add support for external configuration for Cassandra
Closes gh-24065
2021-03-15 10:44:13 +01:00
Stephane Nicoll
e517ee8635 Merge branch '2.4.x'
Closes gh-25618
2021-03-13 18:22:57 +01:00