Commit Graph

13018 Commits

Author SHA1 Message Date
Andy Wilkinson 2cffbc90cb Merge branch '2.4.x'
Closes gh-25511
2021-03-05 11:03:41 +00:00
Andy Wilkinson 836ad76df1 Merge branch '2.3.x' into 2.4.x
Closes gh-25510
2021-03-05 11:03:08 +00:00
Andy Wilkinson 92133d47d0 Polish "Make link to Actuator API docs more prominent"
See gh-25486
2021-03-05 10:58:47 +00:00
cdalexndr 5f4e1b747e Make link to Actuator API docs more prominent
See gh-25486
2021-03-05 10:57:59 +00:00
Andy Wilkinson 2b7f23b29d Merge branch '2.4.x'
Closes gh-25509
2021-03-05 10:44:24 +00:00
Andy Wilkinson ac258a95a2 Merge branch '2.3.x' into 2.4.x
Closes gh-25508
2021-03-05 10:39:52 +00:00
Andy Wilkinson c6ca7a53ab Polish "Prevent extracting zip entries outside of destination path"
See gh-25505
2021-03-05 10:13:32 +00:00
trungPa 2993e68715 Prevent extracting zip entries outside of destination path
See gh-25505
2021-03-05 10:12:06 +00:00
Stephane Nicoll 76d0a7f8ba Merge branch '2.4.x'
Closes gh-25506
2021-03-05 10:03:42 +01:00
dreis2211 89a44f3da4 Fix some assertions
See gh-25499
2021-03-05 09:56:55 +01:00
Madhura Bhave 37dcb90876 Merge branch '2.4.x'
Closes gh-25502
2021-03-04 14:48:11 -08:00
Madhura Bhave ae630e03ce Warn against using multi-document files with TestPropertySource
Closes gh-24945
2021-03-04 14:46:59 -08:00
Madhura Bhave e1904fb72f Merge branch '2.4.x'
Closes gh-25500
2021-03-04 13:04:18 -08:00
Madhura Bhave cfac223cff Document configtree support for Docker secrets
Closes gh-25095
2021-03-04 13:02:28 -08:00
Andy Wilkinson 961a34a5ee Merge branch '2.4.x'
Closes gh-25497
2021-03-04 19:15:03 +00:00
Andy Wilkinson 1ce6e796fe Polish "Allow the project to be built with Java 16"
See gh-25171
2021-03-04 18:54:58 +00:00
dreis2211 1ccd8dae8a Allow the project to be built with Java 16
See gh-25171
2021-03-04 18:54:56 +00:00
Madhura Bhave 9fd6a1e56a Merge branch '2.4.x'
Closes gh-25495
2021-03-04 09:46:26 -08:00
Madhura Bhave 181d0ee932 Merge default property sources
Fixes gh-25408
2021-03-04 09:46:00 -08:00
Andy Wilkinson 96ede9b975 Merge branch '2.4.x'
Closes gh-25491
2021-03-04 13:03:41 +00:00
Andy Wilkinson ca414733f3 Reinstate support for placeholders in @EntityScan
Fixes gh-25436
2021-03-04 12:21:27 +00:00
Stephane Nicoll e58353a32d Merge branch '2.4.x'
Closes gh-25484
2021-03-03 15:16:58 +01:00
Stephane Nicoll e5d8b6029b Merge branch '2.3.x' into 2.4.x
Closes gh-25483
2021-03-03 15:16:08 +01:00
Stephane Nicoll 8e67ae7113 Fix fallback fork value for spring-boot:stop
This commit harmonizes the fallback value that spring-boot:stop goal
should use if no information is available in the current context.

Closes gh-25472
2021-03-03 15:15:04 +01:00
Scott Frederick 434db48969 Merge branch '2.4.x'
Closes gh-25469
2021-03-01 16:01:12 -06:00
Scott Frederick afb60d6161 Add tests for Gradle examples used in plugin docs
Fixes gh-25468
2021-03-01 15:22:15 -06:00
Stephane Nicoll 9db78022bd Merge branch '2.4.x'
Closes gh-25464
2021-03-01 10:45:16 +01:00
Stephane Nicoll 63cca9b8c6 Polish "Document precedence between properties and yaml"
See gh-25300
2021-03-01 10:44:43 +01:00
Robert Smith 20ed8c2ec3 Document precedence between properties and yaml
See gh-25300
2021-03-01 10:39:34 +01:00
Stephane Nicoll a80f1af811 Merge branch '2.4.x'
Closes gh-25463
2021-03-01 10:18:42 +01:00
Stephane Nicoll ed1c68f567 Update copyright year of changed file
See gh-25454
2021-03-01 10:06:23 +01:00
jnizet cbab2396e2 Fix property name in gradle plugin documentation
See gh-25454
2021-03-01 10:01:52 +01:00
Stephane Nicoll 782f838074 Polish 2021-03-01 10:00:45 +01:00
Stephane Nicoll 288bece4e9 Polish contribution
See gh-25456
2021-03-01 09:44:20 +01:00
bono007 32caf760b5 Add configuration properties for Flyway's Vault and Conjur support
See gh-25456
2021-03-01 09:23:40 +01:00
Stephane Nicoll 14c4221fde Upgrade to Jetty 9.4.38.v20210224
Closes gh-25462
2021-03-01 09:22:54 +01:00
Stephane Nicoll aa032e093b Upgrade to Jetty 9.4.38.v20210224
Closes gh-25461
2021-03-01 09:22:06 +01:00
Stephane Nicoll dd2dc22085 Upgrade to Jetty 9.4.38.v20210224
Closes gh-25460
2021-03-01 09:20:33 +01:00
Stephane Nicoll e1b1580732 Polish "Allow to configure PersistenceUnitPostProcessor"
This commit updates EntityManagerFactoryBuilder so that persistence unit
post processors can be registered and applied when creating an
EntityManagerFactory.

See gh-25443
2021-02-27 11:33:52 +01:00
johnniang c3c83c8a6c Allow to configure PersistenceUnitPostProcessor
This commit updates EntityManagerFactoryBuilder so that persistence unit
post processors can be registered and applied when creating an
EntityManagerFactory.

See gh-25443
2021-02-27 11:33:39 +01:00
Stephane Nicoll 36f8a7b9a6 Upgrade copyright year of changed files
See gh-25451
2021-02-27 11:23:07 +01:00
izeye c823f44e76 Polish
See gh-25451
2021-02-27 11:22:05 +01:00
Andy Wilkinson 54ba9e6ddf Merge branch '2.4.x'
Closes gh-25450
2021-02-26 14:30:47 +00:00
Andy Wilkinson cb600f1c0b Merge branch '2.3.x' into 2.4.x
Closes gh-25449
2021-02-26 14:26:57 +00:00
Andy Wilkinson 8f72ca6521 Use ResourceConfig customization to register endpoints with Jersey
Previously, actuator endpoints were registered with Jersey upon
injection of the ResourceConfig bean into a registrar class rather than
using a ResourceConfigCustomizer. This was done to fix a problem
when running the Actuator on a separate port where the main application
context's customizers were also applied to the management context,
breaking the singleton contract for those resources. This approach
meant that the registration could be performed at any point after the
ResourceConfig had been created. When Jersey's configured as a Filter
this resulted in the registration failing as the attempt was being made
after the Filter lifecyle callbacks which make the ResourceConfig
immutable.

This commit reworks the endpoint registration to be performed using a
ManagementContextResourceConfigCustomizer, a resource config customizer
that's only applied to the ResourceConfig that's used by the Actuator.
When there's a separate management context, this ResourceConfig is
created by the Actuator's auto-configuration and the management context
resource config customizers are applied to it during its creation. The
main application's customizers are not applied. When the actuator is
using the same context as the main application, this ResourceConfig is
created by the main application. In this case a
ResourceConfigCustomizer is defined that delegates to all
ManagementContextResourceConfigCustomizers, allowing them to register
the actuator endpoints with the main ResourceConfig.

Fixes gh-25262
2021-02-26 14:25:24 +00:00
Andy Wilkinson 9713bfc765 Enable the logging shutdown hook by default
This commit updates LoggingApplicationListener to register the logging
shutdown hook by default.

The hook is detrimental in a war deployment as it may pin parts of an
application in memory after it has been undeployed. For this reason,
the hook is still disabled by default in war deployments. This is
achieved by setting an attribute on the servlet context in
SpringBootServletInitializer that is then consumed via the Environment
by LoggingApplicationListener.

Closes gh-25046
2021-02-26 14:00:08 +00:00
dreis2211 4b694560eb Ignore empty prefixes in new PrefixedConfigurationPropertySource
See gh-25445
2021-02-26 10:18:03 +00:00
Madhura Bhave a8592f36d4 Add prefix support for property source
We configure the `SystemEnvironmentPropertySource` as a `Prefixed` property
source. When adapting this to a `ConfigurationPropertySource, a
`PrefixedConfigurationPropertySource` will be created for it.
A `PrefixedConfigurationPropertySource` will resolve property
such as `foo.bar` to `my.foo.bar` for a prefix of `my`.

Closes gh-3450
2021-02-25 12:53:34 -08:00
Andy Wilkinson b36caec413 Merge branch '2.4.x'
Closes gh-25438
2021-02-25 17:33:00 +00:00
Andy Wilkinson d48551ff12 Merge branch '2.3.x' into 2.4.x
Closes gh-25437
2021-02-25 17:32:40 +00:00
Stefan Wolf 86ca32e694 Enable stricter validation for Gradle plugin
See gh-25409
2021-02-25 17:28:51 +00:00
Stephane Nicoll 9e3cfc5d7a Merge branch '2.4.x'
Closes gh-25432
2021-02-25 15:58:51 +01:00
John Blum cec4d45cf6 Fix grammatical error in documentation
See gh-25411
2021-02-25 15:57:56 +01:00
Andy Wilkinson 84984fb148 Merge branch '2.4.x'
Closes gh-25431
2021-02-25 14:28:41 +00:00
Andy Wilkinson ecf8437d4a Merge branch '2.3.x' into 2.4.x
Closes gh-25430
2021-02-25 14:28:28 +00:00
dreis2211 101d88a840 Update Testcontainers image versions
See gh-25412
2021-02-25 14:27:41 +00:00
Andy Wilkinson 10109e75b3 Upgrade to Testcontainers 1.15.2
Closes gh-25429
2021-02-25 13:53:29 +00:00
Andy Wilkinson d822604ed2 Upgrade to MockK 1.10.6
Closes gh-25428
2021-02-25 13:53:27 +00:00
Andy Wilkinson f411bcd1a5 Upgrade to Maven Resolver 1.6.1
Closes gh-25427
2021-02-25 13:53:26 +00:00
Andy Wilkinson f876f413c9 Upgrade to Maven Invoker 3.1.0
Closes gh-25426
2021-02-25 13:53:25 +00:00
Andy Wilkinson bc9637c8b3 Upgrade to Maven Common Artifact Filters 3.2.0
Closes gh-25425
2021-02-25 13:53:24 +00:00
Andy Wilkinson e99184bb7f Upgrade to JNA 5.7.0
Closes gh-25424
2021-02-25 13:53:22 +00:00
Andy Wilkinson b477312100 Upgrade to Testcontainers 1.15.2
Closes gh-25423
2021-02-25 13:51:44 +00:00
Andy Wilkinson 9af8ad432a Upgrade to MockK 1.10.6
Closes gh-25422
2021-02-25 13:51:43 +00:00
Andy Wilkinson 070d3d434c Upgrade to Maven Common Artifact Filters 3.1.1
Closes gh-25421
2021-02-25 13:51:41 +00:00
Andy Wilkinson 5f0d72487e Upgrade to Testcontainers 1.15.2
Closes gh-25420
2021-02-25 13:50:16 +00:00
Andy Wilkinson ac78f55ba8 Upgrade to Maven Common Artifact Filters 3.1.1
Closes gh-25419
2021-02-25 13:48:53 +00:00
Scott Frederick 4be04b0ea2 Support image building with Maven and war packaging
This commit updates the Maven image building goal to support building
images from executable and non-executable war files.

Fixes gh-23823
2021-02-24 15:23:33 -06:00
Scott Frederick a80c4ad38d Support image building with Gradle and war packaging
This commit updates the Gradle image building task to support building
images from executable and non-executable war files.

Fixes gh-23825
2021-02-24 14:42:46 -06:00
Andy Wilkinson f09630f73c Allow additional keys to be configured for value sanitization
Closes gh-25384
2021-02-24 19:28:29 +00:00
Andy Wilkinson 10ef991e1d Sanitize sensitive portion of the value of url and urls keys
Closes gh-25387
2021-02-24 14:42:25 +00:00
Andy Wilkinson 9836b060d4 Test the Gradle plugin against 7.0-milestone-2
Closes gh-25404
2021-02-24 11:28:45 +00:00
Andy Wilkinson 2a2daae14e Allow user's WebFluxConfigurers to be ordered after auto-config's
Previously, WebFluxAutoConfiguration's WebFluxConfigurer was unordered.
This mean that it had lowest precedence so it was not possible for a
user to provide their own configurer that was guaranteed to run after
the auto-configuration's configurer.

This commit updates the auto-configuration to order its configurer at
0. Any unordered user-defined configurer will now run after the
auto-configuration's configurer.

Closes gh-25302
2021-02-24 11:11:46 +00:00
Scott Frederick 76e42ff96f Correct grouping of custom buildpacks
This commit corrects the order.toml file that is generated and added
to the builder when building an image using custom buildpacks with the
Maven or Gradle plugin in order to support buildpacks that depend on
detection as a group.

Fixes gh-25378
2021-02-23 13:56:57 -06:00
Stephane Nicoll 9c24ca06ae Polish 2021-02-23 12:46:04 +01:00
Stephane Nicoll d9dcfeba5c Polish "Add more customization options for InfluxDB"
See gh-25319
2021-02-23 11:35:15 +01:00
Eddú Meléndez 8be0b87273 Add more customization options for InfluxDB
This commit augments the configuration properties that are exposed for
InfluxDB, alongside an `InfluxDbCustomizer` that gives more control.

See gh-25319
2021-02-23 11:35:06 +01:00
Scott Frederick 89555a8745 Add bindings option for image building
This commit adds configuration to the Maven and Gradle plugins to
allow a list of volume mount bindings to be provided to the image
building goal and task. This enables service bindings to be mounted
in the builder image that are recognized by buildpacks to support
custom certificates, build tool configuration, APM integration, and
other buildpack features.

Fixes gh-23518
2021-02-22 16:51:24 -06:00
Stephane Nicoll 817a4c5397 Merge branch '2.4.x'
Closes gh-25386
2021-02-22 10:46:13 +01:00
Stephane Nicoll 7c5a5c6663 Merge branch '2.3.x' into 2.4.x
Closes gh-25385
2021-02-22 10:45:55 +01:00
Stephane Nicoll 77daae1480 Update copyright year of changed file
See gh-25382
2021-02-22 10:41:49 +01:00
Mustafa Ulu abc90db32f Fix wording error in build-info goal description
See gh-25382
2021-02-22 10:26:53 +01:00
Andy Wilkinson a14bf7a3b8 Deprecate support for Gradle's maven plugin
Closes gh-25267
2021-02-19 19:29:17 +00:00
Stephane Nicoll 808e58265f Merge branch '2.4.x'
Closes gh-25372
2021-02-19 12:50:08 +01:00
Stephane Nicoll 9e6302ee6a Merge branch '2.3.x' into 2.4.x
Closes gh-25371
2021-02-19 12:49:40 +01:00
Tommy Ludwig bd2a890899 Polish HTTP client metrics documentation wording
See gh-25353
2021-02-19 12:48:56 +01:00
Phillip Webb a1dc107144 Update copyright year of changed files 2021-02-18 16:23:56 -08:00
Phillip Webb 4ad149e1e7 Protect against bad paths and URLs
See gh-21722
2021-02-18 16:23:56 -08:00
Scott Frederick 88e9f1d28c Fix Maven buildpacks example in docs
See gh-21722
2021-02-18 18:22:36 -06:00
Scott Frederick e3e229cc3d Remove unused import
See gh-21722
2021-02-18 17:39:59 -06:00
Scott Frederick f54f784f80 Add buildpack option for image building
This commit adds configuration to the Maven and Gradle plugins to
allow a list of buildpacks to be provided to the image building
goal and task.

Fixes gh-21722
2021-02-18 17:28:25 -06:00
Stephane Nicoll 548ca63076 Merge branch '2.4.x'
Closes gh-25364
2021-02-18 14:08:23 +01:00
Stephane Nicoll 526474f3b8 Add username alias for Postgres's PGSimpleDataSource
Closes gh-25363
2021-02-18 14:07:05 +01:00
Andy Wilkinson 8ec14e2855 Upgrade to Spring Kafka 2.7.0-M2
Closes gh-25295
2021-02-18 12:15:26 +00:00
Andy Wilkinson 05f1231a87 Upgrade to Spring Integration 5.5.0-M2
Closes gh-25294
2021-02-18 12:14:52 +00:00
Andy Wilkinson 87d60938e2 Upgrade to Spring AMQP 2.3.5
Closes gh-25362
2021-02-18 12:13:42 +00:00
Andy Wilkinson 0f323c125b Upgrade to MongoDB 4.2.0-beta1
Closes gh-25361
2021-02-18 12:13:40 +00:00
Andy Wilkinson 5714f97b0f Upgrade to Lettuce 6.1.0.M1
Closes gh-25360
2021-02-18 12:13:39 +00:00
Andy Wilkinson 0041446803 Upgrade to Elasticsearch 7.11.1
Closes gh-25359
2021-02-18 12:13:38 +00:00
Andy Wilkinson c6dece067c Upgrade to Spring Data 2021.0.0-M4
Closes gh-25004
2021-02-18 12:09:47 +00:00
Andy Wilkinson bb56de715b Upgrade to Spring Security 5.4.5
This commit also downgrade JOSE JWT to address an incompatibility with
the OIDC SDK 8.x. The OIDC SDK has also been upgraded to the latest 8.x
release to align with the version used by Spring Security.

Closes gh-25221
Fixes gh-25070
2021-02-18 11:33:18 +00:00
Andy Wilkinson 08f73e01da Upgrade to Spring Kafka 2.6.6
Closes gh-25292
2021-02-18 11:31:18 +00:00
Andy Wilkinson 50a258a9ec Upgrade to Spring Integration 5.4.4
Closes gh-25289
2021-02-18 11:30:43 +00:00
Andy Wilkinson 332ab5e1c6 Upgrade to Spring AMQP 2.3.5
Closes gh-25290
2021-02-18 11:30:04 +00:00
Andy Wilkinson a2695f215c Upgrade to Spring Data 2020.0.5
Closes gh-25002
2021-02-18 11:29:22 +00:00
Andy Wilkinson 06e36b6bbe Revert "Update code for Spring Data 2021.0.0-M3"
This reverts commit 4b0ef67e8e.

See gh-25004
2021-02-18 09:23:14 +00:00
Andy Wilkinson 6eb51eb2c3 Start building against Spring Data 2020.0.5 snapshots
See gh-25002
2021-02-18 08:32:04 +00:00
Stephane Nicoll 064f6eea33 Merge branch '2.4.x'
Closes gh-25354
2021-02-18 09:28:23 +01:00
Sébastien Deleuze 512efa1687 Refactor CacheConfigurations to avoid storing configuration classes
This commit refactors CacheConfigurations implementation to make
it more native friendly by storing strings instead of classes in
order to avoid loading the configuration classes
when CacheConfigurations is initialized at build time.

See gh-25321
2021-02-18 09:24:54 +01:00
Madhura Bhave 29ab9fd596 Merge branch '2.4.x'
Closes gh-25351
2021-02-17 15:28:34 -08:00
Madhura Bhave b5e1787641 Make devtools securityFilterChain back-off in presence of WebSecurityConfigurerAdapter
Fixes gh-25147
2021-02-17 15:26:11 -08:00
Andy Wilkinson 3ad68a39b6 Upgrade to Spring Integration 5.3.6.RELEASE
Closes gh-25283
2021-02-17 22:28:20 +00:00
Madhura Bhave 6fa7c6ac21 Merge branch '2.4.x'
Closes gh-25348
2021-02-17 12:45:59 -08:00
Madhura Bhave 00a358b4d3 Throw or warn for invalid config properties with list syntax
Fixes gh-25309
2021-02-17 12:45:37 -08:00
Andy Wilkinson bec065dfd3 Upgrade to Spring AMQP 2.2.15.RELEASE
Closes gh-25284
2021-02-17 18:12:59 +00:00
Andy Wilkinson df5f59127a Support Jetty 10
Closes gh-24886
2021-02-17 17:49:59 +00:00
Andy Wilkinson a95e93a8a9 Merge branch '2.4.x'
Closes gh-25347
2021-02-17 17:49:21 +00:00
Andy Wilkinson 08e86741fd Don't scan for `@Persistent` types as they may not be meant for Neo4j
Closes gh-25069
2021-02-17 17:49:12 +00:00
Madhura Bhave d69565cf3e Merge branch '2.4.x'
Closes gh-25346
2021-02-17 09:45:26 -08:00
Madhura Bhave 52a15647a9 Polish "Remove old documentation relating to yaml and profiles"
See gh-24620
2021-02-17 09:43:44 -08:00
Ramiro Aparicio 93f822e7b6 Remove old documentation relating to yaml and profiles
See gh-24620
2021-02-17 09:43:29 -08:00
Stephane Nicoll 15375fdf68 Merge branch '2.4.x'
Closes gh-25342
2021-02-17 17:42:56 +01:00
Stephane Nicoll 5d1bb3025b Add username alias for H2's JdbcDataSource
Closes gh-25263
2021-02-17 17:40:34 +01:00
Andy Wilkinson 87efacf039 Upgrade to Spring HATEOAS 1.2.4
Closes gh-25341
2021-02-17 16:24:39 +00:00
Andy Wilkinson cc35ffbfd9 Upgrade to RxJava2 2.2.21
Closes gh-25340
2021-02-17 16:24:38 +00:00
Andy Wilkinson 299134fb14 Upgrade to JUnit 4.13.2
Closes gh-25339
2021-02-17 16:24:36 +00:00
Andy Wilkinson edc7253635 Upgrade to FreeMarker 2.3.31
Closes gh-25338
2021-02-17 16:24:35 +00:00
Andy Wilkinson 29d46c86c9 Upgrade to Spring Data Neumann-SR7
Closes gh-25282
2021-02-17 15:04:50 +00:00
Andy Wilkinson 0348b57b16 Upgrade to Spring HATEOAS 1.1.4.RELEASE
Closes gh-25337
2021-02-17 15:04:22 +00:00
Andy Wilkinson 6ce61c504d Upgrade to RxJava2 2.2.21
Closes gh-25336
2021-02-17 15:04:20 +00:00
Andy Wilkinson 92c82a4f54 Upgrade to JUnit 4.13.2
Closes gh-25335
2021-02-17 15:04:19 +00:00
Andy Wilkinson 74b33cce5e Upgrade to FreeMarker 2.3.31
Closes gh-25334
2021-02-17 15:04:18 +00:00
Andy Wilkinson d0280f1d81 Upgrade to RxJava2 2.2.21
Closes gh-25332
2021-02-17 13:57:40 +00:00
Andy Wilkinson 9cabedfa11 Upgrade to Micrometer 1.6.4
Closes gh-25331
2021-02-17 13:57:40 +00:00
Andy Wilkinson 36a898a411 Upgrade to Liquibase 4.3.1
Closes gh-25330
2021-02-17 13:57:40 +00:00
Andy Wilkinson 48f8ec1f03 Upgrade to JUnit 4.13.2
Closes gh-25329
2021-02-17 13:57:40 +00:00
Andy Wilkinson 8155e09b8f Upgrade to Infinispan 12.0.1.Final
Closes gh-25328
2021-02-17 13:57:40 +00:00
Andy Wilkinson 9f8b539783 Upgrade to HikariCP 4.0.2
Closes gh-25327
2021-02-17 13:57:39 +00:00
Andy Wilkinson 20689e40fe Upgrade to FreeMarker 2.3.31
Closes gh-25326
2021-02-17 13:57:39 +00:00
Andy Wilkinson ccc7e74ee4 Upgrade to Caffeine 2.9.0
Closes gh-25325
2021-02-17 13:57:39 +00:00
Andy Wilkinson 5d52411291 Upgrade to Artemis 2.17.0
Closes gh-25324
2021-02-17 13:57:39 +00:00
Andy Wilkinson a91f32d14e Temporarily work around breaking API change in Spring Data Couchbase
See gh-25002
2021-02-17 13:47:50 +00:00
Andy Wilkinson d922d0f859 Upgrade to Micrometer 1.6.4
Closes gh-25291
2021-02-17 12:47:15 +00:00
Andy Wilkinson 43c923b3d5 Upgrade to Micrometer 1.5.11
Closes gh-25285
2021-02-17 12:25:56 +00:00
Andy Wilkinson 2f83a6714b Rework DataSource initialization
Previously, DataSource initialization was triggered via a
BeanPostProcessor or a schema created event from JPA. This caused
numerous problems with circular dependencies, bean lifecycle, etc and
added significant complexity.

This commit reworks DataSource initialization to remove the use of a
BeanPostProcessor entirely. In its place, DataSource initialization is
now driven by an InitializingBean with dependency relationships
between beans ensuring that initialization has been performed before
the DataSource is used. This aligns with the approach that's worked
well with Flyway and Liquibase.

More changes are planned to further simplify DataSource initialization.
The changes in this commit are a foundation for those changes. Any new
public API in this commit is highly likely to change before the next
GA.

Fixes gh-13042
Fixes gh-23736
2021-02-17 12:10:22 +00:00
Stephane Nicoll 9bc4f8ede1 Polish "Group jdbc-related batch properties beneath spring.batch.jdbc"
See gh-25316
2021-02-17 11:29:35 +01:00
Mukul Chaundhyan d093807f95 Group jdbc-related batch properties beneath spring.batch.jdbc
See gh-25316
2021-02-17 10:22:21 +01:00
Andy Wilkinson 9a3889baec Align with breaking change in Spring Data MongoDB
See gh-25004
2021-02-16 15:14:54 +00:00
Stephane Nicoll 2f17bd6543 Upgrade to Spring Framework 5.3.4
Closes gh-25293
2021-02-16 15:17:18 +01:00
Stephane Nicoll 44d765bd00 Upgrade to Spring Framework 5.3.4
Closes gh-24998
2021-02-16 15:16:00 +01:00
Stephane Nicoll 32f6719ec1 Upgrade to Spring Framework 5.2.13
Closes gh-25281
2021-02-16 15:15:13 +01:00
Stephane Nicoll 696179762d Align default values for Cassandra's throttling properties
Closes gh-25149
2021-02-16 15:08:32 +01:00
izeye 9f0f7d59ef Fix Javadoc since tag for ConfigurationPropertiesReportEndpointWebExtension
See gh-25314
2021-02-16 14:32:47 +01:00
Andy Wilkinson ed03ac19bc Polish 2021-02-16 13:09:35 +00:00
Stephane Nicoll c2b85c1a0e Merge branch '2.4.x'
Closes gh-25313
2021-02-16 13:51:12 +01:00
Stephane Nicoll f6b5964258 Merge branch '2.3.x' into 2.4.x
Closes gh-25312
2021-02-16 13:50:55 +01:00
Stephane Nicoll 0da7822e27 Update copyright of changed files
See gh-25265
2021-02-16 13:50:15 +01:00
melburne 2163c96205 Fix incorrect detection of Amazon Redshift
See gh-25265
2021-02-16 13:50:15 +01:00
Andy Wilkinson accd3c0946 Merge branch '2.4.x'
Closes gh-25311
2021-02-16 12:44:47 +00:00
Andy Wilkinson 0dbf907f73 Merge branch '2.3.x' into 2.4.x
Closes gh-25310
2021-02-16 12:43:20 +00:00
Andy Wilkinson 78941c32c4 Polish "Ensure that Flyway/Liquibase run before jOOQ's DSLContext is used"
See gh-25279
2021-02-16 12:08:08 +00:00
Eddú Meléndez c55200d19a Ensure that Flyway/Liquibase run before jOOQ's DSLContext is used
See gh-25279
2021-02-16 12:06:09 +00:00
Andy Wilkinson 5618646fc7 Merge branch '2.4.x'
Closes gh-25308
2021-02-16 11:30:25 +00:00
Andy Wilkinson b86351d0cf Merge branch '2.3.x' into 2.4.x
Closes gh-25307
2021-02-16 11:30:03 +00:00
Andy Wilkinson a2adb877ee Polish "Encourage use of maven-publish plugin in Gradle docs"
See gh-25299
2021-02-16 11:22:47 +00:00
Robert Smith c0a5245a3e Encourage use of maven-publish plugin in Gradle docs
See gh-25299
2021-02-16 11:19:27 +00:00
Andy Wilkinson 29af4b953f Add dependency management for new hibernate-micrometer module
Fixes gh-25277
2021-02-16 11:09:02 +00:00
Andy Wilkinson d13df2e103 Merge branch '2.4.x'
Closes gh-25306
2021-02-16 10:37:16 +00:00
Andy Wilkinson c3cdfec9cb Merge branch '2.3.x' into 2.4.x
Closes gh-25305
2021-02-16 10:37:05 +00:00
Andy Wilkinson f907dc2f58 Add dependency management for new hibernate-micrometer module
Fixes gh-25277
2021-02-16 10:36:30 +00:00
Andy Wilkinson 9628df87ff Merge branch '2.4.x'
Closes gh-25304
2021-02-16 10:34:54 +00:00
Andy Wilkinson 55e3ca66e2 Replace native image system property with call to NativeDetector
Closes gh-25303
2021-02-16 10:34:34 +00:00
Stephane Nicoll 488c313586 Upgrade to Reactor 2020.0.4
Closes gh-25301
2021-02-16 08:51:42 +01:00
Stephane Nicoll dcbc3a29aa Upgrade to Reactor 2020.0.4
Closes gh-25286
2021-02-16 08:49:23 +01:00
Stephane Nicoll 98964990d4 Upgrade to Reactor Dysprosium-SR17
Closes gh-25280
2021-02-16 08:47:30 +01:00
Stephane Nicoll 9b7581a8ef Polish "Fix database name detection logic for MariaDB"
See gh-25173
2021-02-15 14:24:08 +01:00
anudeepg 053323f58b Fix database name detection logic for MariaDB
See gh-25173
2021-02-15 14:23:26 +01:00
Stephane Nicoll b50fb824a3 Merge branch '2.4.x'
Closes gh-25298
2021-02-15 14:16:01 +01:00
Stephane Nicoll a9ff33f74f Merge branch '2.3.x' into 2.4.x
Closes gh-25297
2021-02-15 14:15:42 +01:00
Stephane Nicoll 569002e917 Polish "Document Kafka Streams metrics support"
See gh-25272
2021-02-15 14:11:34 +01:00
izeye dff4ca2293 Document Kafka Streams metrics support
See gh-25272
2021-02-15 14:07:39 +01:00
Stephane Nicoll 8c0c30e7a8 Polish "Add support to auto-configure javax.jms.ExceptionListener"
See gh-25278
2021-02-15 13:58:25 +01:00
Eddú Meléndez 1f00c27c7e Add support to auto-configure javax.jms.ExceptionListener
See gh-25278
2021-02-15 13:56:25 +01:00
Stephane Nicoll 3f9f9a4637 Polish "Start building against Spring Data Neumann-SR7 snapshots"
See gh-25282
2021-02-15 13:46:39 +01:00
Stephane Nicoll a16a2de3c3 Merge branch '2.4.x'
Closes gh-25296
2021-02-15 10:13:16 +01:00
Stephane Nicoll 0bc03c7141 Associate application classloader to auto-configured Hazelcast instance
Closes gh-24836
2021-02-15 10:08:23 +01:00
Stephane Nicoll 349d755632 Start building against Spring Kafka 2.7.0-M2 snapshots
See gh-25295
2021-02-15 08:14:35 +01:00
Stephane Nicoll 56a2634990 Start building against Spring Integration 5.5.0-M2 snapshots
See gh-25294
2021-02-15 07:53:12 +01:00
Stephane Nicoll 5576f26115 Start building against Spring Kafka 2.6.6 snapshots
See gh-25292
2021-02-15 07:24:17 +01:00
Stephane Nicoll 67e1b64a23 Start building against Micrometer 1.6.4 snapshots
See gh-25291
2021-02-15 07:23:45 +01:00
Stephane Nicoll f8caab121d Start building against Spring AMQP 2.3.5 snapshots
See gh-25290
2021-02-15 07:23:22 +01:00
Stephane Nicoll 8a4f49c30b Start building against Spring Integration 5.4.4 snapshots
See gh-25289
2021-02-15 07:22:43 +01:00
Stephane Nicoll 31a98f90c8 Start building against Reactor 2020.0.4 snapshots
See gh-25286
2021-02-15 07:19:53 +01:00
Stephane Nicoll bab0862fdd Start building against Micrometer 1.5.11 snapshots
See gh-25285
2021-02-15 06:55:42 +01:00
Stephane Nicoll 080bec0b20 Start building against Spring AMQP 2.2.15 snapshots
See gh-25284
2021-02-15 06:55:42 +01:00
Stephane Nicoll 1004617d2f Start building against Spring Integration 5.3.6 snapshots
See gh-25283
2021-02-15 06:55:42 +01:00
Stephane Nicoll f1dda97900 Start building against Spring Data Neumann-SR7 snapshots
See gh-25282
2021-02-15 06:55:40 +01:00
Stephane Nicoll 33736e818b Start building against Spring Framework 5.2.13 snapshots
See gh-25281
2021-02-15 06:52:34 +01:00
Stephane Nicoll 2c2fedc156 Start building against Reactor Dysprosium-SR17 snapshots
See gh-25280
2021-02-15 06:52:00 +01:00
Stephane Nicoll ca9b583c7d Merge branch '2.4.x'
Closes gh-25271
2021-02-14 09:37:49 +01:00
Stephane Nicoll 61e9d04c68 Update copyright of changes files
See gh-25266
2021-02-14 09:35:36 +01:00
izeye f48893def5 Polish 2021-02-14 09:34:30 +01:00
Stephane Nicoll 3471adcf09 Merge branch '2.3.x' into 2.4.x 2021-02-14 09:32:21 +01:00
Stephane Nicoll b7f5f5cac0 Polish
See gh-25266
2021-02-14 09:29:48 +01:00
Andy Wilkinson 0a4c26532d Merge branch '2.4.x'
Closes gh-25259
2021-02-12 14:57:18 +00:00
Andy Wilkinson 392be57003 Apply Logback system properties and not just common properties to context
Closes gh-24894
2021-02-12 14:34:31 +00:00
Andy Wilkinson cc4bace12b Upgrade to Undertow 2.2.4.Final
Closes gh-25254
2021-02-12 13:39:14 +00:00
Andy Wilkinson 118b55579a Upgrade to Tomcat 9.0.43
Closes gh-25253
2021-02-12 13:39:14 +00:00
Andy Wilkinson 627d0b713f Upgrade to Solr 8.8.0
Closes gh-25252
2021-02-12 13:39:13 +00:00
Andy Wilkinson 078a7fdd15 Upgrade to Selenium HtmlUnit 2.47.1
Closes gh-25251
2021-02-12 13:37:50 +00:00
Andy Wilkinson 387fe4b5bb Upgrade to Prometheus PushGateway 0.10.0
Closes gh-25250
2021-02-12 13:37:49 +00:00
Andy Wilkinson 3c0972e7f9 Upgrade to Spring Security 5.5.0-M2
Closes gh-25255
2021-02-12 13:37:49 +00:00
Andy Wilkinson dadd6241ac Upgrade to Nimbus JOSE JWT 9.5
Closes gh-25249
2021-02-12 13:37:49 +00:00
Andy Wilkinson e8e8a4c16b Upgrade to OAuth2 OIDC SDK 9.1
Closes gh-25248
2021-02-12 12:13:16 +00:00
Andy Wilkinson 7e228556c7 Upgrade to Netty 4.1.59.Final
Closes gh-25247
2021-02-12 12:10:35 +00:00
Andy Wilkinson a70386b4e3 Upgrade to MSSQL JDBC 9.2.0.jre8
Closes gh-25246
2021-02-12 12:10:35 +00:00
Andy Wilkinson f91c6075c8 Upgrade to MariaDB 2.7.2
Closes gh-25245
2021-02-12 12:10:35 +00:00
Andy Wilkinson 80b0c384d6 Upgrade to Lombok 1.18.18
Closes gh-25244
2021-02-12 12:10:34 +00:00
Andy Wilkinson 07f74593a5 Upgrade to Liquibase 4.3.0
Closes gh-25243
2021-02-12 12:10:34 +00:00
Andy Wilkinson 723bdc77a5 Upgrade to JUnit Jupiter 5.7.1
Closes gh-25241
2021-02-12 12:02:23 +00:00
Andy Wilkinson 3e8773cda2 Upgrade to jOOQ 3.14.7
Closes gh-25240
2021-02-12 12:02:22 +00:00
Andy Wilkinson 454c4fcd0d Upgrade to Johnzon 1.2.10
Closes gh-25239
2021-02-12 12:02:21 +00:00
Andy Wilkinson 1bd78eb940 Upgrade to Jedis 3.5.1
Closes gh-25238
2021-02-12 12:02:19 +00:00
Andy Wilkinson 1f1f510cec Upgrade to Janino 3.1.3
Closes gh-25237
2021-02-12 12:02:18 +00:00
Andy Wilkinson 6fbb67e751 Upgrade to Infinispan 12.0.0.Final
Closes gh-25236
2021-02-12 12:02:17 +00:00
Andy Wilkinson 22568d42de Upgrade to HtmlUnit 2.47.1
Closes gh-25235
2021-02-12 12:02:15 +00:00
Andy Wilkinson 16ed1a9668 Upgrade to HikariCP 4.0.1
Closes gh-25234
2021-02-12 12:02:14 +00:00
Andy Wilkinson a1ff05ec12 Upgrade to Hibernate 5.4.28.Final
Closes gh-25233
2021-02-12 12:02:13 +00:00
Andy Wilkinson 5dba00fcac Upgrade to Flyway 7.5.3
Closes gh-25232
2021-02-12 12:02:12 +00:00
Andy Wilkinson 0cf846b484 Upgrade to Couchbase Client 3.1.2
Closes gh-25231
2021-02-12 12:02:11 +00:00
Andy Wilkinson bfbdc3bfaf Upgrade to Byte Buddy 1.10.20
Closes gh-25230
2021-02-12 12:02:09 +00:00
Andy Wilkinson 3200d52b15 Upgrade to AssertJ 3.19.0
Closes gh-25229
2021-02-12 12:02:08 +00:00
Andy Wilkinson 6e77c27da5 Upgrade to AppEngine SDK 1.9.86
Closes gh-25228
2021-02-12 12:02:07 +00:00
Andy Wilkinson 5a21395b0b Upgrade to Undertow 2.2.4.Final
Closes gh-25224
2021-02-12 11:27:00 +00:00
Andy Wilkinson 28fc2b1d52 Upgrade to Tomcat 9.0.43
Closes gh-25223
2021-02-12 11:26:59 +00:00
Andy Wilkinson 58c823ef22 Upgrade to Spring Session Bom 2020.0.3
Closes gh-25222
2021-02-12 11:26:59 +00:00
Andy Wilkinson 51ca7d67ba Upgrade to Netty 4.1.59.Final
Closes gh-25220
2021-02-12 10:07:00 +00:00
Andy Wilkinson ca24fd1437 Upgrade to MySQL 8.0.23
Closes gh-25219
2021-02-12 10:06:59 +00:00
Andy Wilkinson 5dfe3ccc89 Upgrade to MariaDB 2.7.2
Closes gh-25218
2021-02-12 10:06:58 +00:00
Andy Wilkinson d7cc673ac0 Upgrade to Lombok 1.18.18
Closes gh-25217
2021-02-12 10:06:57 +00:00
Andy Wilkinson d50be39bee Upgrade to JUnit Jupiter 5.7.1
Closes gh-25215
2021-02-12 10:06:54 +00:00
Andy Wilkinson 636a99ecd3 Upgrade to jOOQ 3.14.7
Closes gh-25214
2021-02-12 10:06:53 +00:00
Andy Wilkinson d2630151ce Upgrade to Johnzon 1.2.10
Closes gh-25213
2021-02-12 10:06:51 +00:00
Andy Wilkinson 1c2265feac Upgrade to Jetty 9.4.36.v20210114
Closes gh-25212
2021-02-12 10:06:50 +00:00
Andy Wilkinson 1ceba0910b Upgrade to Jaybird 3.0.10
Closes gh-25211
2021-02-12 10:06:49 +00:00
Andy Wilkinson 7d5484e9d1 Upgrade to Janino 3.1.3
Closes gh-25210
2021-02-12 10:06:48 +00:00
Andy Wilkinson d5cb97984f Upgrade to Infinispan 11.0.9.Final
Closes gh-25209
2021-02-12 10:06:47 +00:00
Andy Wilkinson 8f1bda83be Upgrade to Hibernate 5.4.28.Final
Closes gh-25208
2021-02-12 10:06:46 +00:00
Andy Wilkinson bd24553f7e Upgrade to Byte Buddy 1.10.20
Closes gh-25207
2021-02-12 10:06:45 +00:00
Andy Wilkinson fc4c101503 Upgrade to AppEngine SDK 1.9.86
Closes gh-25206
2021-02-12 10:06:44 +00:00
Andy Wilkinson 1adc4118da Upgrade to ActiveMQ 5.16.1
Closes gh-25205
2021-02-12 10:06:42 +00:00
Andy Wilkinson 63de8dec1f Upgrade to Undertow 2.1.6.Final
Closes gh-25204
2021-02-12 09:28:27 +00:00
Andy Wilkinson b1dd3fb827 Upgrade to Tomcat 9.0.43
Closes gh-25203
2021-02-12 09:28:26 +00:00
Andy Wilkinson aaad1613dc Upgrade to Spring Session Bom Dragonfruit-SR2
Closes gh-25202
2021-02-12 09:28:25 +00:00
Andy Wilkinson 13cbc1a80b Upgrade to Spring Security 5.3.8.RELEASE
Closes gh-25201
2021-02-12 09:28:23 +00:00
Andy Wilkinson 8e86957efc Upgrade to Netty 4.1.59.Final
Closes gh-25200
2021-02-12 09:28:22 +00:00
Andy Wilkinson f728367785 Upgrade to Neo4j OGM 3.2.20
Closes gh-25199
2021-02-12 09:28:21 +00:00
Andy Wilkinson e3bed12a16 Upgrade to MySQL 8.0.23
Closes gh-25198
2021-02-12 09:28:20 +00:00
Andy Wilkinson aa5e33bc83 Upgrade to Lombok 1.18.18
Closes gh-25197
2021-02-12 09:28:19 +00:00
Andy Wilkinson 97d4837feb Upgrade to Johnzon 1.2.10
Closes gh-25196
2021-02-12 09:28:18 +00:00
Andy Wilkinson 87404581b9 Upgrade to Jetty 9.4.36.v20210114
Closes gh-25195
2021-02-12 09:28:17 +00:00
Andy Wilkinson 05d805ad60 Upgrade to Jaybird 3.0.10
Closes gh-25194
2021-02-12 09:28:15 +00:00
Andy Wilkinson 3ada6e9304 Upgrade to Janino 3.1.3
Closes gh-25193
2021-02-12 09:28:14 +00:00
Andy Wilkinson adc601b72c Upgrade to Hibernate 5.4.28.Final
Closes gh-25192
2021-02-12 09:28:13 +00:00
Andy Wilkinson 4b6418f11f Upgrade to Hazelcast 3.12.12
Closes gh-25191
2021-02-12 09:28:12 +00:00
Andy Wilkinson 88afda03a3 Upgrade to Byte Buddy 1.10.20
Closes gh-25190
2021-02-12 09:28:11 +00:00
Andy Wilkinson fa6c749215 Upgrade to AppEngine SDK 1.9.86
Closes gh-25189
2021-02-12 09:28:10 +00:00
Andy Wilkinson da3f0dc1c7 Merge branch '2.4.x'
Closes gh-25186
2021-02-11 20:12:43 +00:00
Andy Wilkinson 9ba28a8b99 Merge branch '2.3.x' into 2.4.x
Closes gh-25185
2021-02-11 20:12:30 +00:00
Andy Wilkinson bd64e05203 Instrument AMQP AbstractCF when defined as a ConnectionFactory
Fixes gh-25138
2021-02-11 20:09:40 +00:00
Stephane Nicoll 5017d59d56 Merge branch '2.4.x'
Closes gh-25184
2021-02-11 13:55:42 +01:00
Stephane Nicoll 75fc896321 Avoid Illegal reflective access warnings with devtools
This commit improves RestartClassLoader to use a method introduced in
SmartClassLoader to avoid triggering a warning on Java 11 and later.

See https://github.com/spring-projects/spring-framework/issues/26403

Closes gh-24857
2021-02-11 13:55:10 +01:00
Andy Wilkinson 55c47c8b5d Merge branch '2.4.x'
Closes gh-25183
2021-02-11 10:24:11 +00:00
Andy Wilkinson 698672e1cb Merge branch '2.3.x' into 2.4.x
Closes gh-25182
2021-02-11 10:23:20 +00:00
Andy Wilkinson 82dc2dffbd Select specific CLI distribution in CLI's integration tests
Previously, CommandLineInvoker would use the first -bin.zip file found
in build/distributions. If this directory contained multiple zips from
building different versions of Spring Boot, this could result in the
tests being run against the wrong version of the CLI.

This commit updates CommandLineInvoker look for a specific zip in
build/distributions, using the version from gradle.properties to
identify it.

Closes gh-25179
2021-02-11 10:20:30 +00:00
Andy Wilkinson 249b38e07d Merge branch '2.4.x'
Closes gh-25175
2021-02-10 19:42:20 +00:00
Andy Wilkinson 9da3b65ff3 Merge branch '2.3.x' into 2.4.x
Closes gh-25174
2021-02-10 19:41:56 +00:00
Stephane Nicoll b92bb9332b Polish "Filter properties with a particular prefix"
See gh-24718
2021-02-10 17:32:18 +01:00
Andy Wilkinson 708cbd7294 Ignore events from other contexts when waiting for DS init to complete
Fixes gh-24966
2021-02-10 15:07:44 +00:00
bono007 ad7c69a9cd Filter properties with a particular prefix
This commit improves the configprops endpoint to allow filtering
properties based on a particular prefix

See gh-24718
2021-02-10 15:30:02 +01:00
Stephane Nicoll 0f9fb13141 Fix formatting 2021-02-10 15:25:41 +01:00
Stephane Nicoll a2118e985a Merge branch '2.4.x'
Closes gh-25170
2021-02-10 15:17:26 +01:00
Stephane Nicoll 46bc551c2b Merge branch '2.3.x' into 2.4.x
Closes gh-25169
2021-02-10 15:14:21 +01:00
Stephane Nicoll 1524793a92 Fix use of deprecated Cassandra properties in integration tests
Closes gh-25148
2021-02-10 15:12:20 +01:00
Andy Wilkinson 514aede91e Merge branch '2.4.x'
Closes gh-25168
2021-02-10 12:20:02 +00:00
Andy Wilkinson 45e6c12cb6 Consider transitives when identifying project dependencies
Previously, when building a layered jar, the Gradle plugin only
considered a configuration's direct dependencies when identifying
project dependencies. This resulted in transitive project dependencies
being missed when deciding which dependencies belong in the
application layer.

This commit updates ResolvedDependencies to consider all projects
from the root project when collecting the IDs of local projects. This
ensures that any project dependency, no matter where it appears in the
dependency graph, is successfully identified.

Fixes gh-25163
2021-02-10 12:10:07 +00:00
Stephane Nicoll d436521472 Merge branch '2.4.x'
Closes gh-25167
2021-02-10 10:46:56 +01:00
Stephane Nicoll 7cb1605c11 Merge branch '2.3.x' into 2.4.x
Closes gh-25166
2021-02-10 10:45:54 +01:00
Stephane Nicoll e5098697cb Polish "Validate Cassandra defaults"
See gh-25130
2021-02-10 10:18:28 +01:00
bono007 f71ab69aeb Validate Cassandra defaults
See gh-25130
2021-02-10 10:15:31 +01:00
Stephane Nicoll d28d82d355 Merge branch '2.4.x'
Closes gh-25164
2021-02-10 09:41:28 +01:00
Stephane Nicoll acc8f3708b Update copyright of changed file
See gh-25150
2021-02-10 09:37:04 +01:00
bono007 4ef82c45ac Fix defaults for Cassandra's initQueryTimeout and idleTimeout
See gh-25150
2021-02-10 09:36:17 +01:00
Madhura Bhave 301e80be8c Fix raw types error 2021-02-09 14:15:08 -08:00
Madhura Bhave c05cb21ab7 Add a property to disable the `/actuator` discovery page
Closes gh-24693
2021-02-09 11:36:29 -08:00
Andy Wilkinson 3610fe50b7 Always use SimpleDriverDataSource when creating Liquibase DataSource
Closes gh-24944
2021-02-09 17:10:03 +00:00
Stephane Nicoll dca643500a Polish "Make Scheduler consistent for Spring Integration"
See gh-25109
2021-02-09 17:06:43 +01:00
Artem Bilan c5491cfdd7 Make Scheduler consistent for Spring Integration
Currently Spring Integration creates its own `TaskScheduler` bean if one
does not exist in the context yet. When we add `@EnableScheduling`,
Spring Boot auto-configures one for us, but this one comes with slightly
different options than the default in Spring Integration.

This commit makes sure that Spring Integration reuses the
auto-configured TaskScheduler if possible, regardless of the user
opting-in for `@EnabledScheduling`.

See gh-25109
2021-02-09 17:06:43 +01:00
Andy Wilkinson 78e1a812e2 Try to stabilise Cassandra tests by increasing request timeout
Closes gh-25146
2021-02-09 15:51:24 +00:00
Andy Wilkinson 6521d39867 Merge branch '2.4.x'
Closes gh-25143
2021-02-09 14:12:36 +00:00
Andy Wilkinson caa9249987 Merge branch '2.3.x' into 2.4.x
Closes gh-25142
2021-02-09 14:11:59 +00:00
Andy Wilkinson 7898b6afb0 Remove duplicate publication from spring-boot-docs
Fixes gh-25132
2021-02-09 14:10:58 +00:00
Stephane Nicoll c120f789d5 Merge branch '2.4.x'
Closes gh-25141
2021-02-09 15:04:58 +01:00
Stephane Nicoll 9218965104 Merge branch '2.3.x' into 2.4.x
Closes gh-25140
2021-02-09 15:04:28 +01:00
dreis2211 4937547b8a Fix build deprecation warnings about duplicate jar entries
See gh-25116
2021-02-09 14:45:58 +01:00
Stephane Nicoll a9a8d3a167 Merge branch '2.4.x'
Closes gh-25137
2021-02-09 09:49:59 +01:00
izeye 63ee99bf75 Polish
See gh-25093
2021-02-09 09:48:35 +01:00
Stephane Nicoll ee59f644ed Merge branch '2.4.x'
Closes gh-25136
2021-02-09 09:45:37 +01:00
Stephane Nicoll b2818680fd Polish "Clarify usage of BufferingApplicationStartup"
See gh-25075
2021-02-09 09:44:19 +01:00
Oleg Sukhov 853dbc3de3 Clarify usage of BufferingApplicationStartup
See gh-25075
2021-02-09 09:21:52 +01:00
Stephane Nicoll 948f61b4ca Polish contribution
See gh-25006
2021-02-09 09:10:56 +01:00
dreis2211 634dd979d1 Migrate from deprecated methods in AbstractWebFluxEndpointHandlerMapping
See gh-25006
2021-02-09 09:10:42 +01:00
Phillip Webb 23ebf017c0 Extract code samples from docs
See gh-6313
2021-02-04 15:55:35 -08:00
Andy Wilkinson 7a3bd6d44f Merge branch '2.4.x'
Closes gh-25106
2021-02-04 11:44:29 +00:00
Andy Wilkinson 297e3079d0 Fix handling of UriTemplateRequestEntity in TestRestTemplate
A change [1] in Spring Framework 5.3 means that getUrl() on a
RequestEntity will throw an UnsupportedOperationException if the
entity was created using a template.

This commit updates TestRestTemplate to check for instances of
UriTemplateRequestEntity and to resolve the URI using the
entity's UriTemplateHandler instead of calling getUrl() directly.

Fixes gh-25097

[1] a0f4d81db7
2021-02-04 10:59:00 +00:00
Andy Wilkinson d30251092b Test the Gradle Plugin against 7.0-milestone-1
Closes gh-25103
2021-02-04 10:16:48 +00:00
Phillip Webb 0e326d6b0f Extract some code samples from docs
See gh-6313
2021-02-03 18:10:44 -08:00
Phillip Webb e0392c4558 Add additional dependencies for example code
Add additional dependencies useful for the example code.

See gh-6313
2021-02-03 17:53:52 -08:00
Phillip Webb 9f6f2d36df Polish documented application logged output
Update the documented application output based on the latest version.
2021-02-03 17:53:52 -08:00
Phillip Webb b2a51e4504 Polish asciidoctor formatting 2021-02-03 17:47:36 -08:00
Phillip Webb ae1be76cce Add pending-extract attribute to source
Add `pending-extract=true` to source blocks to help us identify
those that need to be extracted to a real source file.

See gh-6313
2021-02-03 17:45:40 -08:00
Phillip Webb 073f8c4b23 Polish spring-boot-docs
See gh-25089
2021-02-03 16:25:11 -08:00
Phillip Webb 2a85427324 Refine spring-boot-docs package restructure
Refine the package restructure started in 91ccc23462 to help provide
a solid foundation for code snippets. This commit renames many of the
classes so that they no longer end in `Example`. It also removes some
of the inner types that were previously used. Many tag comments have
also been moved to ensure that `import` statements are available in
the docs.

Closes gh-25089
2021-02-03 15:47:05 -08:00
Phillip Webb 91ccc23462 Restructure spring-boot-docs packages
Restructure the packages in `spring-boot-docs` so that they mirror
the documentation sections. There are now three main packages:
`springbootfeatures`, `productionreadyfeatures` and `howto`. Each
of the main packages has a subpackage named after the section headings.

Example code now uses consistent `// tag::` names and imports are
applied using `[tag=*]` whenever possible.

Test snippets have been moved to `src/main/java` so that only a single
import attribute needs to be defined.

Closes gh-25089
2021-02-02 17:09:45 -08:00
Andy Wilkinson db781a0d84 Merge branch '2.4.x'
See gh-25077
2021-02-02 15:14:18 +00:00
Andy Wilkinson 788a42d694 Merge branch '2.3.x' into 2.4.x
See gh-25076
2021-02-02 15:12:27 +00:00
Andy Wilkinson 67479b6380 Add junit-platform-launcher dependency by convention
Closes gh-25074
2021-02-02 13:03:21 +00:00
Phillip Webb d9f3e89395 Merge branch '2.4.x' 2021-02-01 22:11:17 -08:00
Phillip Webb 230b4ab2eb Merge branch '2.3.x' into 2.4.x 2021-02-01 22:10:52 -08:00
Phillip Webb 630d216430 Update copyright year of changed files 2021-02-01 22:10:24 -08:00
Phillip Webb d8b849e00d Fix test that fails when building against SNAPSHOT
Update `WarIntegrationTests` do deal with a SNAPSHOT Spring Framwork
dependency.

See gh-23936
2021-02-01 22:09:04 -08:00
Phillip Webb 1eef2e1b46 Merge branch '2.4.x' 2021-02-01 19:47:11 -08:00
Phillip Webb 331c7b756b Merge branch '2.3.x' into 2.4.x 2021-02-01 19:46:49 -08:00
Phillip Webb c404a50a2e Allow test to use snapshot/milestone repo
Update `spring-boot-maven-plugin` `settings.xml` so that milestone and
snapshot dependencies can be resolved.

See gh-23936
2021-02-01 19:45:11 -08:00
Phillip Webb cff09df3fe Merge branch '2.4.x' 2021-02-01 17:07:28 -08:00
Phillip Webb 003f2f9521 Merge branch '2.3.x' into 2.4.x 2021-02-01 17:07:07 -08:00
Phillip Webb faaa5e4186 Fix BOM attached sourceSet
See gh-23936
2021-02-01 16:51:53 -08:00
Phillip Webb 59b8fb5b49 Merge branch '2.4.x'
Closes gh-25079
2021-02-01 16:36:02 -08:00
Phillip Webb db52bf3d7a Merge branch '2.3.x' into 2.4.x
Closes gh-25078
2021-02-01 16:35:46 -08:00
Phillip Webb 40c1748e3c Remove hardcoded versions from MavenBuild
Use the dependencies BOM to ensure versions used in the `MavenBuild`
test class are always aligned.

Closes gh-23936
2021-02-01 16:20:55 -08:00
Phillip Webb d8b6960997 Merge branch '2.4.x'
Closes gh-25077
2021-02-01 16:08:57 -08:00
Phillip Webb 257608a3a3 Merge branch '2.3.x' into 2.4.x
Closes gh-25076
2021-02-01 16:03:43 -08:00
Phillip Webb 939b5dfc26 Add junit-platform-launcher dependency
Update `build.gradle` files to ensure that `junit-platform-launcher` is
a `testRuntimeOnly` dependency. This ensures that tests can be run from
Eclipse.

Closes gh-25074
2021-02-01 15:31:28 -08:00
Madhura Bhave c73e3cc2dc Update documentation for layered wars
Closes gh-22821
Closes gh-22195
2021-02-01 14:43:43 -08:00
Madhura Bhave 1245e5eec9 Add support for creating layered war files with Gradle
See gh-22195
2021-02-01 14:43:42 -08:00
Andy Wilkinson 7f8ea33359 Merge branch '2.4.x'
Closes gh-25073
2021-02-01 15:39:52 +00:00
Andy Wilkinson 79c0597aa2 Merge branch '2.3.x' into 2.4.x
Closes gh-25072
2021-02-01 15:39:19 +00:00
Andy Wilkinson 3585d20453 Include IDialect beans in WebFluxTest and WebMvcTest
Fixes gh-24149
2021-02-01 15:03:08 +00:00
Phillip Webb 0104ee677e Merge branch '2.4.x'
Closes gh-25067
2021-01-30 17:58:05 -08:00
Phillip Webb 57f1f17320 Merge branch '2.3.x' into 2.4.x
Closes gh-25066
2021-01-30 17:57:53 -08:00
Phillip Webb 187258aa6a Fix classpath.idx format documentation
Since 2.3.8 and 2.4.2 the format includes the directory.

Closes gh-24856
2021-01-30 17:56:09 -08:00
Phillip Webb d6eb1eb5ae Merge branch '2.4.x'
Closes gh-25065
2021-01-30 17:46:25 -08:00
Phillip Webb 9ac5151932 Merge branch '2.3.x' into 2.4.x
Closes gh-25064
2021-01-30 17:46:10 -08:00
Phillip Webb 19c5864d2c Clarify square bracket map binding notation
Update reference docs to make it clearer when the square bracket map
binding notation should be used.

Closes gh-23390
2021-01-30 17:42:49 -08:00
Phillip Webb 99d400f302 Merge branch '2.4.x'
Closes gh-25062
2021-01-30 17:04:24 -08:00
Phillip Webb d7c44e4503 Merge branch '2.3.x' into 2.4.x
Closes gh-25061
2021-01-30 17:04:10 -08:00
Phillip Webb 549d4f7fbe Document that Spring MVC has own ConversionService
Update documentation to make it clearer that Spring MVC does not use the
`ApplicationConversionService` unless configured explicitly.

Closes gh-22718
2021-01-30 17:03:55 -08:00
Phillip Webb d8c9b8c329 Merge branch '2.4.x'
Closes gh-25060
2021-01-30 12:35:52 -08:00
Phillip Webb 77478d9f34 Refine CharSequenceToObjectConverter logic
Update `CharSequenceToObjectConverter` so that conversion that would
apply using an `ObjectTo...` converter now favors `toString()` based
conversion.

Prior to this commit, when converting a `CharSequence` to a `Collection`
the `ObjectToCollectionConveter` would be picked instead of the
`StringToCollectionConverter`. This resulted in a `Collection`
containing a single `String` value, rather than the expected list
of values split around ",".

Fixes gh-25057
2021-01-30 12:35:36 -08:00
Phillip Webb 01746453f7 Merge branch '2.4.x' 2021-01-30 12:34:28 -08:00
Phillip Webb dd997cda9c Remove sysout from test 2021-01-30 10:38:02 -08:00
Andy Wilkinson 82b90d5749 Merge branch '2.4.x'
Closes gh-25052
2021-01-29 09:07:40 +00:00
Andy Wilkinson a3058200cb Merge branch '2.3.x' into 2.4.x
Closes gh-25050
2021-01-29 09:06:42 +00:00
dreis2211 4940694db2 Fix duplicate anchor id
See gh-25048
2021-01-29 09:06:06 +00:00
Phillip Webb f6097e7da4 Merge branch '2.4.x'
Closes gh-25045
2021-01-28 19:29:14 -08:00
Phillip Webb 2d056525d8 Merge branch '2.3.x' into 2.4.x
Closes gh-25044
2021-01-28 19:28:56 -08:00
Phillip Webb c03d8773e7 Improve logging.register-shutdown-hook docs
Update the "Logging" reference documentation with a section about
shutting down the logging system.

Closes gh-24507
2021-01-28 19:26:18 -08:00
Phillip Webb c76a0f7a81 Merge branch '2.4.x'
Closes gh-25043
2021-01-28 18:57:10 -08:00
Phillip Webb ca9b612e27 Merge branch '2.3.x' into 2.4.x
Closes gh-25042
2021-01-28 18:56:59 -08:00
jongmin92 23ecb86089 Document missing code to run Gradle bootRun task
See gh-25012
2021-01-28 18:56:21 -08:00
Phillip Webb 479180fdf9 Merge branch '2.4.x'
Closes gh-25041
2021-01-28 18:49:04 -08:00
Phillip Webb c86ee4c851 Merge branch '2.3.x' into 2.4.x
Closes gh-25040
2021-01-28 18:48:51 -08:00
Phillip Webb 5b2d1f19a0 Polish 'Add note about exploded jars and banner properties'
See gh-24982
2021-01-28 18:48:14 -08:00
Robert Smith 33c038199d Add note about exploded jars and banner properties
Add a note to the "Customizing the Banner" explaining that you need
to be using the `JarLauncher` to use the `application.*` properties.

See gh-24982
2021-01-28 18:48:11 -08:00
Phillip Webb 802da9dc87 Merge branch '2.4.x'
Closes gh-25039
2021-01-28 18:01:06 -08:00
Phillip Webb 53f1aab833 Merge branch '2.3.x' into 2.4.x
Closes gh-25038
2021-01-28 18:00:42 -08:00
Phillip Webb 60bb33f231 Polish 'Add a tip about actuator endpoints'
See gh-24336
2021-01-28 17:55:09 -08:00
Wesley Ugang 6ced1d7f4e Add a tip about actuator endpoints
Update the "Externalized Configuration" section with a tip that about
the actuator `env` and `configprops` endpoints.

See gh-24336
2021-01-28 17:53:04 -08:00
Madhura Bhave 82ac7eef91 Update tests following code changes
See gh-22821
2021-01-28 14:24:18 -08:00
Madhura Bhave 9a32f67802 Fix formatting 2021-01-28 13:38:30 -08:00
Madhura Bhave 152698f2b2 Add support for creating layered war files with Maven
See gh-22821
2021-01-28 12:39:19 -08:00
Phillip Webb 5054765fc8 Merge branch '2.4.x'
Closes gh-25031
2021-01-27 14:19:25 -08:00
Phillip Webb 0fcc52ccaf Protect against NPE with Option.IGNORE_IMPORTS
Update `ConfigDataEnvironmentContributor` to deal with the fact that
the `properties` instance can be `null`.

Fixes gh-25029
2021-01-27 14:17:41 -08:00
Phillip Webb d702793ba7 Merge branch '2.4.x'
Closes gh-25030
2021-01-27 14:10:49 -08:00
Phillip Webb 7f32fa6723 Allow 'on-profile' in profile specific files
Restore the ability to use `spring.config.activate.on-profile` or
`spring.profiles` in profile specific files.

Closes gh-24990
2021-01-27 14:07:02 -08:00
Phillip Webb 61502bde9a Replace deprecated constructor with mutate builder
Update `ControllerEndpointHandlerMapping` to use the new `mutate()`
builder rather than deprecated constructors.

Closes gh-24999
2021-01-26 22:42:18 -08:00
Phillip Webb c9a2c4e326 Merge branch '2.4.x' 2021-01-26 19:06:48 -08:00
Phillip Webb d06407ec0a Update copyright year of changed files 2021-01-26 19:06:14 -08:00
Phillip Webb 4b0ef67e8e Update code for Spring Data 2021.0.0-M3
See gh-25004
2021-01-26 18:57:50 -08:00
Phillip Webb ab0a628d81 Merge branch '2.4.x' 2021-01-26 17:38:11 -08:00
Phillip Webb 99f7bc1aba Build against Spring Data 2020.0.4-SNAPSHOT
See gh-25002
2021-01-26 17:35:54 -08:00
Phillip Webb d95d7a0245 Update code for Spring Framework 5.3.4
See gh-24998
2021-01-26 17:35:54 -08:00
Phillip Webb b7ae5558f6 Build against Spring Framework 5.3.4-SNAPSHOT
See gh-24998
2021-01-26 17:31:27 -08:00
Phillip Webb 439344fdd8 Merge branch '2.4.x'
Closes gh-24996
2021-01-25 23:13:38 -08:00
Phillip Webb 1def245a2c Support DeferredLogFactory injection
Update `ConfigDataLoader` and `ConfigDataLocationResolver` to support
`DeferredLogFactory` injection.

Closes gh-24988
2021-01-25 23:13:01 -08:00
Phillip Webb b1f27b7604 Merge branch '2.4.x'
Closes gh-24995
2021-01-25 21:36:36 -08:00
Phillip Webb 522f68cb40 Merge branch '2.3.x' into 2.4.x
Closes gh-24994
2021-01-25 21:36:12 -08:00
Phillip Webb 464b302655 Set withTestKitDir per Gradle version
Attempt to fix cache locking issues by setting a unique `withTestKitDir`
directory for each tested Gradle version.

Closes gh-24993
2021-01-25 21:35:25 -08:00
Phillip Webb c268f5d418 Skip direct @ConfugurationProperties binding
Add a `BindRestriction` option to `Bindable` which allows direct
property binding to be bypassed. The option is automatically applied
by the `ConfigurationPropertiesBinder`.

Prior to this commit, `@ConfugurationProperties` binding could silently
fail if a direct property existed that could be converted to the
properties class. This can be the case if a single-argument constructor
is available as the `ObjectToObject` converter would kick in.

Closes gh-16038

Co-authored-by: Madhura Bhave <mbhave@pivotal.io>
2021-01-22 16:57:59 -08:00
Andy Wilkinson 5fc49aa485 Remove dependency management for spring-boot-starter-data-solr
Closes gh-24977
2021-01-22 15:09:12 +00:00
Andy Wilkinson f3fd55dac6 Merge branch '2.4.x'
Closes gh-24976
2021-01-22 14:59:35 +00:00
Andy Wilkinson 9c8645dec2 Merge branch '2.3.x' into 2.4.x
Closes gh-24975
2021-01-22 14:59:23 +00:00
Andy Wilkinson 46d908f632 Upgrade to Gradle 6.8.1
Closes gh-24737
2021-01-22 14:20:57 +00:00
Andy Wilkinson 5a56f8864f Remove error message attribute instead of blanking it when not included
Closes gh-24712
2021-01-22 14:10:02 +00:00
Andy Wilkinson 1370e8ca97 Merge branch '2.4.x'
Closes gh-24974
2021-01-22 13:32:47 +00:00
Andy Wilkinson 5362633014 Merge branch '2.3.x' into 2.4.x
Closes gh-24973
2021-01-22 13:32:30 +00:00
Andy Wilkinson 0b06ac9938 Use AssertJ's doesNotContainKey
Closes gh-24970
2021-01-22 13:28:41 +00:00
Andy Wilkinson ebca1af3fd Polish "Add reference to Ogham Spring Boot starters"
See gh-24964
2021-01-22 11:06:33 +00:00
Aurélien Baudet 0e436a2ccf Add reference to Ogham Spring Boot starters
See gh-24964
2021-01-22 10:56:36 +00:00
Madhura Bhave d07e351eff Polish " Change info endpoint to be secure and unexposed by default"
See gh-24715
2021-01-21 15:13:53 -08:00
Hatef Palizgar 53c1e79810 Change info endpoint to be secure and unexposed by default
See gh-24715
2021-01-21 13:54:59 -08:00
Andy Wilkinson 0fc33b020d Remove metadata for Data Solr property
Data Solr support was removed in 012a1997 so the property is no longer
supported.

See gh-24939
2021-01-21 16:45:25 +00:00
Andy Wilkinson 3e4abd0471 Upgrade to Solr 8.7.0
Closes gh-24963
2021-01-21 15:41:22 +00:00
Andy Wilkinson a0166e53c1 Upgrade to REST Assured 4.3.3
Closes gh-24962
2021-01-21 15:28:19 +00:00
Andy Wilkinson 977b938977 Upgrade to Flyway 7.5.1
Closes gh-24961
2021-01-21 15:28:19 +00:00
Andy Wilkinson 60ce922a5b Prohibit major upgrades that are not of interest
Closes gh-24960
2021-01-21 15:11:29 +00:00
dreis2211 d4eccb7715 Upgrade to Groovy 3.0.7
See gh-24946
2021-01-21 14:32:42 +00:00
Andy Wilkinson a4919a047e Upgrade to Spring Integration 5.5.0-M1
Closes gh-24932
2021-01-21 14:32:42 +00:00
Andy Wilkinson bb9a674dfb Upgrade to Spring Session Bom 2021.0.0-M1
Closes gh-24933
2021-01-21 14:32:42 +00:00
Andy Wilkinson c125e0ee35 Upgrade to Spring Kafka 2.7.0-M1
Closes gh-24592
2021-01-21 14:32:41 +00:00
Andy Wilkinson dff64302b5 Upgrade to Kafka 2.7.0
Closes gh-24934
2021-01-21 13:24:40 +00:00
Andy Wilkinson f5328d59e4 Upgrade to Oracle Database 21.1.0.0
Closes gh-24959
2021-01-21 12:38:51 +00:00
Andy Wilkinson eccafc1303 Upgrade to Jetty EL 9.0.29
Closes gh-24957
2021-01-21 12:38:50 +00:00
Andy Wilkinson a29ba202ae Upgrade to Jaybird 4.0.2.java8
Closes gh-24956
2021-01-21 12:38:50 +00:00
Andy Wilkinson 48b9e5ab29 Upgrade to Git Commit ID Plugin 4.0.3
Closes gh-24955
2021-01-21 12:30:39 +00:00
Andy Wilkinson fb087d7f7d Upgrade to ActiveMQ 5.16.1
Closes gh-24954
2021-01-21 12:30:38 +00:00
Andy Wilkinson 4135e3c061 Upgrade to Flyway 7.5
Closes gh-24953
2021-01-21 12:11:31 +00:00
Andy Wilkinson d15ec4cdb4 Upgrade to Liquibase 4.2.2
Closes gh-24952
2021-01-21 09:47:58 +00:00
Madhura Bhave cf8e667795 Fix formatting 2021-01-20 15:49:08 -08:00
Madhura Bhave 06263c46ce Upgrade to Spring Security 5.5.0-M1
Closes gh-24937
2021-01-20 15:42:25 -08:00
Phillip Webb a196a9bd8f Merge branch '2.4.x'
Closes gh-24949
2021-01-20 13:49:37 -08:00
Phillip Webb 69fbd2f8aa Delegate `usesPathPatterns()` call to mappings
Update `CompositeHandlerMapping` so that the `usesPathPatterns()` method
returns `true` if any of the delegate mappings return `true`.

Closes gh-24877
2021-01-20 13:49:18 -08:00
Stephane Nicoll 4c2a7db4f8 Upgrade to Spring Data 2021.0.0-M2
Closes gh-24931
2021-01-20 16:18:38 +01:00
Stephane Nicoll 20b7016a92 Upgrade to Spring HATEOAS 1.3.0-M1
Closes gh-24935
2021-01-20 15:16:10 +01:00
Stephane Nicoll 012a199773 Remove Spring Data Solr support
In preparation to the upgrade to Spring Data 2021.0, this commit removes
auto-configuration for Spring Data Solr.

Closes gh-24939
2021-01-20 15:03:42 +01:00
Stephane Nicoll 3e376b955d Fix build failure
See gh-24943
2021-01-20 14:41:12 +01:00
Stephane Nicoll 2f4d4c7b5d Merge branch '2.4.x' 2021-01-20 14:07:07 +01:00
Stephane Nicoll 56ce5bdf44 Merge branch '2.3.x' into 2.4.x
See gh-24943
2021-01-20 14:06:39 +01:00
Stephane Nicoll 244a6ac7e5 Polish "Deprecate Spring Data Solr"
See gh-24942
2021-01-20 14:02:59 +01:00
Stephane Nicoll 85729d2a8a Merge branch '2.3.x' into 2.4.x
Closes gh-24943
2021-01-20 13:57:18 +01:00
Stephane Nicoll 10b4cb8cb5 Deprecate Spring Data Solr support
Closes gh-24942
2021-01-20 13:56:50 +01:00
Stephane Nicoll bf9c67b793 Polish 2021-01-20 10:27:32 +01:00
Stephane Nicoll ebf8175cc2 Upgrade to XmlUnit2 2.8.2
Closes gh-24930
2021-01-20 10:22:48 +01:00
Stephane Nicoll b3fd1446f5 Upgrade to Thymeleaf Layout Dialect 2.5.2
Closes gh-24929
2021-01-20 10:22:48 +01:00
Stephane Nicoll ab883a7fd7 Upgrade to SQLite JDBC 3.34.0
Closes gh-24928
2021-01-20 10:22:48 +01:00
Stephane Nicoll 90e50a2967 Upgrade to Spring Retry 1.3.1
Closes gh-24927
2021-01-20 10:22:48 +01:00
Stephane Nicoll dc28bb9a5c Upgrade to Spring AMQP 2.3.4
Closes gh-24926
2021-01-20 10:22:48 +01:00
Stephane Nicoll 88825923b6 Upgrade to SendGrid 4.7.1
Closes gh-24925
2021-01-20 10:22:47 +01:00
Stephane Nicoll eefd5a1d9a Upgrade to Selenium HtmlUnit 2.46.0
Closes gh-24924
2021-01-20 09:15:16 +01:00
Stephane Nicoll 2e7c4d8d91 Upgrade to Oracle Database 19.9.0.0
Closes gh-24923
2021-01-20 09:15:14 +01:00
Stephane Nicoll f2c1a7c957 Upgrade to Netty tcNative 2.0.36.Final
Closes gh-24922
2021-01-20 09:15:13 +01:00
Stephane Nicoll 54f0f881de Upgrade to Netty 4.1.58.Final
Closes gh-24921
2021-01-20 09:15:11 +01:00
Stephane Nicoll 33bf4d2b42 Upgrade to MySQL 8.0.23
Closes gh-24920
2021-01-20 09:15:09 +01:00
Stephane Nicoll 10b9448e1e Upgrade to Mockito 3.7.7
Closes gh-24919
2021-01-20 09:15:08 +01:00
Stephane Nicoll 10a692edcd Upgrade to Micrometer 1.6.3
Closes gh-24918
2021-01-20 09:15:06 +01:00
Stephane Nicoll c57ca65eb8 Upgrade to Log4j2 2.14.0
Closes gh-24917
2021-01-20 09:15:05 +01:00
Stephane Nicoll 4407d00664 Upgrade to Lettuce 6.0.2.RELEASE
Closes gh-24916
2021-01-20 09:15:04 +01:00
Stephane Nicoll 78a15dc8c9 Upgrade to Json Path 2.5.0
Closes gh-24915
2021-01-20 09:15:03 +01:00
Stephane Nicoll 0399b65904 Upgrade to Johnzon 1.2.9
Closes gh-24914
2021-01-20 09:15:01 +01:00
Stephane Nicoll 9e12bd088e Upgrade to Jetty 9.4.36.v20210114
Closes gh-24913
2021-01-20 09:15:00 +01:00
Stephane Nicoll 02b434460d Upgrade to Jetty Reactive HTTPClient 1.1.5
Closes gh-24912
2021-01-20 09:14:59 +01:00
Stephane Nicoll 6d8043aae7 Upgrade to Jersey 2.33
Closes gh-24911
2021-01-20 09:14:57 +01:00
Stephane Nicoll 8d5dd8d4b2 Upgrade to Jaybird 3.0.10
Closes gh-24910
2021-01-20 09:14:56 +01:00
Stephane Nicoll 7b39cfb061 Upgrade to Jackson Bom 2.12.1
Closes gh-24909
2021-01-20 09:14:54 +01:00
Stephane Nicoll 7b22d69857 Upgrade to InfluxDB Java 2.21
Closes gh-24908
2021-01-20 09:14:52 +01:00
Stephane Nicoll 346bc4730b Upgrade to Infinispan 11.0.9.Final
Closes gh-24907
2021-01-20 09:14:50 +01:00
Stephane Nicoll 09b3363dae Upgrade to HtmlUnit 2.46.0
Closes gh-24906
2021-01-20 09:14:49 +01:00
Stephane Nicoll d5d100eb11 Upgrade to Hibernate Validator 6.2.0.Final
Closes gh-24905
2021-01-20 09:14:47 +01:00
Stephane Nicoll 62ad346765 Upgrade to Hibernate 5.4.27.Final
Closes gh-24904
2021-01-20 09:14:46 +01:00
Stephane Nicoll ee6c8425e2 Upgrade to Hazelcast Hibernate5 2.2.0
Closes gh-24903
2021-01-20 09:14:45 +01:00
Stephane Nicoll 9ed2e722fd Upgrade to Hazelcast 4.1.1
Closes gh-24902
2021-01-20 09:14:44 +01:00
Stephane Nicoll b3221f4fc5 Upgrade to Elasticsearch 7.10.2
Closes gh-24901
2021-01-20 09:14:42 +01:00
Stephane Nicoll 1c42d22e1c Upgrade to Dropwizard Metrics 4.1.17
Closes gh-24900
2021-01-20 09:14:40 +01:00
Stephane Nicoll 5cea9e74ab Upgrade to Couchbase Client 3.1.1
Closes gh-24899
2021-01-20 09:14:39 +01:00
Stephane Nicoll 644c03124a Upgrade to Cassandra Driver 4.10.0
Closes gh-24898
2021-01-20 09:14:38 +01:00
Stephane Nicoll aa29d950a9 Upgrade to Byte Buddy 1.10.19
Closes gh-24897
2021-01-20 09:14:36 +01:00
Stephane Nicoll 4ab3b5c0d4 Upgrade to Artemis 2.16.0
Closes gh-24896
2021-01-20 09:14:35 +01:00
Stephane Nicoll 95cf9d91e9 Upgrade to AppEngine SDK 1.9.84
Closes gh-24895
2021-01-20 09:14:34 +01:00
Phillip Webb b5674173f8 Merge branch '2.4.x'
Closes gh-24893
2021-01-19 18:15:26 -08:00
Phillip Webb 80dbbaf012 Add ConfigData IGNORE_PROFILES support
Add a new `ConfigData.Option` that allows profile properties to be
ignored. This update will allow Spring Cloud Config Server to provide
`ConfigData` that only has profile properties processed on the
server-side.

Closes gh-24890
2021-01-19 18:13:24 -08:00
Andy Wilkinson 452fbf3a3e Prohibit upgrades to REST Assured 4.3
REST Assured 4.3.x requires Groovy 3 that we can't yet upgrade to as
there is no compatibile GA of Spock.

This commit prohibits upgrades to 4.3 so that Bomr ignores the possible
upgrade.

See gh-22303
2021-01-19 16:53:53 +00:00
Andy Wilkinson b095c7761a Polish "Add config prop for endpoints' CORS allowed origin patterns"
See gh-24680
2021-01-19 15:51:14 +00:00
Pedro Ivo Machado d7f891be39 Add config prop for endpoints' CORS allowed origin patterns
See gh-24680
2021-01-19 15:50:31 +00:00
Andy Wilkinson 743343cf18 Avoid compiler warning that only occurs with Java 8 2021-01-19 13:58:34 +00:00
Andy Wilkinson 294231efe7 Merge branch '2.4.x'
Closes gh-24883
2021-01-19 13:22:32 +00:00
Andy Wilkinson 7b4fbd2c85 Document WebMvcProperties.MatchingStrategt as being since 2.4.0
Closes gh-24875
2021-01-19 13:22:00 +00:00
Andy Wilkinson 535050ad48 Automatically register HttpSessionIdListener's with the servlet context
Closes gh-24879
2021-01-19 11:28:34 +00:00
Andy Wilkinson 48002e969f Merge branch '2.4.x'
Closes gh-24882
2021-01-19 10:53:41 +00:00
Andy Wilkinson 3ad2832cb2 Fix pattern extraction when MVC is using a PathPatternParser
Fixes gh-24874
2021-01-19 10:34:11 +00:00
Andy Wilkinson 4e918b141b Polish 2021-01-18 16:30:14 +00:00
Stephane Nicoll 0669f5604d Merge branch '2.4.x'
Closes gh-24873
2021-01-18 17:09:01 +01:00
Stephane Nicoll 59b01324ae Merge branch '2.3.x' into 2.4.x
Closes gh-24872
2021-01-18 17:08:36 +01:00
Stephane Nicoll 1ad5a3fe2e Update copyright of changed file
See gh-24753
2021-01-18 17:01:31 +01:00
izeye ddfa1e632b Make MetricsClientHttpRequestInterceptor defensive against metrics recoding failures
See gh-24753
2021-01-18 17:00:26 +01:00
Andy Wilkinson c6ce97b8a9 Disable all mappings endpoint infra when endpoint is unavailable
Previously, when the mappings endpoint was not available, the beans
that provide mapping descriptions were still created. This resulted
in unnecessary CPU and memory usage collecting and storing
information that would never by used.

This commit updates the auto-configuration for the mappings endpoint
so that all the beans that it creates are conditional on the endpoint
being available, rather than only the endpoint bean itself.

Closes gh-23977
2021-01-18 15:43:48 +00:00
Stephane Nicoll 7592c98d5c Merge branch '2.4.x'
Closes gh-24871
2021-01-18 14:45:02 +01:00
izeye 21db14227c Fix property name for spring.dao.exceptiontranslation.enabled
See gh-24867
2021-01-18 14:41:41 +01:00
Stephane Nicoll 742983fc5e Update copyright of changed file
See gh-24866
2021-01-18 14:38:58 +01:00
izeye 41fcc427c6 Restore persistOfNullThrowsIllegalArgumentExceptionWithoutExceptionTranslation()
See gh-24866
2021-01-18 14:37:34 +01:00
Stephane Nicoll dcc0ca0df9 Polish contribution
See gh-24862
2021-01-18 11:03:27 +01:00
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
Stephane Nicoll dcae55a8bc Merge branch '2.4.x'
Closes gh-24861
2021-01-17 17:04:22 +01:00
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