Commit Graph

13018 Commits

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

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

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

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

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

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

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

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

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

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

See gh-24659
2021-01-06 16:58:05 -08:00
Phillip Webb 42e649debe Merge branch '2.4.x'
Closes gh-24682
2021-01-06 16:47:46 -08:00
Phillip Webb 04616a01cf Merge branch '2.3.x' into 2.4.x
Closes gh-24681
2021-01-06 16:47:24 -08:00
Phillip Webb ef09982b39 Merge branch '2.2.x' into 2.3.x
Closes gh-24680
2021-01-06 16:46:50 -08:00
Phillip Webb 25033ee5e7 Migrate away from pivotal-legacy/homebrew-tap
Update reference documentation to the new spring-io/homebrew-tap repo.

Closes gh-24659
2021-01-06 16:45:10 -08:00
Madhura Bhave 012fb3d3b9 Merge branch '2.4.x'
Closes gh-24679
2021-01-06 16:44:58 -08:00
Madhura Bhave 920136d908 Merge branch '2.3.x' into 2.4.x
Closes gh-24678
2021-01-06 16:44:32 -08:00
Madhura Bhave 73a2a4b383 Consider context-path for WebTestClient baseUrl
Fixes gh-24168
2021-01-06 16:42:09 -08:00
Phillip Webb cb0069f385 Merge branch '2.4.x'
Closes gh-24674
2021-01-06 13:32:09 -08:00
Phillip Webb 5b126b01c0 Replace binder as contributors are processed
Update `ConfigDataEnvironment` so that the bootstrap `Binder` is
replaced as contributors are processed. The final `Binder` is now
also added without the `FAIL_ON_BIND_TO_INACTIVE_SOURCE` option so
that properties can be bound at the last stage even if values exist
in an inactive profile-specific document.

Closes gh-24669
2021-01-06 13:31:29 -08:00
Phillip Webb 45ca4a5a56 Merge branch '2.4.x'
Closes gh-24673
2021-01-06 12:34:13 -08:00
Phillip Webb ac4243d615 Merge branch '2.3.x' into 2.4.x
Closes gh-24672
2021-01-06 12:33:53 -08:00
Phillip Webb 52e47c4275 Fix test for JSR-350 @Nonnull
Closes gh-24647
2021-01-06 12:33:25 -08:00
Phillip Webb 2dfb9b0911 Merge branch '2.4.x'
Closes gh-24671
2021-01-06 12:24:05 -08:00
Phillip Webb 2b497b6aff Merge branch '2.3.x' into 2.4.x
Closes gh-24670
2021-01-06 12:23:45 -08:00
Phillip Webb 848ed65f5b Add test for JSR-350 @Nonnull
Closes gh-24647
2021-01-06 12:04:58 -08:00
Stephane Nicoll 2547a9e255 Merge branch '2.4.x'
See gh-24655
2021-01-06 14:24:34 +01:00
Stephane Nicoll c014bb9880 Merge branch '2.3.x' into 2.4.x
See gh-24647
2021-01-06 14:24:13 +01:00
Stephane Nicoll 67d1f355d7 Fix Nullable reference
See gh-24647
2021-01-06 14:23:38 +01:00
Stephane Nicoll b3278f459e Merge branch '2.4.x'
See gh-24655
2021-01-06 08:59:14 +01:00
Stephane Nicoll 4e6f15a466 Merge branch '2.3.x' into 2.4.x
See gh-24647
2021-01-06 08:58:48 +01:00
Stephane Nicoll 2bd78355dc Reference javax.annotation.Nonnull support in reference guide
See gh-24647
2021-01-06 08:58:13 +01:00
Phillip Webb 11c4ce2135 Merge branch '2.4.x'
Closes gh-24658
2021-01-05 16:03:23 -08:00
Phillip Webb c9f9246c59 Merge branch '2.3.x' into 2.4.x
Closes gh-24657
2021-01-05 16:03:01 -08:00
Phillip Webb 9b9c3edfcd Polish "Return -1 port for non-listening WebServers"
See gh-24606
2021-01-05 16:02:26 -08:00
Stefan Partusch 5c61df3131 Return -1 port for non-listening WebServers
Update `WebServer` implementations to return -1 from `getPort()` if
the server  isn't listening on a port. This aligns the implementations
with the interface Javadoc.

See gh-24606
2021-01-05 15:56:25 -08:00
Phillip Webb bd3dd0a526 Merge branch '2.4.x'
Closes gh-24655
2021-01-05 14:08:57 -08:00
Phillip Webb ab8080353e Merge branch '2.3.x' into 2.4.x
Closes gh-24654
2021-01-05 14:08:41 -08:00
Phillip Webb 2ad9a47d08 Support JSR-305 annotations on endpoint methods
Update `OperationMethodParameter` to additionally support JSR-305 based
`@Nullable` annotations.

Closes gh-24647
2021-01-05 14:07:22 -08:00
Scott Frederick d0fba2473f Merge branch '2.4.x'
Closes gh-24652
2021-01-05 14:05:58 -06:00
Scott Frederick 505340909a Support symlinks in configtree property paths
Prior to this commit, the configtree property source would not traverse
into a sub-directory in a property path if the sub-directory was a
symbolic link. This commit allows symlinked sub-directories to be
traversed like any other sub-directory in the property path.

Fixes gh-24530
2021-01-05 14:04:59 -06:00
Madhura Bhave f8cc7180e5 Merge branch '2.4.x'
Closes gh-24651
2021-01-05 10:49:17 -08:00
Madhura Bhave 615a8ae56e Ignore documents that do not apply when checking mandatory locations
Closes gh-24584
2021-01-05 10:47:06 -08:00
Andy Wilkinson 77652961cd Merge branch '2.4.x'
Closes gh-24650
2021-01-05 17:13:45 +00:00
Andy Wilkinson 89f29c933f Merge branch '2.3.x' into 2.4.x
Closes gh-24649
2021-01-05 17:13:30 +00:00
dreis2211 fe3217d2c4 Exclude starters from Javadoc aggregation
See gh-24648
2021-01-05 17:12:39 +00:00
Stephane Nicoll 1fb32fcf7a Merge branch '2.4.x'
Closes gh-24644
2021-01-05 08:28:35 +01:00
Stephane Nicoll e1ec70ac36 Merge branch '2.3.x' into 2.4.x
Closes gh-24643
2021-01-05 08:28:13 +01:00
Stephane Nicoll f33c7bc27c Polish "Remove unnecessary semicolon"
See gh-24628
2021-01-05 08:24:03 +01:00
Andrey Kolchanov 097104584c Remove unnecessary semicolon
See gh-24628
2021-01-05 08:15:32 +01:00
Madhura Bhave b62325a056 Merge branch '2.4.x' 2021-01-04 13:37:05 -08:00
Madhura Bhave 86e94b95c3 Merge branch '2.3.x' into 2.4.x 2021-01-04 13:36:36 -08:00
Madhura Bhave 9928d74a9e Revert fix to enable cors for actuator endpoints
The fix causes a Jersey application to fail in the absence
of a `CorsFilter` or `CorsConfigurationSource` bean.

See gh-11987
2021-01-04 12:25:43 -08:00
Stephane Nicoll ca1ad1488d Merge branch '2.4.x' 2021-01-04 16:40:23 +01:00
Stephane Nicoll c19f7e696e Polish
See gh-24597
2021-01-04 16:39:27 +01:00
Stephane Nicoll 4289523d7d Merge branch '2.4.x'
Closes gh-24637
2021-01-03 18:03:08 +01:00
Stephane Nicoll 1bc1258341 Polish "Make a field final"
See gh-24629
2021-01-03 17:58:46 +01:00
Andrey Kolchanov 0e3990931e Make a field final
See gh-24629
2021-01-03 17:58:14 +01:00
Stephane Nicoll 63444ae957 Merge branch '2.4.x'
Closes gh-24627
2021-01-01 09:18:31 +01:00
Stephane Nicoll 052565ef2b Merge branch '2.3.x' into 2.4.x
Closes gh-24626
2021-01-01 09:18:13 +01:00
dreis2211 261b7a5b18 Update copyrights to 2021
See gh-24625
2021-01-01 09:17:13 +01:00
Stephane Nicoll 8cd07dbc60 Polish
See gh-21286
2020-12-24 11:10:37 +01:00
Stephane Nicoll e4618cfb8d Delete ErrorProperties.IncludeStacktrace
Closes gh-21286
2020-12-24 10:35:04 +01:00
Stephane Nicoll 1a2577a07e Fix sample formatting 2020-12-23 17:19:18 +01:00
Stephane Nicoll 1fd17cf641 Add support for Elasticsearch sniffer
Closes gh-24174
2020-12-23 17:11:40 +01:00
Stephane Nicoll 1e8d5c37ed Merge branch '2.4.x'
Closes gh-24607
2020-12-23 16:09:13 +01:00
izeye 5e3f618f9d Polish
See gh-24604
2020-12-23 16:08:21 +01:00
Stephane Nicoll e3d7ab0e3b Merge branch '2.3.x' into 2.4.x 2020-12-23 16:08:08 +01:00
Stephane Nicoll d0a1c49873 Polish
See gh-24604
2020-12-23 16:07:27 +01:00
Stephane Nicoll 8cf5510f26 Upgrade to REST Assured 4.2.1
Closes gh-22303
2020-12-23 11:24:46 +01:00
Stephane Nicoll 830843bb70 Merge branch '2.4.x'
Closes gh-24603
2020-12-23 11:14:56 +01:00
Stephane Nicoll 1261e08371 Merge branch '2.3.x' into 2.4.x
Closes gh-24602
2020-12-23 11:14:37 +01:00
Stephane Nicoll d86eba3b6b Upgrade to Thymeleaf 3.0.12
Closes gh-24599
2020-12-23 10:57:36 +01:00
Stephane Nicoll 7c767e9a0b Merge branch '2.4.x'
Closes gh-24600
2020-12-23 10:44:52 +01:00
Stephane Nicoll ff59bb3abf Configure resources filtering encoding
Closes gh-24576
2020-12-23 10:44:06 +01:00
Stephane Nicoll b070c39ac3 Merge branch '2.4.x'
Closes gh-24598
2020-12-23 09:15:25 +01:00
Stephane Nicoll 4cdfd6f13d Polish "Handle missing manifest files in JarTypeFilter"
See gh-24597
2020-12-23 09:12:58 +01:00
Rob Edwards 86eecb01b3 Handle missing manifest files in JarTypeFilter
This commit makes sure that a jar file without a manifest is handled
properly (i.e. included in the repackaged archive).

See gh-24597
2020-12-23 09:11:24 +01:00
Madhura Bhave b29ac37db6 Add docs about using InMemoryOAuth2AuthorizedClientService
Closes gh-24596
2020-12-22 12:18:47 -08:00
Madhura Bhave d36c950e33 Merge branch '2.4.x'
Closes gh-24595
2020-12-22 12:14:16 -08:00
Madhura Bhave a0afec120d Add docs about using InMemoryOAuth2AuthorizedClientService
Closes gh-24313
2020-12-22 12:13:17 -08:00
Madhura Bhave 467f853641 Merge branch '2.4.x'
Closes gh-24593
2020-12-22 11:17:54 -08:00
Madhura Bhave a714ba44ea Update documentation containing examples of WebSecurityConfigurerAdapter
Closes gh-24551
2020-12-22 11:17:30 -08:00
Stephane Nicoll ad6b01d6d0 Add control connection timeout property for Cassandra
Closes gh-24189
2020-12-22 15:20:44 +01:00
Stephane Nicoll 5000051891 Merge branch '2.4.x'
Closes gh-24589
2020-12-22 12:32:24 +01:00
Stephane Nicoll 0691ba600f Polish "Detect Persistent and RelationshipProperties with Neo4j"
See gh-24239
2020-12-22 12:30:48 +01:00
Gerrit Meier ab4b1c4e61 Detect Persistent and RelationshipProperties with Neo4j
See gh-24239
2020-12-22 12:15:03 +01:00
Stephane Nicoll ec683605d4 Polish "Allow to configure Kafka Listener's onlyLogRecordMetadata"
See gh-24582
2020-12-22 09:53:53 +01:00
Martín Dacosta b539e2e749 Allow to configure Kafka Listener's onlyLogRecordMetadata
See gh-24582
2020-12-22 09:53:07 +01:00
Stephane Nicoll 1f71927a9f Merge branch '2.3.x' into 2.4.x
Closes gh-24587
2020-12-22 09:45:42 +01:00
Stephane Nicoll 9e5a6c5228 Harmonize references to ActiveMQ Artemis
Closes gh-24586
2020-12-22 09:44:49 +01:00
Stephane Nicoll 490a40af20 Polish 2020-12-22 08:33:59 +01:00
Stephane Nicoll 338c8c4fc8 Polish "Allow to configure ActiveMQ Artemis with a broker url"
See gh-24302
2020-12-21 17:53:10 +01:00
Justin Bertram 99b43cb690 Allow to configure ActiveMQ Artemis with a broker url
See gh-24302
2020-12-21 17:32:49 +01:00
Stephane Nicoll a6c6655c82 Polish "Upgrade to Jackson 2.12.0"
Guard breaking change to PropertyNamingStrategies so that we tolerate
older Jackson versions.

See gh-24415
2020-12-21 15:51:52 +01:00
Valery Yatsynovich 1f63b82c5b Upgrade to Jackson 2.12.0
See gh-24415
2020-12-21 15:27:44 +01:00
Stephane Nicoll abbdbb07f6 Polish "Upgrade to Embedded Mongo 3.0.0"
See gh-24254
2020-12-21 10:45:18 +01:00
paulius 2f6b51babd Upgrade to Embedded Mongo 3.0.0
See gh-24254
2020-12-21 10:44:52 +01:00
Stephane Nicoll 5da27ea57a Polish "Reduce the overhead of char[] creation"
See gh-24204
2020-12-21 10:24:46 +01:00
Marten Deinum 5121ca5d17 Reduce the overhead of char[] creation
See gh-24204
2020-12-21 10:21:49 +01:00
Stephane Nicoll c063c3434d Merge branch '2.4.x'
Closes gh-24581
2020-12-21 10:03:31 +01:00
dreis2211 f9fbadb8d9 Add JavaVersion entry for JDK 16
See gh-24453
2020-12-21 09:59:52 +01:00
Stephane Nicoll 09fa16c58c Merge branch '2.3.x' into 2.4.x 2020-12-21 09:59:33 +01:00
Stephane Nicoll 306b964ce3 Fix multi-release JAR test on JDK 16
See gh-24453
2020-12-21 09:59:01 +01:00
Stephane Nicoll f4ce82de40 Merge branch '2.4.x'
Closes gh-24580
2020-12-21 09:46:34 +01:00
dreis2211 fb207f73e7 Remove deprecated SpringBootContextLoader#getArgs()
See gh-24550
2020-12-21 09:44:28 +01:00
Stephane Nicoll c78d0370ec Merge branch '2.4.x'
Closes gh-24579
2020-12-21 09:38:52 +01:00
Stephane Nicoll 2c0bfb7674 Merge branch '2.3.x' into 2.4.x
Closes gh-24578
2020-12-21 09:38:37 +01:00
izeye 97dd4c0871 Polish
See gh-24558
2020-12-21 09:35:41 +01:00
Madhura Bhave 13a06e4eca Merge branch '2.4.x' 2020-12-18 18:03:45 -08:00
Madhura Bhave af67e6fa54 Merge branch '2.3.x' into 2.4.x 2020-12-18 18:03:22 -08:00
Madhura Bhave b82f5a408a Add a note about disabling git info
See gh-24205
2020-12-18 18:02:27 -08:00
Madhura Bhave 15a56f81df Merge branch '2.4.x'
Closes gh-24573
2020-12-18 17:27:13 -08:00
Madhura Bhave f9d1a4526c Merge branch '2.3.x' into 2.4.x
Closes gh-24572
2020-12-18 17:26:44 -08:00
Madhura Bhave a5c8b84511 Update version of git-properties plugin in the docs
Closes gh-24567
2020-12-18 17:25:26 -08:00
Madhura Bhave acbe18cf85 Merge branch '2.4.x'
Closes gh-24571
2020-12-18 17:15:26 -08:00
Madhura Bhave c231f3da10 Merge branch '2.3.x' into 2.4.x
Closes gh-24570
2020-12-18 17:15:01 -08:00
Madhura Bhave 302ba77812 Improve documentation regarding git commit info
Closes gh-24205
2020-12-18 17:13:30 -08:00
Phillip Webb 8a67ab0c2d Merge branch '2.4.x'
Closes gh-24569
2020-12-18 16:37:25 -08:00
Phillip Webb 5317d8a9bb Change scope of bootstrap registered Binder
Update `ConfigDataEnvironment` so that the `Binder` is registered as
a prototype bootstrap instance. This allows it to be accessed early
but still replaced when a more complete version is available.

Fixes gh-24559
2020-12-18 15:16:11 -08:00
Phillip Webb e1b158ec66 Add BootstrapRegistry Scope support
Update `BootstrapRegistry` so that it can be used to register instances
in either a `singleton` or `prototype` scope. The prototype scope has
been added so that instances can be registered and replaced later
if needed.

See gh-24559
2020-12-18 15:14:04 -08:00
Phillip Webb 07348066e3 Merge branch '2.4.x' 2020-12-18 15:10:00 -08:00
Phillip Webb f568aa489c Fixup title anchors 2020-12-18 15:06:11 -08:00
Madhura Bhave 9aa1b528df Merge branch '2.4.x'
Closes gh-24566
2020-12-18 14:17:12 -08:00
Madhura Bhave 01537bc54f Merge branch '2.3.x' into 2.4.x
Closes gh-24565
2020-12-18 14:16:45 -08:00
Madhura Bhave c9a09cf6a9 Clarify when SpEL expressions in application properties are evaluated
Closes gh-24531
2020-12-18 14:15:27 -08:00
Madhura Bhave 86d64c727d Merge branch '2.4.x'
Closes gh-24564
2020-12-18 14:05:49 -08:00
Madhura Bhave 55d9951d90 Merge branch '2.3.x' into 2.4.x
Closes gh-24563
2020-12-18 14:05:20 -08:00
Madhura Bhave 1db271c2c5 Reorder documentation about building images
Closes gh-24560
2020-12-18 14:02:29 -08:00
Andy Wilkinson 1c3ace79e5 Merge branch '2.4.x' 2020-12-18 15:26:17 +00:00
Andy Wilkinson e083be7de1 Fix ConfigDataEnvironmentPostProcessorIntegrationTests in Windows 2020-12-18 15:26:03 +00:00
Phillip Webb 82791b4eda Improve performance of Tomcat 'jar:war:file' URLs
Update jar `Handler` fallback logic to directly support Tomcat
'jar:war:file' URLs. This commit allows contents to be accessed without
the JDK needing to extracted the nested jar to the temporary folder.

Closes gh-24553
2020-12-17 22:51:19 -08:00
Phillip Webb 65c3464fce Merge branch '2.4.x'
Closes gh-24555
2020-12-17 20:47:58 -08:00
Phillip Webb 0730949325 Merge branch '2.3.x' into 2.4.x
Closes gh-24554
2020-12-17 20:47:13 -08:00
Phillip Webb c4e41305d5 Prevent Tomcat URL "reflective access" warnings
Update the jar `Handler` class to support a non-reflective fallback
mechanism when possible. The updated code attempts to capture a regular
jar URL before our handler is installed. It can then use that URL as
context when creating the a fallback URL. The JDK jar `Handler` will
be copied from the context URL to the fallback URL.

Without this commit, resolving new Tomcat URLs of the form
`jar:war:file:...` would result in an ugly "Illegal reflective access"
warning.

Fixes gh-18631
2020-12-17 20:43:41 -08:00
Phillip Webb aeaefbee33 Make StandardConfigDataResource.getResource public
Update `StandardConfigDataResource`  to make the `getResource()` method
public so that it can be used by Spring Cloud.

Closes gh-24504
2020-12-16 16:54:49 -08:00
Phillip Webb b2abc8ff3f Only throw PortInUseException if port is set
Refine the `PortInUseException` logic in `NettyWebServer` to only throw
an exception if the port is set. The prevents a misleading exception
from being thrown when a domain socket is being used.

Closes gh-24529
2020-12-16 16:54:49 -08:00
Phillip Webb 5ca01ce5a8 Make StandardConfigDataResource.getResource public
Update `StandardConfigDataResource`  to make the `getResource()` method
public so that it can be used by Spring Cloud.

Closes gh-24504
2020-12-16 16:49:39 -08:00
Phillip Webb d195815488 Only throw PortInUseException if port is set
Refine the `PortInUseException` logic in `NettyWebServer` to only throw
an exception if the port is set. The prevents a misleading exception
from being thrown when a domain socket is being used.

Closes gh-24529
2020-12-16 16:45:16 -08:00
Madhura Bhave 7f51984cbd Merge branch '2.4.x' 2020-12-16 15:34:25 -08:00
Madhura Bhave 4822516fb7 Merge branch '2.3.x' into 2.4.x 2020-12-16 15:33:58 -08:00
Phillip Webb f4258aae06 Merge branch '2.4.x'
Closes gh-24544
2020-12-16 15:30:24 -08:00
Phillip Webb 7fd4c53352 Deal with unsupported DisposableServer operations
Update `NettyWebServer` to deal with any `UnsupportedOperationException`
thrown from `DisposableServer`. Specifically, this commit allows the
`NettyWebServer` to work with domain socket backed servers which cannot
provide a port.

Fixes gh-24529
2020-12-16 15:29:54 -08:00
Madhura Bhave 361198ebba Fix tests
See gh-11987
2020-12-16 15:25:02 -08:00
Madhura Bhave 58f0e253e7 Merge branch '2.4.x'
Closes gh-24543
2020-12-16 14:58:29 -08:00
Madhura Bhave a1ea5b49ec Merge branch '2.3.x' into 2.4.x
Closes gh-24542
2020-12-16 14:57:50 -08:00
Madhura Bhave 09e07428cc Configure CORS in default security configuration for MVC
Fixes gh-11987
2020-12-16 14:55:36 -08:00
Scott Frederick b51caf2c45 Merge branch '2.4.x'
Closes gh-24539
2020-12-16 16:00:09 -06:00
Scott Frederick 4e603d9239 Merge branch '2.3.x' into 2.4.x
Closes gh-24538
2020-12-16 15:59:28 -06:00
Scott Frederick e4d124dc45 Improve error message with Maven build-image and war packaging
Fixes gh-24522
2020-12-16 15:58:53 -06:00
Phillip Webb c8f59e1239 Merge branch '2.4.x'
Closes gh-24537
2020-12-16 13:11:15 -08:00
Phillip Webb d6890e39a7 Merge branch '2.3.x' into 2.4.x
Closes gh-24536
2020-12-16 13:10:35 -08:00
Scott Frederick 1f21933c48 Merge branch '2.4.x'
Closes gh-24534
2020-12-16 15:02:14 -06:00
Scott Frederick dfcabe1665 Merge branch '2.3.x' into 2.4.x
Fixes gh-24521 in 2.4.2
2020-12-16 14:53:55 -06:00
dreis2211 0ec603cdad Avoid duplicates in MergedContextConfiguration
Remove duplicate config attribute classes by using a `Set` rather
than a `List` in the `SpringBootTestContextBootstrapper`.

See gh-24532
2020-12-16 12:50:54 -08:00
Scott Frederick 0e5df2296e Fail with Gradle bootBuildImage and war packaging
Prior to this commit, running the bootBuildImage Gradle task on a
project configured for war packaging would result in a jar file being
built and used in the image instead of the war file. With this commit
an error will be thrown from the plugin in this case.

Fixes gh-24521
2020-12-16 13:23:43 -06:00
Andy Wilkinson 4dd0e9ae54 Merge branch '2.4.x'
Closes gh-24527
2020-12-16 10:01:52 +00:00
Andy Wilkinson 5fdb2ae2fd Protect PluginApplicationActions against absent plugin classes
Closes gh-24526
2020-12-16 09:51:25 +00:00
Phillip Webb 5bd5ca5107 Merge branch '2.4.x'
Closes gh-24524
2020-12-15 19:53:54 -08:00
Phillip Webb 38e4c2a179 Add ConfigDataEnvironmentUpdateListener support
Add an overloaded `ConfigDataEnvironmentPostProcessor.applyTo` method
that accepts a listener that can used to track the updates that were
applied to the `Environment`.

The listener can be used to track the which `ConfigDataLocation` and
the `ConfigDataResource` were used to add a `PropertySource`. The lister
can also be used to tell which profiles were applied.

This enhancement is being added in a patch release because it's will
be useful for Spring Cloud 2020.0.0.

Closes gh-24504
2020-12-15 19:52:20 -08:00
Phillip Webb 5e1a69e90e Polish 2020-12-15 19:51:53 -08:00
Phillip Webb 308c2042ee Merge branch '2.4.x' 2020-12-15 19:49:15 -08:00
Phillip Webb 4fba7d0c60 Merge branch '2.3.x' into 2.4.x 2020-12-15 19:48:52 -08:00
Phillip Webb 29300530c6 Polish 2020-12-15 19:44:40 -08:00
Phillip Webb f855256687 Merge branch '2.4.x' 2020-12-15 11:10:58 -08:00
Phillip Webb a2d0b64e9c Test that empty property files can be used
Add an additional test to ensure that empty property files do not
throw ConfigDataLocationNotFoundException exceptions.

See gh-24499
See gh-24515
2020-12-15 11:10:07 -08:00
Andy Wilkinson 4040105629 Merge branch '2.4.x'
Closes gh-24519
2020-12-15 17:22:01 +00:00
Andy Wilkinson a67edfbeb7 Merge branch '2.3.x' into 2.4.x
Closes gh-24518
2020-12-15 17:21:39 +00:00
Andy Wilkinson 76198f9a8d Include properties from test-autoconfigure in config props appendix
Closes gh-24486
2020-12-15 17:20:21 +00:00
Andy Wilkinson a52fee83f9 Pick up new minor releases when upgrading dependencies
See gh-24491
2020-12-15 14:23:32 +00:00
Andy Wilkinson fb0f27ce2d Move EMFDependsOnPostProcessor into autoconfigure.orm.jpa
Closes gh-24452
2020-12-15 14:20:50 +00:00
Stephane Nicoll 69c6b6b04d Merge branch '2.4.x'
Closes gh-24511
2020-12-15 14:48:38 +01:00
Stephane Nicoll 251e8b2640 Update instruction to add the configuration processor with Maven
Closes gh-24498
2020-12-15 14:48:19 +01:00
Stephane Nicoll 0dcd9efdac Merge branch '2.4.x'
Closes gh-24509
2020-12-15 11:30:04 +01:00
izeye 8e69a821d5 Use BindResult.orElseGet() where beneficial
See gh-24477
2020-12-15 11:26:15 +01:00
Stephane Nicoll 83bdf19934 Polish "Add Apache Phoenix to supported database drivers"
See gh-24114
2020-12-15 11:14:29 +01:00
Vasily Pelikh 305a7d9186 Add Apache Phoenix to supported database drivers
See gh-24114
2020-12-15 11:14:17 +01:00
Stephane Nicoll 59910338c9 Polish "Add configuration for Rabbit's key store and trust store algorithm"
See gh-24076
2020-12-15 10:59:39 +01:00
Gong Yi 489062b203 Add configuration for Rabbit's key store and trust store algorithm
See gh-24076
2020-12-15 10:50:17 +01:00
Phillip Webb 315067b379 Merge branch '2.4.x'
Closes gh-24505
2020-12-14 20:40:35 -08:00
Phillip Webb d1f2aab1e8 Fix non-optional classpath location checking
Allow directory locations that exist but do not contribute properties
to be specified without an `optional:` prefix. This commit fixes logic
introduced in commit 3dc03ac275 which didn't account for the fact that
a directory might contain only profile specific property files and that
profiles might not always be active.

Closes gh-24499
2020-12-14 20:32:13 -08:00
Stephane Nicoll f9e44cd774 Merge branch '2.4.x'
Closes gh-24496
2020-12-14 16:20:11 +01:00
Stephane Nicoll 96510156ae Merge branch '2.3.x' into 2.4.x
Closes gh-24495
2020-12-14 16:19:50 +01:00
Stephane Nicoll 26e7e61919 Merge branch '2.2.x' into 2.3.x
Closes gh-24494
2020-12-14 16:19:23 +01:00
Stephane Nicoll 60f526add0 Remove links to Jetty API and documentation
This commit removes links to Jetty API and documentation as those links
are breaking every time the Jetty team releases a new version

See https://github.com/eclipse/jetty.project/issues/4546

Closes gh-24493
2020-12-14 16:17:25 +01:00
Stephane Nicoll 08b692581a Prepare 2.4.x branch 2020-12-14 14:22:07 +01:00
Phillip Webb 72d36e0c07 Update copyright year of changed files 2020-12-10 10:46:04 -08:00
Phillip Webb 14816a6b6c Support @Name meta-annotations with Kotlin binding
Update `ValueObjectBinder` Kotlin support to meta-annotations of
`@Named`.

See gh-24379
2020-12-10 10:44:15 -08:00
Andy Wilkinson 32e1289bbc Use unique names for wildcard property sources
Update `StandardConfigDataLoader` to use unique names for property
sources imported from a wildcard location.

Prior to this commit, all the property sources created from the same
wildcard location would have the same name. Each time a property source
that is equal to an existing property source is added, it replaces the
existing property source. Property source equality is name-based so this
resulted in the last property sources from the wildcard location
winning.

This commit updates `StandardConfigDataLoader` to use the resolved
Resource rather than the wildcard location in which it was discovered
in the name of the property source that it creates, ensuring that each
is property source from a wildcard location is uniquely named.

Fixes gh-24428
2020-12-10 10:43:34 -08:00
Stephane Nicoll 0533ac58fb Test the Gradle plugin against 6.7.1
Closes gh-24449
2020-12-10 15:33:37 +01:00
izeye 0eae6b4f72 Polish
See gh-24418
2020-12-10 13:53:06 +01:00
Stephane Nicoll 105cf591bf Merge branch '2.3.x'
See gh-24418
2020-12-10 13:52:49 +01:00
Stephane Nicoll ab99de4349 Polish
See gh-24418
2020-12-10 13:52:11 +01:00
Stephane Nicoll 6b858f3b84 Upgrade to Tomcat 9.0.41
Closes gh-24447
2020-12-10 09:30:36 +01:00
Stephane Nicoll dec085fa3c Upgrade to SQLite JDBC 3.32.3.3
Closes gh-24446
2020-12-10 09:30:35 +01:00
Stephane Nicoll 9091161cf9 Upgrade to Netty tcNative 2.0.35.Final
Closes gh-24445
2020-12-10 09:30:33 +01:00
Stephane Nicoll 9d5ea3da29 Upgrade to Netty 4.1.55.Final
Closes gh-24444
2020-12-10 09:30:32 +01:00
Stephane Nicoll 37f79f83ad Upgrade to Caffeine 2.8.8
Closes gh-24443
2020-12-10 09:30:31 +01:00
Stephane Nicoll ba87a0f23a Upgrade to Spring Kafka 2.6.4
Closes gh-24294
2020-12-10 09:28:58 +01:00
Stephane Nicoll 7d032330d2 Upgrade to Spring Batch 4.3.1
Closes gh-24291
2020-12-10 09:27:18 +01:00
Stephane Nicoll 2786b3dd66 Upgrade to Spring Integration 5.4.2
Closes gh-24442
2020-12-10 09:25:36 +01:00
Stephane Nicoll b06e0b50b4 Upgrade to Spring AMQP 2.3.2
Closes gh-24288
2020-12-10 09:24:31 +01:00
Stephane Nicoll d339cb1513 Upgrade to Micrometer 1.6.2
Closes gh-24281
2020-12-10 09:23:41 +01:00
Stephane Nicoll 94b6b62077 Upgrade to Undertow 2.1.5.Final
Closes gh-24441
2020-12-10 09:03:03 +01:00
Stephane Nicoll 30748b8dd0 Upgrade to Tomcat 9.0.41
Closes gh-24440
2020-12-10 09:03:02 +01:00
Stephane Nicoll 264cd83f4b Upgrade to Netty tcNative 2.0.35.Final
Closes gh-24439
2020-12-10 09:03:01 +01:00
Stephane Nicoll 1c720a56b2 Upgrade to Netty 4.1.55.Final
Closes gh-24438
2020-12-10 09:03:00 +01:00
Stephane Nicoll b6b046702f Upgrade to Caffeine 2.8.8
Closes gh-24437
2020-12-10 09:02:58 +01:00
Stephane Nicoll fd91daaf21 Upgrade to ActiveMQ 5.15.14
Closes gh-24436
2020-12-10 09:02:57 +01:00
Stephane Nicoll 5f8900ea0e Upgrade to Spring Kafka 2.5.10
Closes gh-24293
2020-12-10 09:00:35 +01:00
Stephane Nicoll 18e2ce1682 Upgrade to Spring Batch 4.2.5
Closes gh-24290
2020-12-10 08:59:47 +01:00
Stephane Nicoll c08310ca35 Upgrade to Spring AMQP 2.2.13
Closes gh-24287
2020-12-10 08:56:38 +01:00
Stephane Nicoll 388f00612e Upgrade to Micrometer 1.5.9
Closes gh-24427
2020-12-10 08:55:51 +01:00
Stephane Nicoll 7f9d0d2d7c Upgrade to Tomcat 9.0.41
Closes gh-24435
2020-12-10 08:20:55 +01:00
Stephane Nicoll 1094b7c10c Upgrade to Activemq 5.15.14
Closes gh-24434
2020-12-10 08:20:54 +01:00
Stephane Nicoll b8c68ef374 Upgrade to Undertow 2.0.33.Final
Closes gh-24433
2020-12-10 08:20:53 +01:00
Stephane Nicoll a9924c3576 Upgrade to Netty Tcnative 2.0.35.Final
Closes gh-24432
2020-12-10 08:20:51 +01:00
Stephane Nicoll 55b680e452 Upgrade to Netty 4.1.55.Final
Closes gh-24431
2020-12-10 08:20:50 +01:00
Stephane Nicoll 6d5e3b2c0d Upgrade to Caffeine 2.8.8
Closes gh-24430
2020-12-10 08:20:49 +01:00
Stephane Nicoll 60e69c2c3e Upgrade to Spring Kafka 2.3.13
Closes gh-24292
2020-12-10 08:19:26 +01:00
Stephane Nicoll 520b4bba9c Upgrade to Spring Batch 4.2.5
Closes gh-24289
2020-12-10 08:18:45 +01:00
Stephane Nicoll 317ec32458 Upgrade to Spring Integration 5.2.10
Closes gh-24429
2020-12-10 08:18:17 +01:00
Stephane Nicoll 241730bf10 Upgrade to Spring AMQP 2.2.13
Closes gh-24286
2020-12-10 08:17:25 +01:00
Phillip Webb 112503058a Merge branch '2.3.x'
Closes gh-24425
2020-12-09 18:24:22 -08:00
Phillip Webb 0bfa9cf107 Merge branch '2.2.x' into 2.3.x
Closes gh-24424
2020-12-09 18:19:28 -08:00
Phillip Webb 869141766b Use deterministic ordering of JavaBean methods
Update `JavaBeanBinder` so that methods and fields are sorted before
being processed. This ensures that setters are called in a deterministic
order, rather than the unspecified and variable order that reflection
provides.

Fixes gh-24068
2020-12-09 18:19:07 -08:00
Stephane Nicoll e9aa070c6f Upgrade to Spring Data 2020.0.2
Closes gh-24284
2020-12-09 17:32:08 +01:00
Stephane Nicoll f4ed2e72c5 Upgrade to Spring Data Neumann-SR6
Closes gh-24283
2020-12-09 17:30:13 +01:00
Stephane Nicoll 6a8ad73e2e Upgrade to Spring Data Moore-SR12
Closes gh-24282
2020-12-09 17:27:30 +01:00
Stephane Nicoll 0d472d6f74 Start building against Spring Data 2020.0.2 snapshots
See gh-24284
2020-12-09 14:16:47 +01:00
Stephane Nicoll 922a7a4f8c Upgrade to Spring HATEOAS 1.2.2
Closes gh-24285
2020-12-09 14:14:27 +01:00
Stephane Nicoll 84b92bc531 Upgrade to Spring HATEOAS 1.1.3
Closes gh-24419
2020-12-09 14:12:33 +01:00
Stephane Nicoll f375048620 Upgrade to Spring Framework 5.3.2
Closes gh-24278
2020-12-09 10:55:25 +01:00
Stephane Nicoll 52b5c36750 Upgrade to Micrometer 1.5.8
Closes gh-24280
2020-12-09 10:52:26 +01:00
Stephane Nicoll 8c676a43bd Upgrade to Spring Framework 5.2.12
Closes gh-24277
2020-12-09 10:51:54 +01:00
Stephane Nicoll 275816d9f9 Upgrade to Micrometer 1.3.16
Closes gh-24279
2020-12-09 10:49:35 +01:00
Stephane Nicoll e961afd64f Upgrade to Spring Framework 5.2.12
Closes gh-24276
2020-12-09 10:48:56 +01:00
Phillip Webb bef5fe29e3 Allow recursive profile group references
Update the original fix for issue #24327 so that recursive elements
are tolerated rather than fail.

See gh-24327
2020-12-08 18:58:05 -08:00
Phillip Webb 0931f04eb0 Polish 'Fail on recursive references in profile groups'
See gh-24327
2020-12-08 18:13:57 -08:00
dreis2211 5b74f77ac6 Fail on recursive references in profile groups
Update `Profiles` group expansion logic to fail if recursive
references are found.

See gh-24327
2020-12-08 18:13:56 -08:00
Phillip Webb 0d157e046f Fix checkstyle violations
See gh-21015
2020-12-08 18:12:30 -08:00
Phillip Webb e95c514661 Merge branch '2.3.x'
Closes gh-24412
2020-12-08 17:28:18 -08:00
Phillip Webb 49e754f48b Merge branch '2.2.x' into 2.3.x
Closes gh-24411
2020-12-08 17:23:33 -08:00
Phillip Webb 286ef61071 Narrow auto-configure checkstyle suppressions
Closes gh-21015
2020-12-08 17:04:03 -08:00
Phillip Webb b48f4028a3 Merge branch '2.3.x' 2020-12-08 16:32:45 -08:00
Phillip Webb 30717b6ae3 Merge branch '2.2.x' into 2.3.x 2020-12-08 16:32:26 -08:00
Phillip Webb 4f95486822 Polish note about Maven/Gradle restarts
See gh-24271
2020-12-08 16:31:46 -08:00
Phillip Webb b9e87a4ab2 Merge branch '2.3.x'
Closes gh-24410
2020-12-08 16:25:16 -08:00
Phillip Webb 445c6b8aa6 Merge branch '2.2.x' into 2.3.x
Closes gh-24409
2020-12-08 16:25:03 -08:00
Phillip Webb 10d3121e27 Polish "Triggering a restart" formatting
See gh-24271
2020-12-08 16:24:18 -08:00
Billy T. Hernandez 0503079dc5 Document devtools restart with Maven/Gradle
Update the documentation to help avoid confusion for people who aren't
using an IDE.

See gh-24271
2020-12-08 16:20:32 -08:00
Phillip Webb 3618bddf51 Merge branch '2.3.x'
Closes gh-24408
2020-12-08 16:15:31 -08:00
Phillip Webb 06531b9b71 Merge branch '2.2.x' into 2.3.x
Closes gh-24407
2020-12-08 16:08:32 -08:00
Phillip Webb 89642f0ce8 Add link to appendix from error handling
Improve documentation by adding a link from the "Error Handling" section
to the appendix.

Closes gh-24265
2020-12-08 16:06:21 -08:00
Phillip Webb cd5ff6e4af Merge branch '2.3.x'
Closes gh-24404
2020-12-08 12:13:02 -08:00
Phillip Webb 11f285bde5 Merge branch '2.2.x' into 2.3.x
Closes gh-24403
2020-12-08 12:12:51 -08:00
izeye 8c55803931 Polish
See gh-24306
2020-12-08 12:08:35 -08:00
Stephane Nicoll 93d83342d2 Merge branch '2.3.x'
Closes gh-24401
2020-12-08 15:42:52 +01:00
Stephane Nicoll 06671aa50e Stop deferring JPA bootstrap mode by default
This commit changes the default value of bootstrap-mode to "default"
rather than "deferred" so that the JPA infrastructure starts in the
main thread rather than asynchronously.

Closes gh-24249
2020-12-08 15:42:14 +01:00