root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
33,809 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

14386 Commits

Author SHA1 Message Date
Andy Wilkinson 669caa92f8 Upgrade to Spring Kafka 2.6.11 
Closes gh-28227
 2021-10-19 14:32:33 +01:00
Andy Wilkinson c8e0791b50 Merge branch '2.4.x' into 2.5.x 
Closes gh-28379
 2021-10-19 14:17:53 +01:00
Andy Wilkinson 5fe75f3d58 Improve diagnostics when no DSLContext due to R2DBC 
Fixes gh-28378
 2021-10-19 13:52:45 +01:00
Andy Wilkinson bc2bf840b4 Fix conditions on DevToolsR2dbcAutoConfiguration 
See gh-28345
 2021-10-19 11:03:20 +01:00
Phillip Webb b93a629dbe Shutdown in-memory R2DBC databases before devtools restart 
Add `DevToolsR2dbcAutoConfiguration` to automatically shutdown in-memory
R2DBC databases before restarting. Prior to this commit, restarts that
involved SQL initialization scripts could fail due to dirty database
content.

The `DevToolsR2dbcAutoConfiguration` class is similar in design to
`DevToolsDataSourceAutoConfiguration`, but it applies to both pooled
and non-pooled connection factories. The `DataSource` variant does not
need to deal with non-pooled connections due to the fact that
`EmbeddedDataSourceConfiguration` calls `EmbeddedDatabase.shutdown`
as a `destroyMethod`. With R2DB we don't have an `EmbeddedDatabase`
equivalent so we can always trigger a shutdown for devtools.

Fixes gh-28345
 2021-10-18 21:46:12 -07:00
Phillip Webb 19d3007806 Polish 2021-10-18 21:44:56 -07:00
Andy Wilkinson f87b2478d5 Upgrade to Spring AMQP 2.3.11 
Closes gh-28245
 2021-10-18 19:14:28 +01:00
Andy Wilkinson 754b52c6bc Upgrade to Spring AMQP 2.3.11 
Closes gh-28226
 2021-10-18 19:12:19 +01:00
Andy Wilkinson 5f4c001316 Merge branch '2.4.x' into 2.5.x 
Closes gh-28371
 2021-10-18 15:06:58 +01:00
Andy Wilkinson a93cf64834 Make JMX endpoints available when lazy init is enabled 
Closes gh-28335
 2021-10-18 13:37:45 +01:00
Andy Wilkinson a722fe46fb Upgrade to Spring Data 2020.0.14 
Closes gh-28225
 2021-10-18 13:32:15 +01:00
Andy Wilkinson 779439311d Revert "Upgrade to Spring Data 2020.0.14" 
This reverts commit 752789d3ee.

See gh-28225
 2021-10-18 12:59:20 +01:00
Andy Wilkinson c1ca16c971 Revert "Start building against Spring Batch 4.3.4 snapshots" 
This reverts commit c0605ffc71.

See gh-28250
 2021-10-18 12:31:23 +01:00
Andy Wilkinson 22e7ba6f64 Revert "Start building against Spring Batch 4.3.4 snapshots" 
This reverts commit 33ffae8e74.

See gh-28230
 2021-10-18 12:30:20 +01:00
Andy Wilkinson 16dbdc5d88 Upgrade to Spring Data 2021.0.6 
Closes gh-28244
 2021-10-18 12:28:20 +01:00
Andy Wilkinson 752789d3ee Upgrade to Spring Data 2020.0.14 
Closes gh-28225
 2021-10-18 12:26:24 +01:00
Andy Wilkinson 196013fc39 Merge branch '2.4.x' into 2.5.x 
See gh-28241
 2021-10-18 10:23:31 +01:00
Andy Wilkinson b32a38a814 Work around unwanted static resource warnings from WebFlux and MVC 
See gh-28223
 2021-10-18 10:15:53 +01:00
Stephane Nicoll a445304584 Upgrade to Netty 4.1.69.Final 
Closes gh-28360
 2021-10-15 11:36:47 +02:00
Stephane Nicoll bad37f9e37 Upgrade to Netty 4.1.69.Final 
Closes gh-28359
 2021-10-15 11:30:53 +02:00
Stephane Nicoll 1a1d074f5b Upgrade to Spring HATEOAS 1.3.5 
Closes gh-28243
 2021-10-15 10:07:02 +02:00
Stephane Nicoll e3a2d42a96 Upgrade to Micrometer 1.7.5 
Closes gh-28242
 2021-10-15 10:06:33 +02:00
Stephane Nicoll c743442a78 Upgrade to Spring HATEOAS 1.2.10 
Closes gh-28358
 2021-10-15 09:58:05 +02:00
Stephane Nicoll a569786b79 Upgrade to Micrometer 1.6.12 
Closes gh-28224
 2021-10-15 09:57:29 +02:00
Phillip Webb a93304c973 Merge branch '2.4.x' into 2.5.x 
Closes gh-28356
 2021-10-14 21:48:53 -07:00
Phillip Webb 7388f2b60b Attempt to reduce JarFileWrapper heap consumption 
Update `JarURLConnection` to use a single shared wrapper per
jar file rather than creating a new one each time. This update
should help to reduce GC pressure.

Fixes gh-28042
 2021-10-14 21:48:01 -07:00
Phillip Webb 467e063d4b Merge branch '2.4.x' into 2.5.x 2021-10-14 17:40:47 -07:00
Phillip Webb 8e704aab48 Restore 'javax.xml.bind:jaxb-api' exclusion 
Restore the 'javax.xml.bind:jaxb-api' exclusion from `xmlunit-core`
which is actually required when using Maven on Java 9+.

The `CheckClasspathForUnnecessaryExclusions` cannot deal with profile
specific dependencies so an exception has been hard coded.

See gh-28332
 2021-10-14 17:38:05 -07:00
Phillip Webb 670d1672de Revert "Remove unnecessary bind-api dependency from test starter" 
This reverts commit 9867651024.

See gh-28085
 2021-10-14 14:26:02 -07:00
Phillip Webb cf8a1b8b04 Merge branch '2.4.x' into 2.5.x 
Closes gh-28353
 2021-10-14 12:24:04 -07:00
Phillip Webb b68b3737d7 Sanitize flattened VCAP_SERVICES properties 
Update `Sanitizer` to also include flattened `vcap.services.*`
properties.

Fixes gh-28085
 2021-10-14 12:22:57 -07:00
Phillip Webb aeadb0ceb6 Merge branch '2.4.x' into 2.5.x 
Closes gh-28351
 2021-10-14 12:16:38 -07:00
Andy Wilkinson 540468b2f0 Fix parsing of day duration meter values 
Switch `MeterValue` parsing logic so that we try `Duration` before
`double`. Prior to this commit, the value `1d` would result in `1.0`
rather than "1 day".

Fixes gh-28302
 2021-10-14 12:13:39 -07:00
Phillip Webb a9df8c3ef4 Merge branch '2.4.x' into 2.5.x 
Closes gh-28349
 2021-10-14 12:05:22 -07:00
Martin Vietz 9867651024 Remove unnecessary bind-api dependency from test starter 
See gh-28344
 2021-10-14 12:02:57 -07:00
Phillip Webb 2430d8a41a Merge branch '2.4.x' into 2.5.x 
Closes gh-28347
 2021-10-14 11:27:17 -07:00
Phillip Webb 4dc5142128 Prevent cache from consuming too much memory 
Change the cache in `CachingOperationInvoker` to be a reference based
map and also clean stale entries when a specific threshold is met.

Fixes gh-28313
 2021-10-14 11:23:56 -07:00
Andy Wilkinson 865615e099 Merge branch '2.4.x' into 2.5.x 
Closes gh-28340
 2021-10-14 14:10:33 +01:00
Andy Wilkinson ce1a1415ab Use official Jakarta Management API dependency in ActiveMQ starter 
Fixes gh-28339
 2021-10-14 14:10:18 +01:00
Andy Wilkinson 3800f060b5 Merge branch '2.4.x' into 2.5.x 
Closes gh-28336
 2021-10-14 13:42:54 +01:00
Andy Wilkinson 2fb8c8d27e Check starters for unnecessary exclusions 
Closes gh-28332
 2021-10-14 13:37:53 +01:00
Stephane Nicoll 0dcdabed9e Upgrade to Spring Framework 5.3.11 
Closes gh-28241
 2021-10-14 14:20:06 +02:00
Stephane Nicoll 26d0afc205 Upgrade to Spring Framework 5.3.11 
Closes gh-28223
 2021-10-14 14:18:54 +02:00
Andy Wilkinson 5fd5556b1f Merge branch '2.4.x' into 2.5.x 
Closes gh-28333
 2021-10-14 10:37:16 +01:00
Martin Vietz a10db66b16 Remove unnecessary mail dependency from oauth2-client starter 
See gh-28308
 2021-10-14 10:36:16 +01:00
Andy Wilkinson d3037103fe Merge branch '2.4.x' into 2.5.x 
Closes gh-28330
 2021-10-14 10:13:24 +01:00
Andy Wilkinson 9f13941c2f Prohibit org.jboss.spec.* dependencies 
Closes gh-28329
 2021-10-14 10:09:30 +01:00
Phillip Webb 02b577390f Merge branch '2.4.x' into 2.5.x 2021-10-13 18:47:51 -07:00
Phillip Webb 0561992c2a Update copyright year of changed files 2021-10-13 18:45:38 -07:00
Phillip Webb 9abf9e6731 Modify more tests for static resource location filtering 
Fix `WebFluxAutoConfigurationTests` following upstream Spring Framework
changes. Also refine `WebMvcAutoConfigurationTests` to check the locations
are set even if they are filtered.

See gh-28223
 2021-10-13 18:45:22 -07:00
Scott Frederick f427ea5802 Merge branch '2.4.x' into 2.5.x 
Closes gh-28304
 2021-10-12 18:00:15 -05:00
Scott Frederick 3d21ac7a20 Add required id field to Spring Data Neo4j test class 
Fixes gh-28303
 2021-10-12 17:59:19 -05:00
Scott Frederick 3755c563df Merge branch '2.4.x' into 2.5.x 2021-10-12 16:45:51 -05:00
Scott Frederick 3c6e061917 Remove unused import 
See gh-28223
 2021-10-12 16:45:43 -05:00
Scott Frederick ec6bfa8062 Merge branch '2.4.x' into 2.5.x 2021-10-12 16:17:48 -05:00
Scott Frederick 207b76c39e Modify tests to expect filtering of static resource locations 
Spring Framework will filter non-existent locations from any configured
static resource handlers starting with 5.3.11. Tests that verify
static resource locations should account for this change.

See gh-28223
 2021-10-12 16:17:16 -05:00
Stephane Nicoll f04da491b2 Upgrade to Reactor 2020.0.12 
Closes gh-28240
 2021-10-12 16:06:21 +02:00
Stephane Nicoll fdf4e14f54 Upgrade to Reactor 2020.0.12 
Closes gh-28222
 2021-10-12 16:05:47 +02:00
Stephane Nicoll 3e1b91911a Upgrade to Undertow 2.2.12.Final 
Closes gh-28289
 2021-10-11 11:33:42 +02:00
Stephane Nicoll 9118644d2a Upgrade to R2DBC Bom Arabba-SR11 
Closes gh-28287
 2021-10-11 11:33:40 +02:00
Stephane Nicoll 3e8229e6a1 Upgrade to Postgresql 42.2.24 
Closes gh-28286
 2021-10-11 11:33:39 +02:00
Stephane Nicoll ed77189d69 Upgrade to Netty tcNative 2.0.44.Final 
Closes gh-28285
 2021-10-11 11:33:38 +02:00
Stephane Nicoll c5abb57bdb Upgrade to Lombok 1.18.22 
Closes gh-28284
 2021-10-11 11:33:37 +02:00
Stephane Nicoll 45507a3d19 Upgrade to Jetty 9.4.44.v20210927 
Closes gh-28283
 2021-10-11 11:33:36 +02:00
Stephane Nicoll 5c0b76ec18 Upgrade to Jaybird 4.0.4.java8 
Closes gh-28282
 2021-10-11 11:33:35 +02:00
Stephane Nicoll f2a5c6bcd0 Upgrade to HttpCore5 5.1.2 
Closes gh-28281
 2021-10-11 11:33:34 +02:00
Stephane Nicoll 706eb6df60 Upgrade to Dropwizard Metrics 4.1.26 
Closes gh-28280
 2021-10-11 11:33:32 +02:00
Stephane Nicoll 1662fc915e Upgrade to Jetty 9.4.44.v20210927 
Closes gh-28277
 2021-10-11 08:42:24 +02:00
Stephane Nicoll bff1ed0e2f Upgrade to Undertow 2.2.12.Final 
Closes gh-28276
 2021-10-11 08:41:55 +02:00
Stephane Nicoll 32397d7bfb Upgrade to R2DBC Bom Arabba-SR11 
Closes gh-28274
 2021-10-11 08:41:53 +02:00
Stephane Nicoll 010713df1b Upgrade to Postgresql 42.2.24 
Closes gh-28273
 2021-10-11 08:41:52 +02:00
Stephane Nicoll 1e834bfcf5 Upgrade to Netty tcNative 2.0.44.Final 
Closes gh-28272
 2021-10-11 08:41:51 +02:00
Stephane Nicoll 3d9cc639fa Upgrade to Lombok 1.18.22 
Closes gh-28271
 2021-10-11 08:41:50 +02:00
Stephane Nicoll 43401239ca Upgrade to Dropwizard Metrics 4.1.26 
Closes gh-28270
 2021-10-11 08:41:49 +02:00
Andy Wilkinson d47260637b Merge branch '2.4.x' into 2.5.x 
Closes gh-28262
 2021-10-08 12:39:17 +01:00
Andy Wilkinson c5d45585d9 Remove unnecessary overrides of finalize 
Closes gh-28209
 2021-10-08 12:39:00 +01:00
Stephane Nicoll c0605ffc71 Start building against Spring Batch 4.3.4 snapshots 
See gh-28250
 2021-10-08 07:52:56 +02:00
Stephane Nicoll 98bc8e711d Start building against Spring Integration 5.5.5 snapshots 
See gh-28249
 2021-10-08 07:52:12 +02:00
Stephane Nicoll b0aa1cdb00 Start building against Spring Session 2021.0.3 snapshots 
See gh-28248
 2021-10-08 07:51:20 +02:00
Stephane Nicoll a9513ccf07 Start building against Spring Security 5.5.3 snapshots 
See gh-28247
 2021-10-08 07:51:19 +02:00
Stephane Nicoll 5396a980c3 Start building against Spring Kafka 2.7.8 snapshots 
See gh-28246
 2021-10-08 07:49:29 +02:00
Stephane Nicoll 123e93f1d5 Start building against Spring AMQP 2.3.11 snapshots 
See gh-28245
 2021-10-08 07:48:38 +02:00
Stephane Nicoll bbdb74bff0 Start building against Spring Data 2021.0.6 snapshots 
See gh-28244
 2021-10-08 07:47:37 +02:00
Stephane Nicoll 70b0fa4512 Start building against Spring HATEOAS 1.3.5 snapshots 
See gh-28243
 2021-10-08 07:46:51 +02:00
Stephane Nicoll 69e7fe1c57 Start building against Micrometer 1.7.5 snapshots 
See gh-28242
 2021-10-08 07:46:04 +02:00
Stephane Nicoll 737cea0d73 Start building against Spring Framework 5.3.11 snapshots 
See gh-28241
 2021-10-08 07:45:15 +02:00
Stephane Nicoll 24ada6f240 Start building against Reactor 2020.0.12 snapshots 
See gh-28240
 2021-10-08 07:44:35 +02:00
Stephane Nicoll 33ffae8e74 Start building against Spring Batch 4.3.4 snapshots 
See gh-28230
 2021-10-07 09:07:50 +02:00
Stephane Nicoll 092d3fa81e Start building against Spring Session 2020.0.7 snapshots 
See gh-28229
 2021-10-07 09:07:22 +02:00
Stephane Nicoll 41eded4b8b Start building against Spring Security 5.4.9 snapshots 
See gh-28228
 2021-10-07 09:06:54 +02:00
Stephane Nicoll f8d6d76410 Start building against Spring Kafka 2.6.11 snapshots 
See gh-28227
 2021-10-07 09:06:24 +02:00
Stephane Nicoll 3cf1888cef Start building against Spring AMQP 2.3.11 snapshots 
See gh-28226
 2021-10-07 09:06:00 +02:00
Stephane Nicoll 6c801b9db9 Start building against Spring Data 2020.0.14 snapshots 
See gh-28225
 2021-10-07 09:05:35 +02:00
Stephane Nicoll 81da876964 Start building against Micrometer 1.6.12 snapshots 
See gh-28224
 2021-10-07 09:05:09 +02:00
Stephane Nicoll 9f06a5fe21 Start building against Spring Framework 5.3.11 snapshots 
See gh-28223
 2021-10-07 09:04:28 +02:00
Stephane Nicoll dd802ba5e0 Start building against Reactor 2020.0.12 snapshots 
See gh-28222
 2021-10-07 09:03:57 +02:00
Andy Wilkinson 1931104d13 Merge branch '2.4.x' into 2.5.x 
Closes gh-28206
 2021-10-06 09:57:19 +01:00
Andy Wilkinson 9c9fbf400e Upgrade to Spring Java Format 0.0.29 
Closes gh-28205
 2021-10-06 09:52:45 +01:00
Madhura Bhave 9f4cf8398b Merge branch '2.4.x' into 2.5.x 
Closes gh-28201
 2021-10-05 15:46:04 -07:00
Madhura Bhave 61736e9958 Polish " Update configtree docs about dot notation being correctly mapped" 
See gh-28170
 2021-10-05 15:43:20 -07:00
deb-von-seggern 8f91fc450d Update configtree docs about dot notation being correctly mapped 
See gh-28170
 2021-10-05 15:14:02 -07:00
Andy Wilkinson 437a1601ef Fix broken content negotiation for Prometheus with OpenMetrics 
Update Prometheus `TextOutputFormat` so that OpenMetrics is used in
preference to text output when an appropriate accept header is found.

If the accept header contains `*/*` or is missing then the text format
will be used.

See gh-28130
 2021-10-05 11:11:52 +01:00
Phillip Webb d8141e6a8d Allow Producible enums to indicate a default value 
Add an `isDefault()` method to `Producible` which can be used to
indicate which of the enum values should be used when the accept header
is `*/*` or `null`.

Prior to this commit, the last enum value was always used as the
default.

See gh-28130
 2021-10-05 09:39:28 +01:00
Stephane Nicoll d22167b96a Merge branch '2.4.x' into 2.5.x 
Closes gh-28193
 2021-10-05 08:35:24 +02:00
Pratik Gupta a3423f1edf Fix log4j2 file name reference in reference doc 
See gh-28189
 2021-10-05 08:32:59 +02:00
Andy Wilkinson ff3eed73ee Merge branch '2.4.x' into 2.5.x 
Closes gh-28190
 2021-10-04 10:21:49 +01:00
Andy Wilkinson b7a2a2d5e0 Set last access and last modified times in layertools extract 
Closes gh-28167
 2021-10-04 10:17:11 +01:00
Madhura Bhave 3249d05464 Merge branch '2.4.x' into 2.5.x 
Closes gh-28171
 2021-10-01 15:54:49 -07:00
Susmitha f94caed7e9 Update ConstructorBinding javadoc with usage information 
See gh-28168
 2021-10-01 15:53:43 -07:00
Andy Wilkinson d238566920 Merge branch '2.4.x' into 2.5.x 
See gh-28134
 2021-10-01 11:32:22 +01:00
Andy Wilkinson a73293350a Fix parsing of portless IPv6 spring.rabbitmq.addresses 
Closes gh-28133
 2021-10-01 11:30:11 +01:00
Stephane Nicoll 1c139b1d23 Merge branch '2.4.x' into 2.5.x 
Closes gh-28159
 2021-10-01 08:13:49 +02:00
Stephane Nicoll bedd749e1c Polish "Clarify use of @AutoConfigureTestEntityManager" 
See gh-28086
 2021-10-01 08:12:01 +02:00
Leo Li 70f64f2c26 Clarify use of @AutoConfigureTestEntityManager 
This commit makes it clearer that, when using
@AutoConfigureTestEntityManager outside of @DataJpaTest, any tests using
the test entity manager must be @Transactional.

See gh-28086
 2021-10-01 07:55:57 +02:00
Andy Wilkinson 9e484e2cdc Merge branch '2.4.x' into 2.5.x 
Closes gh-28152
 2021-09-30 17:05:39 +01:00
Andy Wilkinson 3824512357 Tighten up build's task interdependencies 
Closes gh-28103
 2021-09-30 15:35:39 +01:00
Phillip Webb fcb6f557f7 Merge branch '2.4.x' into 2.5.x 
Closes gh-28134
 2021-09-26 13:06:14 -07:00
Phillip Webb 01a39aaf6a Support IPv6 addresses in spring.rabbitmq.addresses 
Refine parsing logic in `RabbitProperties` so that IPv6 addresses can
be used.

Fixes gh-28133
 2021-09-26 13:05:17 -07:00
Andy Wilkinson ef18a2166d Merge branch '2.4.x' into 2.5.x 
Closes gh-28119
 2021-09-23 13:23:40 +01:00
Andy Wilkinson 5957dfeea4 Don't include binary jars in loader-tools source jar 
Closes gh-28113
 2021-09-23 13:23:29 +01:00
Stephane Nicoll 4652bb7adf Upgrade to SendGrid 4.7.5 
Closes gh-28109
 2021-09-23 07:34:55 +02:00
Andy Wilkinson 2ba593328f Order detector for AbstractDataSourceInitializers 
Previously, the detector for AbstractDataSourceInitializers used the
default detector order. This resulted in the initializers detected
initializers running before Flyway. Constrastingly, the detector for
DataSourceScriptDatabaseInitializers uses a custom order so its
detected initializers would run after Flyway.

This commit aligns the order of the detector for
AbstractDataSourceInitializers with the order of the detector for
DataSourceScriptDatabaseInitializers. This ensures that script-based
initialization runs in the same order with respect to Flyway,
irrespective of which initializer implementation is driving it.

Fixes gh-28079
 2021-09-22 18:30:44 +01:00
Stephane Nicoll 77b778ce95 Document support for Java 17 
Closes gh-26767
 2021-09-22 08:58:29 +02:00
Stephane Nicoll 01809eccf3 Upgrade to jOOQ 3.14.15 
Closes gh-28088
 2021-09-22 08:31:04 +02:00
Stephane Nicoll 7a04966d5c Upgrade to jOOQ 3.14.15 
Closes gh-28087
 2021-09-22 08:29:24 +02:00
Phillip Webb 8c3db23be3 Merge branch '2.4.x' into 2.5.x 
Closes gh-28083
 2021-09-21 15:53:37 -07:00
cdalexndr 798b282e58 Document that devtools restart doesn't work with AspectJ weaving 
See gh-28071
 2021-09-21 15:51:36 -07:00
Phillip Webb a862ebc254 Merge branch '2.4.x' into 2.5.x 
Closes gh-28081
 2021-09-21 15:20:19 -07:00
Phillip Webb bbb4ac1542 Sanitize SPRING_APPLICATION_JSON by default 
Update `Sanitizer` default keys to include `SPRING_APPLICATION_JSON`.

Fixes gh-28045
 2021-09-21 15:18:50 -07:00
Phillip Webb 40d65a74dc Merge branch '2.4.x' into 2.5.x 2021-09-21 14:43:38 -07:00
Phillip Webb ec12d51f30 Polish 2021-09-21 14:00:28 -07:00
Stephane Nicoll 8fe226d832 Upgrade to Spring Integration 5.5.4 
Closes gh-27949
 2021-09-21 20:53:04 +02:00
Stephane Nicoll 7ebf71ab66 Upgrade to Spring Integration 5.4.11 
Closes gh-27948
 2021-09-21 20:52:05 +02:00
Phillip Webb 5ba69634c9 Merge branch '2.4.x' into 2.5.x 2021-09-21 11:17:55 -07:00
Phillip Webb dfd36673f7 Update copyright year of changed files 2021-09-21 11:17:19 -07:00
Phillip Webb cfeafee826 Polish 2021-09-21 11:16:46 -07:00
Stephane Nicoll 4ee249c700 Merge branch '2.4.x' into 2.5.x 
Closes gh-28072
 2021-09-21 08:18:39 +02:00
Stephane Nicoll 15de85d89a Polish contribution 
See gh-28061
 2021-09-21 08:18:08 +02:00
Leo Li 0374c3d563 Add default value for "s.d.elasticsearch.client.reactive.endpoints" 
See gh-28061
 2021-09-21 08:12:21 +02:00
Andy Wilkinson b2b691b1d0 Merge branch '2.4.x' into 2.5.x 
Closes gh-28069
 2021-09-20 19:04:48 +01:00
Andy Wilkinson c2361aeb04 Make WebMvcMetricsFilter set status consistently for all exceptions 
Closes gh-27988
 2021-09-20 18:07:18 +01:00
Andy Wilkinson 6f555c4012 Upgrade to Spring Kafka 2.7.7 
Closes gh-27918
 2021-09-20 09:59:47 +01:00
Andy Wilkinson e5cdf819a0 Upgrade to Spring Data 2021.0.5 
Closes gh-27917
 2021-09-20 09:59:06 +01:00
Andy Wilkinson c0895befc2 Upgrade to Spring Data 2020.0.13 
Closes gh-27912
 2021-09-20 09:56:51 +01:00
Andy Wilkinson 8364840cd5 Merge branch '2.4.x' into 2.5.x 
Closes gh-28047
 2021-09-17 12:25:13 +01:00
Andy Wilkinson eacb9273e3 Polish property mapping in reactive Elastic REST client auto-config 
Closes gh-28038
 2021-09-17 12:00:45 +01:00
Stephane Nicoll babf43bdef Upgrade to Spring HATEOAS 1.3.4 
Closes gh-27970
 2021-09-16 21:39:03 +02:00
Stephane Nicoll 97348f14f7 Upgrade to Spring HATEOAS 1.2.9 
Closes gh-27969
 2021-09-16 21:38:28 +02:00
Andy Wilkinson 9df099e343 Polish 2021-09-16 12:11:34 +01:00
Andy Wilkinson a4f1d32203 Register application shutdown hook lazily 
Previously, SpringApplicationShutdownHook would always register a
shutdown hook, even if SpringApplication was configured not to
use a shutdown hook, such as in a war deployment. This could
result in a memory leak when the war was undeployed. The shutdown
hook registered by SpringApplicationShutdownHook would remain
registered, pinning the web application's class loader in memory.

This commit updates SpringApplicationShutdownHook so that it
registers a shutdown hook with the JVM lazily, upon registeration
of the first application context.

Fixes gh-27987
 2021-09-16 10:38:29 +01:00
Andy Wilkinson afb81f14ea Merge branch '2.4.x' into 2.5.x 
Closes gh-28032
 2021-09-16 09:55:45 +01:00
Andy Wilkinson 1900a11f8a Fix Undertow's resource loading when filename contains reserved chars 
Fixes gh-9283
 2021-09-16 09:55:26 +01:00
Stephane Nicoll 50308ad6a9 Upgrade to Lettuce 6.1.5.RELEASE 
Closes gh-28031
 2021-09-16 08:20:52 +02:00
Stephane Nicoll 7f15a37909 Upgrade to Netty tcNative 2.0.43.Final 
Closes gh-28030
 2021-09-16 07:52:15 +02:00
Stephane Nicoll cee3449653 Upgrade to Lettuce 6.0.8.RELEASE 
Closes gh-28029
 2021-09-16 07:52:13 +02:00
Stephane Nicoll 17c35c7e31 Upgrade to Micrometer 1.7.4 
Closes gh-27916
 2021-09-16 06:36:50 +02:00
Stephane Nicoll 3118c16c48 Upgrade to Micrometer 1.6.11 
Closes gh-27910
 2021-09-16 06:36:11 +02:00
Stephane Nicoll 915f565435 Upgrade to Spring Framework 5.3.10 
Closes gh-27915
 2021-09-15 12:11:59 +02:00
Stephane Nicoll 4ada440b4d Upgrade to Spring Framework 5.3.10 
Closes gh-27909
 2021-09-15 12:11:13 +02:00
Scott Frederick a540da11ad Merge branch '2.4.x' into 2.5.x 
Closes gh-27993
 2021-09-14 16:45:34 -05:00
Scott Frederick c8ff874e91 Add builderFor label to ephemeral builder image 
Adding a label to the ephemeral builder image cloned from the base
builder image eliminates contention between builds that are run
concurrently. Without this label, concurrent builds could result in
a race condition in the Docker daemon if the ephemeral builder image
shared by builds was deleted by both builds at exactly the same time.

Fixes gh-27888
 2021-09-14 15:22:23 -05:00
Stephane Nicoll c7ded01d05 Upgrade to Reactor 2020.0.11 
Closes gh-27914
 2021-09-14 18:41:02 +02:00
Stephane Nicoll bb693d73a6 Upgrade to Reactor 2020.0.11 
Closes gh-27908
 2021-09-14 18:40:12 +02:00
Stephane Nicoll 242631f40e Upgrade to Netty tcNative 2.0.43.Final 
Closes gh-27986
 2021-09-14 07:15:35 +02:00
Stephane Nicoll 441037ce18 Upgrade to Netty 4.1.68.Final 
Closes gh-27985
 2021-09-14 07:15:34 +02:00
Stephane Nicoll 9c6138fa1c Upgrade to Maven War Plugin 3.3.2 
Closes gh-27984
 2021-09-14 07:15:33 +02:00
Stephane Nicoll 8454812df1 Upgrade to Logback 1.2.6 
Closes gh-27983
 2021-09-14 07:15:32 +02:00
Stephane Nicoll 5813021b7b Upgrade to Kotlin Coroutines 1.5.2 
Closes gh-27982
 2021-09-14 07:15:31 +02:00
Stephane Nicoll 3e221094c0 Upgrade to jOOQ 3.14.14 
Closes gh-27980
 2021-09-14 07:15:29 +02:00
Stephane Nicoll afba450e53 Upgrade to Jetty EL 9.0.52 
Closes gh-27979
 2021-09-14 07:15:28 +02:00
Stephane Nicoll d8254af351 Upgrade to Jackson Bom 2.12.5 
Closes gh-27978
 2021-09-14 07:15:27 +02:00
Stephane Nicoll c624dc9c78 Upgrade to Gson 2.8.8 
Closes gh-27977
 2021-09-14 07:15:26 +02:00
Stephane Nicoll f4cbcaf774 Upgrade to Groovy 3.0.9 
Closes gh-27976
 2021-09-14 07:15:25 +02:00
Stephane Nicoll bffd983d56 Upgrade to Glassfish EL 3.0.4 
Closes gh-27975
 2021-09-14 07:15:24 +02:00
Stephane Nicoll 1aaa79c841 Upgrade to Ehcache3 3.9.6 
Closes gh-27974
 2021-09-14 07:15:23 +02:00
Stephane Nicoll 35f61bf1ca Start building against Spring HATEOAS 1.3.4 snapshots 
See gh-27970
 2021-09-13 14:28:22 +02:00
Stephane Nicoll 57dcb70910 Start building against Spring HATEOAS 1.2.9 snapshots 
See gh-27969
 2021-09-13 14:27:28 +02:00
Andy Wilkinson f530819d68 Merge branch '2.4.x' into 2.5.x 
Closes gh-27966
 2021-09-13 10:47:47 +01:00
Andy Wilkinson 273600bcdd Retain distinction between compile and runtime deps of optional deps 
Previously, the optional configuration was added to the compile and
runtime classpaths of each source set and the the javadoc classpath
as well. This had a few disadvantages, the most notable of which is
that it meant that the configuration was ifrst resolved and then
the outcome of the resolution was added to the compile and runtime
classpaths. As a result, none of the attributes on the compile and
runtime classpaths were considered to influence variant selection.

This commit reworks the optional dependencies plugin so that the
compile and runtime classpaths of each source set are now configured
to extend from the optional configuration. This allows each
classpath configuration's attributes to influence the dependencies
that are selected from the optional configuration during resolution.
For example, when resolving the compile classpath, compile
dependencies (Usage.JAVA_API) will be selected and when resolving the
runtime classpath, runtime dependencies (Usage.JAVA_RUNTIME) will be
selected.

The above-described change means that runtime dependencies of an
optional dependencies will no longer leak into the compile classpath.
As a result of this, our Gradle plugin's test infrastructure has
been updated so that it no longer references runtime dependencies of
the Kotlin Gradle plugin at compile time.

Closes gh-27965
 2021-09-13 10:47:14 +01:00
Stephane Nicoll 2004c062df Upgrade to Tomcat 9.0.53 
Closes gh-27963
 2021-09-13 11:04:02 +02:00
Stephane Nicoll ab81e3c05c Upgrade to Tomcat 9.0.53 
Closes gh-27961
 2021-09-13 10:28:42 +02:00
Stephane Nicoll 97f3c82743 Upgrade to Netty tcNative 2.0.42.Final 
Closes gh-27960
 2021-09-13 10:10:05 +02:00
Stephane Nicoll c8ea3af6f7 Upgrade to Netty 4.1.68.Final 
Closes gh-27959
 2021-09-13 10:10:04 +02:00
Stephane Nicoll 21c53729ab Upgrade to Maven War Plugin 3.3.2 
Closes gh-27958
 2021-09-13 10:10:03 +02:00
Stephane Nicoll fadf5ba33a Upgrade to Logback 1.2.6 
Closes gh-27957
 2021-09-13 10:10:01 +02:00
Stephane Nicoll 3276c977e3 Upgrade to jOOQ 3.14.14 
Closes gh-27956
 2021-09-13 10:10:00 +02:00
Stephane Nicoll 0e3ac71857 Upgrade to Jetty EL 8.5.70 
Closes gh-27955
 2021-09-13 10:09:59 +02:00
Stephane Nicoll d09beaf968 Upgrade to Gson 2.8.8 
Closes gh-27954
 2021-09-13 10:09:58 +02:00
Stephane Nicoll 6eedf9cfe4 Upgrade to Groovy 2.5.15 
Closes gh-27953
 2021-09-13 10:09:57 +02:00
Stephane Nicoll a5b5b2d10f Upgrade to Glassfish EL 3.0.4 
Closes gh-27952
 2021-09-13 10:09:56 +02:00
Stephane Nicoll a3762b3f08 Upgrade to Ehcache3 3.9.6 
Closes gh-27951
 2021-09-13 10:09:54 +02:00
Stephane Nicoll d481a75beb Start building against Spring Integration 5.5.4 snapshots 
See gh-27949
 2021-09-13 08:41:31 +02:00
Stephane Nicoll c678a0edc0 Start building against Spring Integration 5.4.11 snapshots 
See gh-27948
 2021-09-13 08:40:32 +02:00
Stephane Nicoll 2327cda5c9 Merge branch '2.4.x' into 2.5.x 
Closes gh-27943
 2021-09-12 09:02:35 +02:00
cdalexndr 60bc94e1d4 Clarify Selenium auto-configuration requires HtmlUnit 
The auto-configuration requires `HtmlUnit`, so this auto-cofiguration
only works if both Selenium and HtmlUnit are used.

Prevents misinterpretation that WebDriver can be auto configured without
htmlunit.

See gh-27920
 2021-09-12 09:00:18 +02:00
Andy Wilkinson 70b2b33f55 Merge branch '2.4.x' into 2.5.x 
Closes gh-27922
 2021-09-09 16:12:25 +01:00
Andy Wilkinson 206176425a Broaden testing of ReactiveElasticsearchRestClientAutoConfiguration 
Closes gh-27919
 2021-09-09 16:12:09 +01:00
Stephane Nicoll d93a8581d2 Start building against Spring Kafka 2.7.7 snapshots 
See gh-27918
 2021-09-09 15:57:20 +02:00
Stephane Nicoll 5d1ae23733 Start building against Spring Data 2021.0.5 snapshots 
See gh-27917
 2021-09-09 15:56:57 +02:00
Stephane Nicoll 2f33720101 Start building against Micrometer 1.7.4 snapshots 
See gh-27916
 2021-09-09 15:56:32 +02:00