Commit Graph

15202 Commits

Author SHA1 Message Date
Stephane Nicoll 9e1ef76f84 Polish "Replace latin locutions in the documentation"
See gh-28141
2021-10-01 07:38:41 +02:00
Vincent Ricard 873bca36c4 Replace latin locutions in the documentation
See gh-28141
2021-10-01 07:33:01 +02:00
Andy Wilkinson ea68672594 Merge branch '2.5.x'
Closes gh-28153
2021-09-30 17:06:09 +01: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
Stephane Nicoll 2d34cff902 Polish "Improve Dynatrace examples description in reference guide"
See gh-27502
2021-09-30 10:08:15 +02:00
Georg Pirklbauer c236532607 Improve Dynatrace examples description in reference guide
See gh-27502
2021-09-30 09:59:44 +02:00
Scott Frederick 64c49003aa Polish "Add option to create tags for a built image"
See gh-27613
2021-09-28 15:32:27 -05:00
Rafael Ceccone 66f44b0c7f Add option to create tags for a built image
This commit adds configuration to the Maven and Gradle plugins to
allow specifying multiple tag to be created that refer to the built
image.

See gh-27613
2021-09-28 15:32:27 -05:00
Phillip Webb ca69c8b98c Merge branch '2.5.x'
Closes gh-28135
2021-09-26 13:06:35 -07: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 2d2cbff504 Avoid NoSuchMethodError from UCP's PoolDataSource.getPassword()
While still present and marked as deprecated, the getPassword()
method on UCP's PoolDataSource has been implemented to throw a
NoSuchMethodError making it useless for our purposes.

This commit updates DataSourceBuilder to avoid using the getter. This
means that a password must now be provided when trying to derive a
new DataSource from an existing PoolDataSource.

Closes gh-28127
2021-09-24 10:10:15 +01:00
Andy Wilkinson ab95c2fa3b Polish descriptions of spring.integration.poller properties
Closes gh-28126
2021-09-24 10:09:18 +01:00
Andy Wilkinson 3274e24d55 Polish "Add Spring Integration default poller auto-config"
See gh-27992

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-09-23 16:20:13 -07:00
Artem Bilan b2d1423e34 Add Spring Integration default poller auto-config
When polling consumers or source polling channel adapters are used in
Spring Integration applications, they require some polling policy to
be configured.

This comment auto-configures a PollerMetadata bean which customized
via newly added `spring.integration.poller.*` configuration
properties or overriden completely be user-defined bean.

See gh-27992
2021-09-23 16:20:13 -07:00
Andy Wilkinson 5e426394db Add exception and analyzer for mutually exclusive config props
Add `MutuallyExclusiveConfigurationPropertiesException` and a related
failure analyzer so that a nice message can be displayed if more than
one mutually exclusive property is defined.

Closes gh-28121

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-09-23 16:18:03 -07:00
Phillip Webb 528ced4f0d Rename 'running' to 'ready' for ApplicationStartup
Rename 'spring.boot.application.running' to
'spring.boot.application.ready' to better align with `ReadinessState`.

Closes gh-28080
2021-09-23 12:54:22 -07:00
Andy Wilkinson 0b5d178e5b Merge branch '2.5.x'
Closes gh-28120
2021-09-23 13:23:54 +01: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 ca4e1c6393 Upgrade to SendGrid 4.7.5
Closes gh-28111
2021-09-23 07:40:49 +02:00
Stephane Nicoll 573f6a1fe8 Upgrade to Byte Buddy 1.11.18
Closes gh-28110
2021-09-23 07:40:48 +02:00
Stephane Nicoll 4652bb7adf Upgrade to SendGrid 4.7.5
Closes gh-28109
2021-09-23 07:34:55 +02:00
Stephane Nicoll 6ba3af1454 Upgrade to JUnit Jupiter 5.8.1
Closes gh-28052
2021-09-23 06:48:03 +02:00
Andy Wilkinson 342c749784 Polish 2021-09-22 20:28:31 +01:00
Andy Wilkinson 4fa61cbc60 Merge branch '2.5.x' 2021-09-22 18:37:11 +01: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 233b63199c Polish "Clarify pooling is implicitly enabled in Sentinel mode"
See gh-27891
2021-09-22 11:52:46 +02:00
weixsun d39b7cc46d Clarify pooling is implicitly enabled in Sentinel mode
See gh-27891
2021-09-22 11:48:36 +02:00
Stephane Nicoll 842f3f0bd5 Merge branch '2.5.x'
Closes gh-28099
2021-09-22 09:14:09 +02:00
Stephane Nicoll 77b778ce95 Document support for Java 17
Closes gh-26767
2021-09-22 08:58:29 +02:00
Stephane Nicoll 6ac9887652 Upgrade to SQLite JDBC 3.36.0.3
Closes gh-28098
2021-09-22 08:48:24 +02:00
Stephane Nicoll 54f48383b5 Upgrade to Selenium HtmlUnit 2.53.0
Closes gh-28097
2021-09-22 08:48:23 +02:00
Stephane Nicoll 592ed9d06b Upgrade to Kafka 2.8.1
Closes gh-28095
2021-09-22 08:48:20 +02:00
Stephane Nicoll 5548aae440 Upgrade to jOOQ 3.14.15
Closes gh-28094
2021-09-22 08:48:19 +02:00
Stephane Nicoll 52822bbc4f Upgrade to Jolokia 1.7.1
Closes gh-28093
2021-09-22 08:48:17 +02:00
Stephane Nicoll b864986712 Upgrade to HtmlUnit 2.53.0
Closes gh-28092
2021-09-22 08:48:16 +02:00
Stephane Nicoll 5d022df33a Upgrade to Byte Buddy 1.11.16
Closes gh-28091
2021-09-22 08:48:15 +02:00
Stephane Nicoll a7bc36035d Upgrade to AssertJ 3.21.0
Closes gh-28090
2021-09-22 08:48:13 +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
Madhura Bhave ef2a5daa59 Polish 2021-09-21 16:56:47 -07:00
Phillip Webb bc6b9be7cd Merge branch '2.5.x'
Closes gh-28084
2021-09-21 15:54:54 -07: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 61a84a4722 Polish asciidoctor links
Update `<<..>>` links to include the page.
2021-09-21 15:44:53 -07:00
dreis2211 3e831fe286 Fix link in caching docs
See gh-28078
2021-09-21 15:32:06 -07:00
Phillip Webb 1829dc4960 Merge branch '2.5.x'
Closes gh-28082
2021-09-21 15:20:30 -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 667e5ca30c Polish 2021-09-21 14:45:01 -07:00
Phillip Webb 98a0e07dd5 Polish "Add startup time metrics"
See gh-27878
2021-09-21 14:45:00 -07:00
Phillip Webb c9dc40a465 Merge branch '2.5.x' 2021-09-21 14:44:17 -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 5cd9b7f79d Upgrade to Spring Integration 5.5.4
Closes gh-27950
2021-09-21 20:53:42 +02: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 55a1ec72cc Update copyright year of changed files 2021-09-21 11:25:50 -07:00
Phillip Webb 4c2c4ec16c Merge branch '2.5.x' 2021-09-21 11:25:36 -07: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 6c8c8502e3 Log failing calls to health indicators
Closes gh-22632

Co-authored-by: Madhura Bhave <bhavem@vmware.com>
2021-09-21 11:01:07 -07:00
Stephane Nicoll e0465f7357 Use RootBeanDefinition consistently
Closes gh-28077
2021-09-21 16:36:45 +02:00
Stephane Nicoll d68b6bb2f1 Polish "Add testing for AbstractFailureAnalyzer.findCause"
See gh-27862
2021-09-21 10:05:15 +02:00
smoothbear a2eed676a2 Add testing for AbstractFailureAnalyzer.findCause
See gh-27862
2021-09-21 09:52:10 +02:00
Stephane Nicoll 124c3ac07c Polish "Add support for used-defined RedisStandaloneConfiguration"
See gh-28028
2021-09-21 08:34:44 +02:00
Eddú Meléndez 236c2dd0da Add support for used-defined RedisStandaloneConfiguration
See gh-28028
2021-09-21 08:22:41 +02:00
Stephane Nicoll 3e5038cddd Merge branch '2.5.x'
Closes gh-28073
2021-09-21 08:19:58 +02: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
dreis2211 cf0fcafd13 Polish
See gh-27940
2021-09-21 08:08:29 +02:00
Stephane Nicoll eab8f41152 Polish "Remove english contractions from the documentation"
See gh-28064
2021-09-21 08:04:48 +02:00
Vincent Ricard 52176b8ed6 Remove english contractions from the documentation
See gh-28064
2021-09-21 08:00:48 +02:00
Stephane Nicoll 3ef17820e9 Polish 2021-09-21 07:59:33 +02:00
Madhura Bhave ac00df79f1 Add what's next to new sections
This commit also moves hazelcast from core features to IO

Closes gh-27132
2021-09-20 16:15:08 -07:00
Madhura Bhave 7e257dc24c Rename packages for code samples to match sections
See gh-27132
2021-09-20 16:15:08 -07:00
Andy Wilkinson ad8cb539ea Upgrade to Spring Security 5.6.0-M3
Closes gh-27935
2021-09-20 19:13:06 +01:00
Andy Wilkinson 36b7aa9948 Merge branch '2.5.x'
Closes gh-28070
2021-09-20 19:04:58 +01: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 b69ef0c881 Upgrade to Oracle Database 21.3.0.0
Closes gh-28054
2021-09-20 17:44:57 +01:00
Andy Wilkinson 3446661862 Upgrade to Spring Kafka 2.8.0-M3
Closes gh-27934
2021-09-20 17:28:26 +01:00
Andy Wilkinson 808aa77747 Provide a config prop for Elasticsearch client's path prefix
Closes gh-25010
2021-09-20 15:09:10 +01:00
Andy Wilkinson e2a355f003 Consolidate Elasticsearch configuration properties
Previously, a number of Elasticsearch properties were duplicated
across the spring.elasticsearch.rest and
spring.data.elasticsearch.client.reactive prefixes for configuring
the blocking REST client provided by Elasticsearch and the reactive
client provided by Spring Data respectively. This could cause
problems when using the Elasticsearch REST client configured with
a custom spring.elasticsearch.rest.uris. If Spring WebFlux (to make
use of WebClient) and Spring Data Elasticsearch were on the classpath,
the reactive Elasticsearch Client would be autoconfigured but it
would use the default value of its analogous
spring.data.elasticsearch.client.reactive.endpoints property. It
would be unable to connect, causing a startup failure.

This commit consoliates the configuration properties where possible.
Each setting that is common across the two clients is now configured
using a single, shared spring.elasticsearch property. Each setting
that is specific to the blocked REST client or the WebClient-based
reactive client now have prefixes of spring.elasticsearch.restclient
and spring.elasticsearch.webclient respectively.

The old properties beneath spring.elasticsearch.rest and
spring.data.elasticsearch.client.reactive have been deprecated. If a
any deprecated property is set, all of the new properties are
ignored. In other words, to migrate to the new properties, each usage
of a now-deprecated property must be updated to use its new
replacement instead.

Closes gh-23106
2021-09-20 14:37:44 +01:00
Andy Wilkinson dd366af849 Upgrade to Spring AMQP 2.4.0-M3
Closes gh-27933
2021-09-20 10:02:13 +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 30815cc0e0 Upgrade to Spring Data 2021.1.0-M3
Closes gh-27932
2021-09-17 15:56:57 +01:00
Andy Wilkinson 67f548e965 Upgrade to WebJars Locator Core 0.48
Closes gh-28058
2021-09-17 15:56:57 +01:00
Andy Wilkinson 74eed94a14 Upgrade to Thymeleaf Layout Dialect 3.0.0
Closes gh-28057
2021-09-17 15:56:57 +01:00
Andy Wilkinson d2f03baf32 Upgrade to Rabbit Stream Client 0.4.0
Closes gh-28056
2021-09-17 15:56:57 +01:00
Andy Wilkinson 88206dab1b Upgrade to Prometheus Client 0.12.0
Closes gh-28055
2021-09-17 15:56:56 +01:00
Andy Wilkinson 0bf5022fd2 Upgrade to Mockito 3.12.4
Closes gh-28053
2021-09-17 15:21:32 +01:00
Andy Wilkinson 78568e7796 Upgrade to Jersey 2.35
Closes gh-28051
2021-09-17 13:57:21 +01:00
Andy Wilkinson 74f95b2a69 Upgrade to InfluxDB Java 2.22
Closes gh-28050
2021-09-17 13:57:21 +01:00
Andy Wilkinson 7924d1fc18 Upgrade to Flyway 7.15.0
Closes gh-28049
2021-09-17 13:57:21 +01:00
Andy Wilkinson 5857bcccc6 Merge branch '2.5.x'
Closes gh-28048
2021-09-17 13:20:30 +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 5ae6679d7d Upgrade to Lettuce 6.1.5.RELEASE
Closes gh-28043
2021-09-17 08:33:17 +02:00
Scott Frederick 96238ba8b7 Expose default value for imageName in bootBuildImage task
Fixes gh-28040
2021-09-16 15:51:12 -05:00
Stephane Nicoll 6cb4bbce35 Upgrade to Spring HATEOAS 1.4.0-M3
Closes gh-27971
2021-09-16 21:39:49 +02: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
Stephane Nicoll 7957d97528 Polish 2021-09-16 14:12:23 +02:00
Stephane Nicoll c62a6819fe Polish "Add startup time metrics"
See gh-27878
2021-09-16 13:33:08 +02:00
bono007 2e67963bfe Add startup time metrics
See gh-27878
2021-09-16 13:19:20 +02:00
Andy Wilkinson 32cfde074f Merge branch '2.5.x' 2021-09-16 12:11:42 +01:00
Andy Wilkinson 9df099e343 Polish 2021-09-16 12:11:34 +01:00
Andy Wilkinson 358ab2a8d5 Merge branch '2.5.x'
Closes gh-28034
2021-09-16 10:51:14 +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 69e793ab37 Merge branch '2.5.x'
Closes gh-28033
2021-09-16 09:56:26 +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 b626adf1ee Polish "Add support for configuring the path of disk space metrics"
See gh-27660
2021-09-16 07:41:35 +02:00
bono007 08251b26d0 Add support for configuring the path of disk space metrics
See gh-27660
2021-09-16 07:13:21 +02:00
Ricardo Zanini 02cf988400 Add reference to Kogito Spring Boot Starters
See gh-27989
2021-09-16 07:06:08 +02:00
Stephane Nicoll 225599a52b Adapt to changes in Micrometer milestone 2021-09-16 06:54:36 +02:00
Stephane Nicoll 282fb5ecee Upgrade to Micrometer 1.8.0-M3
Closes gh-27931
2021-09-16 06:37:44 +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 7a7bc9e2d2 Upgrade to Spring Framework 5.3.10
Closes gh-27930
2021-09-15 12:12:45 +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
Stephane Nicoll 4c06732b9a Upgrade to Rabbit AMQP Client 5.13.1
Closes gh-28022
2021-09-15 08:17:56 +02:00
Stephane Nicoll 9b3f735e35 Upgrade to Netty tcNative 2.0.43.Final
Closes gh-28021
2021-09-15 08:17:55 +02:00
Stephane Nicoll d4d20cb1b0 Upgrade to Netty 4.1.68.Final
Closes gh-28020
2021-09-15 08:17:54 +02:00
Stephane Nicoll 399431dc66 Upgrade to Neo4j Java Driver 4.3.4
Closes gh-28019
2021-09-15 08:17:53 +02:00
Stephane Nicoll de93f7630c Upgrade to MongoDB 4.3.2
Closes gh-28018
2021-09-15 08:17:51 +02:00
Stephane Nicoll 51d64b6818 Upgrade to Maven War Plugin 3.3.2
Closes gh-28017
2021-09-15 08:17:50 +02:00
Stephane Nicoll 5e3c70aa9c Upgrade to Maven Javadoc Plugin 3.3.1
Closes gh-28016
2021-09-15 08:17:49 +02:00
Stephane Nicoll 2aa12f110a Upgrade to Logback 1.2.6
Closes gh-28015
2021-09-15 08:17:48 +02:00
Stephane Nicoll 1e50846e3c Upgrade to Kotlin Coroutines 1.5.2
Closes gh-28014
2021-09-15 08:17:47 +02:00
Stephane Nicoll fbef309fd7 Upgrade to jOOQ 3.14.14
Closes gh-28012
2021-09-15 08:17:45 +02:00
Stephane Nicoll 98c4d1d279 Upgrade to Jetty EL 9.0.52
Closes gh-28011
2021-09-15 08:17:44 +02:00
Stephane Nicoll 0bd64e027d Upgrade to Jedis 3.7.0
Closes gh-28010
2021-09-15 08:17:43 +02:00
Stephane Nicoll a3c82320e5 Upgrade to Jackson Bom 2.12.5
Closes gh-28009
2021-09-15 08:17:42 +02:00
Stephane Nicoll 494e005981 Upgrade to Hibernate 5.5.7.Final
Closes gh-28008
2021-09-15 08:17:41 +02:00
Stephane Nicoll aafb2c051d Upgrade to Gson 2.8.8
Closes gh-28007
2021-09-15 08:17:40 +02:00
Stephane Nicoll f3ced3f3e5 Upgrade to Groovy 3.0.9
Closes gh-28006
2021-09-15 08:17:39 +02:00
Stephane Nicoll 08a233153e Upgrade to Glassfish EL 3.0.4
Closes gh-28005
2021-09-15 08:17:38 +02:00
Stephane Nicoll d04ae305c1 Upgrade to Elasticsearch 7.14.1
Closes gh-28004
2021-09-15 08:17:37 +02:00
Stephane Nicoll e15a586354 Upgrade to Ehcache3 3.9.6
Closes gh-28003
2021-09-15 08:17:36 +02:00
Stephane Nicoll bf0f34f514 Upgrade to Couchbase Client 3.2.1
Closes gh-28002
2021-09-15 08:17:35 +02:00
Stephane Nicoll 5006420d15 Upgrade to Commons Pool2 2.11.1
Closes gh-28001
2021-09-15 08:17:34 +02:00
Stephane Nicoll c655ca7253 Upgrade to Cassandra Driver 4.13.0
Closes gh-28000
2021-09-15 08:17:33 +02:00
Stephane Nicoll bc643d997e Upgrade to Byte Buddy 1.11.15
Closes gh-27999
2021-09-15 08:17:32 +02:00
Stephane Nicoll 5b8406493a Upgrade to AppEngine SDK 1.9.91
Closes gh-27998
2021-09-15 08:17:30 +02:00
Stephane Nicoll 393e34b837 Upgrade to ActiveMQ 5.16.3
Closes gh-27997
2021-09-15 08:17:29 +02:00
Scott Frederick a6d03279ca Merge branch '2.5.x'
Closes gh-27994
2021-09-14 16:45:58 -05: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 9aff56b883 Upgrade to Reactor 2020.0.11
Closes gh-27929
2021-09-14 18:41:47 +02: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 e1b1a25021 Polish "Auto-configure Micrometer's Lettuce latency metrics"
See gh-27865
2021-09-14 09:33:48 +02:00
Antonin ARQUEY 190fea6faa Auto-configure Micrometer's Lettuce latency metrics
Add auto-configuration support to export Lettuce latency metrics.

See gh-27865
2021-09-14 09:19:42 +02:00
Stephane Nicoll c4823f80cd Polish "Fix some typos in docs"
See gh-27968
2021-09-14 09:18:04 +02:00
Dmitriy Bogdanov 2ad3428039 Fix some typos in docs
See gh-27968
2021-09-14 09:16:13 +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 9538b07bdf Start building against Spring HATEOAS 1.4.0-M3 snapshots
See gh-27971
2021-09-13 14:37:35 +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 7c034c33e2 Merge branch '2.5.x'
Closes gh-27967
2021-09-13 10:48:19 +01: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 8c819c94d6 Upgrade to Tomcat 9.0.53
Closes gh-27964
2021-09-13 11:04:57 +02: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 919617ae61 Start building against Spring Integration 5.5.4 snapshots
See gh-27950
2021-09-13 08:42:27 +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 43a19c16a8 Merge branch '2.5.x'
Closes gh-27944
2021-09-12 09:02:50 +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
Stephane Nicoll 599cc1f696 Start building against Spring Data 2021.1.0-M3 snapshots
See gh-27932
2021-09-11 08:59:12 +02:00
Stephane Nicoll 726a2591fb Start building against Micrometer 1.8.0-M3 snapshots
See gh-27931
2021-09-11 08:35:48 +02:00
Stephane Nicoll 3bc5f7903b Start building against Spring Security 5.6.0-M3 snapshots
See gh-27935
2021-09-10 09:04:41 +02:00
Stephane Nicoll 157288e1e1 Start building against Spring Kafka 2.8.0-M3 snapshots
See gh-27934
2021-09-10 09:04:41 +02:00
Stephane Nicoll ef32e02df1 Start building against Spring AMQP 2.4.0-M3 snapshots
See gh-27933
2021-09-10 09:04:41 +02:00
Stephane Nicoll 4b4e5f9bf8 Start building against Spring Framework 5.3.10 snapshots
See gh-27930
2021-09-10 08:29:16 +02:00
Stephane Nicoll c58db8d828 Start building against Reactor 2020.0.11 snapshots
See gh-27929
2021-09-10 08:28:49 +02:00
Stephane Nicoll 78d6c94a7e Polish "Auto-Configure Kafka CommonErrorHandler"
See gh-27927
2021-09-10 08:20:10 +02:00
Gary Russell c3583a4b06 Auto-Configure Kafka CommonErrorHandler
`ErrorHandler/BatchErrorHandler` will be deprecated in a future release
in favor of `CommonErrorHandler`. Currently, the legacy handlers are
adapted to a `CommonErrorHandler` or ignored if a `CommonErrorHandler`
is configured.

See gh-27927
2021-09-10 08:16:29 +02:00
Yanming Zhou 6e9bdacc10 Include WebMvcRegistrations beans in WebMvcTest
See gh-27823
2021-09-10 07:55:26 +02:00
dreis2211 e1afc91ae2 Polish javadoc comments
See gh-27925
2021-09-10 07:53:49 +02:00
dreis2211 242d730f51 Deprecate DataSourceInitializationMode
See gh-27926
2021-09-10 07:51:32 +02:00
Andy Wilkinson bb11abef2c Merge branch '2.5.x'
Closes gh-27923
2021-09-09 16:12:45 +01: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
Stephane Nicoll 229e61d3ea Start building against Spring Framework 5.3.10 snapshots
See gh-27915
2021-09-09 15:56:02 +02:00
Stephane Nicoll e918543ce9 Start building against Reactor 2020.0.11 snapshots
See gh-27914
2021-09-09 15:55:32 +02:00
Stephane Nicoll 08e79ee472 Start building against Spring Data 2020.0.13 snapshots
See gh-27912
2021-09-09 15:43:44 +02:00
Stephane Nicoll 348863c4ae Start building against Micrometer 1.6.11 snapshots
See gh-27910
2021-09-09 15:43:19 +02:00
Stephane Nicoll bcc4529cc5 Start building against Spring Framework 5.3.10 snapshots
See gh-27909
2021-09-09 15:42:54 +02:00
Stephane Nicoll f557a8a5d9 Start building against Reactor 2020.0.11 snapshots
See gh-27908
2021-09-09 15:42:22 +02:00
Andy Wilkinson 8ab9dbad7a Merge branch '2.5.x'
Closes gh-27913
2021-09-09 14:40:57 +01:00
Andy Wilkinson 128f54fbd0 Merge branch '2.4.x' into 2.5.x
Closes gh-27911
2021-09-09 14:40:40 +01:00
Andy Wilkinson 11c79ac650 Move Docker-based reactive Elasticsearch test into separate class
Closes gh-27907
2021-09-09 14:39:52 +01:00
Andy Wilkinson 010d201002 Merge branch '2.5.x'
Closes gh-27906
2021-09-09 13:38:38 +01:00
Andy Wilkinson 7afaffb80e Merge branch '2.4.x' into 2.5.x
Closes gh-27905
2021-09-09 13:38:09 +01:00
Andy Wilkinson 1f2035ae64 Move Docker-based Elasticsearch test into separate class
Closes gh-27904
2021-09-09 13:24:26 +01:00
Andy Wilkinson c65013f717 Merge branch '2.5.x'
Closes gh-27901
2021-09-09 10:14:03 +01:00
Andy Wilkinson 37240bda3f Merge branch '2.4.x' into 2.5.x
Closes gh-27900
2021-09-09 10:13:40 +01:00
Andy Wilkinson 47163af9b6 Fix handling of Zip64 jar files larger than 4,294,967,295 bytes
Previously, a Zip64 jar file was identified by the number of entries
in the central directory being 0xFFFF. This value indicates that
there the number of entries is too big for the 2-byte field. However,
a jar may be in Zip64 format due to it exceeding the Zip format's
maximum size rather than its maximum number of entries so this field
cannot be used as a reliable indicator. The Zip specification doesn't
require any of the fields of the end of central directory record to
have a value of 0xFFFF (2-byte fields) or 0xFFFFFFFF (4-byte fields)
when using Zip64 format so we need to take a different approach.

Additionally, a number of places in the code assumed that an entry's
offset would always be available from the central directory file
header directly. This assumption did not hold true when the jar was
a Zip64 archive due to its size as the offset's value would be
0xFFFFFFF indicating that it should be read from the Zip64 extended
information field within the header's extra field instead.

This commit updates the Zip64 detection to look for the Zip64 end of
central directory locator instead. If present, it begins 20 bytes
before the beginning of the end of central directory record. Its
first four bytes are always 0x07064b50. The code that reads the
local header offset has also been updated to refer to the Zip64
extended information field when the offset is too large to fit in
the 4-byte field in the central directory file header. To allow
greater-than-4-byte offsets to be handled, a number of fields,
method parameters, and local variables have had their type changed
from an int to a long.

Fixes gh-27822
2021-09-09 09:17:48 +01:00
Phillip Webb 56595c0027 Use consistent case for 'Servlet' and 'Filter' in documentation
Closes gh-27896
2021-09-08 17:56:44 -07:00
Jay Bryant f7f5f9fb96 Make editorial changes to actuator documentation
See gh-27759
2021-09-08 17:33:07 -07:00
Jay Bryant 2691828d2b Update actuator docs to prefer "You can..."
Edit the actuator docs so that more "You can..." phrasing is used.

For example
	"Auditing can be enabled by providing"
becomes
	"You can enable auditing by providing"

See gh-27759
2021-09-08 17:33:07 -07:00
Jay Bryant 53363c84cb Improve actuator example lead-in text
Update example lead-in text to a slightly shorter form.

For example
	"as shown in the following example"
Becomes
	"as the following example shows"

See gh-27759
2021-09-08 17:33:07 -07:00
Jay Bryant e44585d89a Polish actuator docs markup and formatting
Improve consistency of the asciidoctor markup and formatting for
the actuator section.

See gh-27759
2021-09-08 17:33:07 -07:00
Madhura Bhave 393081f2e6 Enable PathPattern based matching for MVC actuators
Closes gh-24645
2021-09-08 16:23:16 -07:00
Kirill Gavrilov bedd02d8cd Remove Oracle drivers with old groupId
See gh-27827
2021-09-08 08:10:40 +02:00
Stephane Nicoll e10ebb17e0 Polish "Fix tests on non English systems"
See gh-27887
2021-09-08 08:07:09 +02:00
dreis2211 32e51966dd Fix tests on non English systems
See gh-27887
2021-09-08 07:59:35 +02:00
Andy Wilkinson 8362ff9b54 Merge branch '2.5.x'
Closes gh-27886
2021-09-07 17:00:19 +01:00
Andy Wilkinson ba19577646 Merge branch '2.4.x' into 2.5.x
Closes gh-27885
2021-09-07 17:00:09 +01:00
Andy Wilkinson 93ac6455d3 Document that starter parent enables compilation with -parameters
Closes gh-27762
2021-09-07 16:57:56 +01:00
Andy Wilkinson fd8f44d1ae Merge branch '2.5.x'
Closes gh-27884
2021-09-07 09:46:58 +01:00
Andy Wilkinson 4c8cafe731 Merge branch '2.4.x' into 2.5.x
Closes gh-27883
2021-09-07 09:46:33 +01:00
Andy Wilkinson 6e6a6c059c Upgrade to Testcontainers 1.16
Closes gh-27882
2021-09-07 09:46:05 +01:00
Stephane Nicoll b4b71ec015 Add bind method to ConfigurationProperties bean definition
This commit reworks the configuration properties registrar to use
RootBeanDefinition and a standard attribute rather than relying on
a package private sub-class. This allows other components to inspect
the metadata if necessary.

Closes gh-27821
2021-09-06 10:28:03 +02:00
Stephane Nicoll 542e6ab0d3 Merge branch '2.5.x'
Closes gh-27879
2021-09-06 08:33:14 +02:00
Stephane Nicoll d6cc1f6d7d Polish "Use more precise variables to detect Azure App Service"
See gh-27819
2021-09-06 08:28:58 +02:00
Julien Dubois 69b23470c7 Use more precise variables to detect Azure App Service
See gh-27819
2021-09-06 08:12:22 +02:00
Stephane Nicoll 39a1c854d8 Polish "Auto-configure JVM heap pressure metrics"
See gh-27868
2021-09-05 17:36:27 +02:00
Vladimir Konkov ba21c90355 Auto-configure JVM heap pressure metrics
See gh-27868
2021-09-05 17:31:15 +02:00
Stephane Nicoll 2286f58e23 Merge branch '2.5.x'
Closes gh-27877
2021-09-05 17:29:17 +02:00
Stephane Nicoll 7cc8668540 Merge branch '2.4.x' into 2.5.x
Closes gh-27876
2021-09-05 17:29:01 +02:00
Yanming Zhou 6bf92f06e9 Fix inconsistent devtools doc
See gh-27812
2021-09-05 17:28:02 +02:00
izeye 6e3874d48e Polish test method names in PropertiesMeterFilterTests
See gh-27832
2021-09-05 17:13:46 +02:00
Stephane Nicoll aa24476559 Update copyright year of changed files
See gh-27838
2021-09-05 17:10:10 +02:00
Yanming Zhou 168688ef49 Simplify code
See gh-27838
2021-09-05 17:08:33 +02:00
Mihaita Tinta 740de591d1 Add reference to WebAuthn Spring Boot Starter
See gh-27841
2021-09-05 17:05:44 +02:00
Stephane Nicoll e25553e3c3 Merge branch '2.5.x'
Closes gh-27874
2021-09-05 17:02:43 +02:00
Stephane Nicoll 3dab5ff2c0 Merge branch '2.4.x' into 2.5.x
Closes gh-27873
2021-09-05 17:02:17 +02:00
Henning Pöttker 831e28b001 Fix typo in javadoc
See gh-27856
2021-09-05 17:01:31 +02:00
Madhura Bhave 2d89a8253c Switch default MVC path matching strategy"
Change the default `spring.mvc.pathmatch.matching-strategy` to
`PATH_PATTERN_PARSER`.

Closes gh-24805
2021-09-02 11:50:35 -07:00
Phillip Webb b01fa6a899 Merge branch '2.5.x'
Closes gh-27860
2021-09-02 11:17:06 -07:00
Phillip Webb 1215bbc10b Merge branch '2.4.x' into 2.5.x
Closes gh-27859
2021-09-02 11:16:42 -07:00
Phillip Webb 61764389c2 Merge branch '2.3.x' into 2.4.x
Closes gh-27858
2021-09-02 11:15:32 -07:00
Phillip Webb 44eb8c39d2 Align ApplicationTemp with Files.createTempDirectory
Update `ApplicationTemp` to align the way that it creates temp folders
with the way that `Files.createTempDirectory` works.

Closes gh-27857
2021-09-02 11:13:26 -07:00
Madhura Bhave 253f98c3e7 Add pluggable abstraction for applying custom sanitization rules
Closes gh-27840
2021-08-30 21:31:15 -07:00
Phillip Webb 211532f08d Exclude CustomNumberEditor and CustomBooleanEditor
Add `CustomNumberEditor` and `CustomBooleanEditor` to the editor
exclusions sine the regular `ConversionService` should be able to
handle them.

Closes gh-27829
2021-08-27 23:15:23 -07:00
Phillip Webb 8db82f02fc Merge branch '2.5.x'
Closes gh-27831
2021-08-27 22:49:39 -07:00
Phillip Webb 15d0078eca Merge branch '2.4.x' into 2.5.x
Closes gh-27830
2021-08-27 22:40:56 -07:00
Phillip Webb b1b3bdc9b1 Polish 2021-08-27 22:35:18 -07:00
Phillip Webb 87dbda2339 Ensure TypeConverterConverter is thread safe
Update `TypeConverterConverter` do that a new `SimpleTypeConverter` is
obtained for each `convert` operation. Prior to this commit the same
`SimpleTypeConverter` could be accessed concurrently from multiple
threads which is not allowed.

Fixes gh-27829
2021-08-27 22:08:40 -07:00
weixsun 149ed09230 Polish SessionAutoConfiguration#addCandidateIfAvailable
See gh-27808
2021-08-24 07:24:23 +02:00
Andy Wilkinson e299175eef Polish "Only link to other formats from each format of the ref docs"
See gh-27737
2021-08-23 17:36:11 +01:00
Jay Bryant edab97a3e4 Only link to other formats from each format of the ref docs
See gh-27737
2021-08-23 17:35:40 +01:00
Jay Bryant 47bbae8356 Polish the multi-page documentation's index
See gh-27805
2021-08-23 15:55:47 +01:00
Andy Wilkinson 07d9a614e0 Merge branch '2.5.x'
Closes gh-27804
2021-08-23 15:45:51 +01:00
Andy Wilkinson b508d77a4e Merge branch '2.4.x' into 2.5.x
Closes gh-27803
2021-08-23 15:45:33 +01:00
Andy Wilkinson 990b766847 Polish "Document how to parameterize REST Docs' output dir with WebTestClient"
See gh-27755
2021-08-23 15:36:16 +01:00
Berchris Requiao c83f6ebaa2 Document how to parameterize REST Docs' output dir with WebTestClient
See gh-27755
2021-08-23 15:30:21 +01:00
Andy Wilkinson c5272a4122 Merge branch '2.5.x'
Closes gh-27800
2021-08-23 14:28:53 +01:00
Andy Wilkinson 24c88ab80b Polish "Avoid NPE when routing DataSource has target with null key"
See gh-27698
2021-08-23 13:53:34 +01:00
Safeer A efdc19647c Avoid NPE when routing DataSource has target with null key
See gh-27698
2021-08-23 13:40:33 +01:00
izeye e147cae84c Fix typo in action for bean currently in creation failure analysis
See gh-27781
2021-08-23 13:36:59 +01:00
Andy Wilkinson 575d83737a Merge branch '2.5.x'
Closes gh-27799
2021-08-23 13:27:22 +01:00
Andy Wilkinson e409489859 Merge branch '2.4.x' into 2.5.x
Closes gh-27798
2021-08-23 13:26:37 +01:00
Andy Wilkinson f8ef90813f Allow @MockBean to be used with Framework's @Repeat
Fixes gh-27693
2021-08-23 12:38:15 +01:00
Scott Frederick f386ebe61d Remove tests that rely on an unpredictable order of repackaged libs
See gh-27436
2021-08-20 14:09:23 -05:00
Scott Frederick 40a9c4d90f Sort repackaged libraries in a reproducible Maven build
When a Maven build is configured to ensure reproducibility, any
libraries added to `BOOT-INF/lib` in a jar archive or to `WEB-INF/lib`
in a war archive by the Spring Boot plugin repackaging should be
sorted by name to ensure a stable and predictable order.

Fixes gh-27436
2021-08-20 13:00:39 -05:00
Madhura Bhave 2c9945efc7 Merge pull request #27761 from dreis2211
* pr/27761:
  Fix broken links in docs

Closes gh-27761
2021-08-18 15:51:37 -07:00
dreis2211 7c8ccfc4c1 Fix broken links in docs
See gh-27761
2021-08-18 15:51:14 -07:00
Madhura Bhave 8fd9eb72d4 Allow part of a composite contributor in a health group
Closes gh-23027

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-08-18 15:44:10 -07:00
Andy Wilkinson fd2fbcb3c6 Merge branch '2.5.x'
Closes gh-27758
2021-08-18 18:28:34 +01:00
Andy Wilkinson 6d8ba3e8b1 Merge branch '2.4.x' into 2.5.x
Closes gh-27757
2021-08-18 17:56:32 +01:00
Andy Wilkinson ffbd28b60a Polish "Polish access modifiers for test classes"
See gh-27736
2021-08-18 17:52:42 +01:00
izeye 8a425dedfd Polish access modifiers for test classes
See gh-27736
2021-08-18 17:38:40 +01:00
Stephane Nicoll cdec3bf507 Upgrade to Spring Session 2021.1.0-M1
Closes gh-27612
2021-08-18 16:12:06 +02:00
Stephane Nicoll 0d44503980 Upgrade to Spring Session 2021.0.2
Closes gh-27605
2021-08-18 16:11:05 +02:00
Stephane Nicoll 2baee89971 Upgrade to Spring Session 2020.0.6
Closes gh-27599
2021-08-18 16:10:15 +02:00
Andy Wilkinson 2dfdcf5e88 Merge branch '2.5.x'
Closes gh-27754
2021-08-18 13:52:23 +01:00
Andy Wilkinson 0d904b8868 Merge branch '2.4.x' into 2.5.x
Closes gh-27753
2021-08-18 13:51:49 +01:00
Andy Wilkinson 0b7994a679 Polish "Use 2012 for copyright beginning year"
See gh-27734
2021-08-18 13:48:29 +01:00
Stephane Nicoll e0dc55e865 Upgrade to Netty 4.1.67.Final
Closes gh-27745
2021-08-18 09:28:18 +02:00
Stephane Nicoll e0fdddc658 Upgrade to Hazelcast 4.1.5
Closes gh-27744
2021-08-18 09:28:17 +02:00
Stephane Nicoll 42422c40da Upgrade to AppEngine SDK 1.9.91
Closes gh-27743
2021-08-18 09:28:16 +02:00
Stephane Nicoll a97a566d01 Upgrade to ActiveMQ 5.16.3
Closes gh-27742
2021-08-18 09:28:14 +02:00
Stephane Nicoll 253e4b25b1 Upgrade to Netty 4.1.67.Final
Closes gh-27741
2021-08-18 08:56:04 +02:00
Stephane Nicoll c9ec939127 Upgrade to AppEngine SDK 1.9.91
Closes gh-27740
2021-08-18 08:56:03 +02:00
Stephane Nicoll a798288de1 Upgrade to ActiveMQ 5.16.3
Closes gh-27739
2021-08-18 08:56:02 +02:00
Stephane Nicoll bc854d4e76 Upgrade to Spring Integration 5.5.3
Closes gh-27611
2021-08-18 07:47:29 +02:00
Stephane Nicoll 8f12295e9b Upgrade to Spring Integration 5.5.3
Closes gh-27604
2021-08-18 07:38:49 +02:00
Stephane Nicoll 3e47b6e2b1 Upgrade to Spring Integration 5.4.10
Closes gh-27598
2021-08-18 07:38:04 +02:00
Andy Wilkinson 8966b1308b Merge branch '2.5.x'
Closes gh-27733
2021-08-17 16:11:17 +01:00
Andy Wilkinson b4f0f29bff Test our Gradle plugin against Gradle 7.2
Closes gh-27732
2021-08-17 15:58:40 +01:00
Andy Wilkinson 79be0766bc Merge branch '2.5.x'
Closes gh-27731
2021-08-17 15:42:17 +01:00
Andy Wilkinson ea641d3aab Merge branch '2.4.x' into 2.5.x
Closes gh-27730
2021-08-17 15:42:05 +01:00
Andy Wilkinson 29f5570208 Stop s-b-configuration-metadata leaking enforced constraints
Fixes gh-27726
2021-08-17 15:34:29 +01:00
Andy Wilkinson 01e741d703 Prohibit circular references by default
Closes gh-27652
2021-08-17 14:51:39 +01:00
Andy Wilkinson 228e4e3bc8 Make it easier to add new config options to ApplicationContextRunners
Closes gh-27690
2021-08-17 14:51:08 +01:00
Stephane Nicoll 456d741706 Add support for configuring Jackson's ConstructorDetector
Closes gh-27178
2021-08-17 14:15:08 +02:00
Stephane Nicoll 60e57f7a3f Upgrade to Hibernate 5.5.6.Final
Closes gh-27702
2021-08-17 09:15:27 +02:00
Stephane Nicoll 2d49175291 Upgrade to Undertow 2.2.10.Final
Closes gh-27725
2021-08-17 09:14:55 +02:00
Stephane Nicoll cdc4c136de Upgrade to SLF4J 1.7.32
Closes gh-27723
2021-08-17 09:14:53 +02:00
Stephane Nicoll 6ffc4e657d Upgrade to SendGrid 4.7.4
Closes gh-27722
2021-08-17 09:14:52 +02:00
Stephane Nicoll 2bf0112ae3 Upgrade to Netty 4.1.67.Final
Closes gh-27721
2021-08-17 09:14:51 +02:00
Stephane Nicoll ea4287f20c Upgrade to MySQL 8.0.26
Closes gh-27720
2021-08-17 09:14:50 +02:00
Stephane Nicoll e4a0f92bfa Upgrade to MSSQL JDBC 9.4.0.jre8
Closes gh-27719
2021-08-17 09:14:49 +02:00
Stephane Nicoll 29da007a69 Upgrade to MIMEPull 1.9.15
Closes gh-27718
2021-08-17 09:14:48 +02:00
Stephane Nicoll bee9199743 Upgrade to Maven Enforcer Plugin 3.0.0
Closes gh-27717
2021-08-17 09:14:47 +02:00
Stephane Nicoll f7f8450693 Upgrade to Maven AntRun Plugin 3.0.0
Closes gh-27716
2021-08-17 09:14:46 +02:00
Stephane Nicoll 510876a193 Upgrade to MariaDB 2.7.4
Closes gh-27715
2021-08-17 09:14:45 +02:00
Stephane Nicoll da17c4f43c Upgrade to Logback 1.2.5
Closes gh-27714
2021-08-17 09:14:44 +02:00
Stephane Nicoll 5f801ae0d7 Upgrade to Liquibase 4.4.3
Closes gh-27713
2021-08-17 09:14:42 +02:00
Stephane Nicoll c8cd1aca24 Upgrade to Jedis 3.6.3
Closes gh-27712
2021-08-17 09:14:42 +02:00
Stephane Nicoll 46a9342102 Upgrade to Janino 3.1.6
Closes gh-27711
2021-08-17 09:14:40 +02:00
Stephane Nicoll a73000510c Upgrade to Hazelcast Hibernate5 2.2.1
Closes gh-27710
2021-08-17 09:14:39 +02:00
Stephane Nicoll 2d64a44b8f Upgrade to Hazelcast 4.2.2
Closes gh-27709
2021-08-17 09:14:38 +02:00
Stephane Nicoll fb1c7d59c0 Upgrade to Glassfish JAXB 2.3.5
Closes gh-27708
2021-08-17 09:14:37 +02:00
Stephane Nicoll 5294c2257c Upgrade to Git Commit ID Plugin 4.9.10
Closes gh-27707
2021-08-17 09:14:36 +02:00
Stephane Nicoll a9b403fb1f Upgrade to Elasticsearch 7.13.4
Closes gh-27706
2021-08-17 09:14:35 +02:00
Stephane Nicoll 00008c86ed Upgrade to Ehcache3 3.9.5
Closes gh-27705
2021-08-17 09:14:34 +02:00
Stephane Nicoll 2bb369b9a1 Upgrade to Byte Buddy 1.11.12
Closes gh-27704
2021-08-17 09:14:33 +02:00
Stephane Nicoll 6fa5750e5a Upgrade to Artemis 2.18.0
Closes gh-27703
2021-08-17 09:14:31 +02:00
Stephane Nicoll 823f436dcf Add exclusion for HikariCP 5 2021-08-17 08:15:37 +02:00
Stephane Nicoll 34c83d6016 Upgrade to Nimbus JOSE JWT 9.10.1
Closes gh-27701
2021-08-17 08:09:06 +02:00
Stephane Nicoll 37c9fb09e6 Upgrade to OAuth2 OIDC SDK 9.9.1
Closes gh-27700
2021-08-17 08:09:05 +02:00
Stephane Nicoll 658b914b1a Upgrade to Spring Security 5.6.0-M2
Closes gh-27610
2021-08-17 08:05:39 +02:00
Stephane Nicoll d9cb1871fe Upgrade to Spring Security 5.5.2
Closes gh-27603
2021-08-17 08:02:09 +02:00
Stephane Nicoll afaf4421d0 Upgrade to Nimbus JOSE JWT 8.22.1
Closes gh-27699
2021-08-17 08:01:21 +02:00
Stephane Nicoll 0abedb2547 Upgrade to Spring Security 5.4.8
Closes gh-27597
2021-08-17 08:00:15 +02:00
Stephane Nicoll b65cc4d62f Relocate DiskSpace metrics to SystemMetricsAutoConfiguration
Closes gh-27688
2021-08-16 14:54:05 +02:00
Stephane Nicoll 1475309b4d Polish "Add expiry and bufferLength configuration properties"
See gh-27584
2021-08-16 10:05:47 +02:00
Leo Li 888acb94fc Add expiry and bufferLength configuration properties
See gh-27584
2021-08-16 09:32:38 +02:00
Stephane Nicoll 68a47a7f11 Polish "Add property to customize Jackson's default leniency"
See gh-27659
2021-08-16 09:03:50 +02:00
Lovekesh Garg 89c532ab70 Add property to customize Jackson's default leniency
See gh-27659
2021-08-16 08:57:13 +02:00
Stephane Nicoll fe64fef7b9 Upgrade to Undertow 2.2.10.Final
Closes gh-27686
2021-08-16 08:14:37 +02:00
Stephane Nicoll 3a83fafebb Upgrade to SendGrid 4.7.4
Closes gh-27684
2021-08-16 08:14:34 +02:00
Stephane Nicoll a61be95f79 Upgrade to MIMEPull 1.9.15
Closes gh-27683
2021-08-16 08:14:33 +02:00
Stephane Nicoll 44b8a94b01 Upgrade to Maven Enforcer Plugin 3.0.0
Closes gh-27682
2021-08-16 08:14:32 +02:00
Stephane Nicoll c0f1adcf54 Upgrade to MariaDB 2.7.4
Closes gh-27681
2021-08-16 08:14:31 +02:00
Stephane Nicoll f6914e5fd1 Upgrade to Logback 1.2.5
Closes gh-27680
2021-08-16 08:14:30 +02:00
Stephane Nicoll 4adc3230c7 Upgrade to Janino 3.1.6
Closes gh-27679
2021-08-16 08:14:29 +02:00
Stephane Nicoll 0b75acfc1c Upgrade to Hazelcast Hibernate5 2.2.1
Closes gh-27678
2021-08-16 08:14:28 +02:00
Stephane Nicoll fb17f6e085 Upgrade to Glassfish JAXB 2.3.5
Closes gh-27677
2021-08-16 08:14:27 +02:00
Stephane Nicoll 7fced191cf Upgrade to Ehcache3 3.9.5
Closes gh-27676
2021-08-16 08:14:26 +02:00
Stephane Nicoll 6e4c35d463 Upgrade to Couchbase Client 3.1.7
Closes gh-27675
2021-08-16 08:14:25 +02:00
Stephane Nicoll eda014e736 Upgrade to Cassandra Driver 4.11.3
Closes gh-27674
2021-08-16 08:14:24 +02:00
dreis2211 d5e1edae9f Use Pattern for Groovy closure checks
See gh-27661
2021-08-16 08:13:49 +02:00
Stephane Nicoll b44a7ae3f6 Upgrade to Undertow 2.2.10.Final
Closes gh-27673
2021-08-16 07:36:41 +02:00
Stephane Nicoll de0d940451 Upgrade to MIMEPull 1.9.15
Closes gh-27671
2021-08-16 07:36:41 +02:00
Stephane Nicoll df36225752 Upgrade to Maven Enforcer Plugin 3.0.0
Closes gh-27670
2021-08-16 07:36:41 +02:00
Stephane Nicoll 46ede9cd22 Upgrade to MariaDB 2.7.4
Closes gh-27669
2021-08-16 07:36:41 +02:00
Stephane Nicoll 9728511950 Upgrade to Logback 1.2.5
Closes gh-27668
2021-08-16 07:36:30 +02:00
Stephane Nicoll b32dfaad15 Upgrade to Janino 3.1.6
Closes gh-27667
2021-08-16 07:35:22 +02:00
Stephane Nicoll 8c0aea7acb Upgrade to Glassfish JAXB 2.3.5
Closes gh-27666
2021-08-16 07:35:21 +02:00
Stephane Nicoll 1fdeda0d15 Upgrade to Ehcache3 3.9.5
Closes gh-27665
2021-08-16 07:35:20 +02:00
Stephane Nicoll 18349dc556 Upgrade to Spring Kafka 2.8.0-M2
Closes gh-27609
2021-08-13 11:13:13 +02:00
Stephane Nicoll f02e18a2d9 Upgrade to Spring AMQP 2.4.0-M2
Closes gh-27622
2021-08-13 11:12:47 +02:00
Stephane Nicoll 9f505788f8 Upgrade to Spring Kafka 2.7.6
Closes gh-27602
2021-08-13 11:08:35 +02:00
Stephane Nicoll 454ea44c39 Upgrade to Spring Data 2021.0.4
Closes gh-27633
2021-08-13 11:08:10 +02:00
Stephane Nicoll c0ed8136d8 Upgrade to Micrometer 1.7.3
Closes gh-27601
2021-08-13 11:07:29 +02:00
Stephane Nicoll fa99ae774a Upgrade to Spring Data 2020.0.12
Closes gh-27632
2021-08-13 11:06:25 +02:00
Stephane Nicoll 69f54c6b6d Upgrade to Micrometer 1.6.10
Closes gh-27596
2021-08-13 11:05:32 +02:00
Scott Frederick 2178c281e9 Polish "Add network option for image building"
See gh-27486
2021-08-12 17:08:52 -05:00
Jeroen Meijer 8e6d03b221 Add network option for image building
This commit adds configuration to the Maven and Gradle plugins to
allow specifying the network mode to be provided to the image
building goal and task.

See gh-27486
2021-08-12 17:08:52 -05:00
Andy Wilkinson 42fb40b202 Upgrade to Flyway 7.13.0
Closes gh-27644
2021-08-12 17:18:29 +01:00
Andy Wilkinson 1966d1650b Merge branch '2.5.x'
Closes gh-27650
2021-08-12 15:46:24 +01:00
Andy Wilkinson 119fb6948d Test our Gradle plugin against Gradle 7.2-rc-3
Closes gh-27640
2021-08-12 15:26:50 +01:00
Andy Wilkinson 1f80ce47e3 Upgrade to Spring Data 2021.1.0-M2
Closes gh-27608
2021-08-12 14:56:13 +01:00
Andy Wilkinson d7a495b3df Upgrade to Micrometer 1.8.0-M2
Closes gh-27607
2021-08-12 14:55:07 +01:00
Andy Wilkinson d661328a9b Upgrade to Spring HATEOAS 1.4.0-M2
Closes gh-27649
2021-08-12 14:53:46 +01:00
Andy Wilkinson 56067fef7c Upgrade to Selenium HtmlUnit 2.52.0
Closes gh-27648
2021-08-12 14:53:46 +01:00
Andy Wilkinson 9adf81ccd2 Upgrade to QueryDSL 5.0.0
Closes gh-27647
2021-08-12 14:53:46 +01:00
Andy Wilkinson 6d915949c8 Upgrade to Jolokia 1.7.0
Closes gh-27646
2021-08-12 14:53:46 +01:00
Andy Wilkinson 88402c4597 Upgrade to HtmlUnit 2.52.0
Closes gh-27645
2021-08-12 14:53:46 +01:00
Andy Wilkinson 11d100933e Upgrade to Couchbase Client 3.2.0
Closes gh-27643
2021-08-12 13:52:22 +01:00
Andy Wilkinson fe17be16e9 Upgrade to Commons Pool2 2.11.0
Closes gh-27642
2021-08-12 13:52:22 +01:00
Andy Wilkinson 45a7f3e182 Upgrade to Commons DBCP2 2.9.0
Closes gh-27641
2021-08-12 13:08:18 +01:00
Andy Wilkinson 9bfe3c8cff Merge branch '2.5.x'
Closes gh-27639
2021-08-12 12:33:08 +01:00
Andy Wilkinson aafa21686a Merge branch '2.4.x' into 2.5.x
Closes gh-27638
2021-08-12 12:32:56 +01:00
Andy Wilkinson 52db64daa4 Merge branch '2.5.x'
Closes gh-27637
2021-08-12 12:32:14 +01:00
Andy Wilkinson 3bed23d9dc Replace PropertyMapper.CachingSupplier with use of SingletonSupplier
Closes gh-27635
2021-08-12 12:04:18 +01:00
Andy Wilkinson 341e129a59 Use SingletonSupplier in MetricsRepositoryFactoryCustomizer
Closes gh-27634
2021-08-12 11:35:11 +01:00
Andy Wilkinson fbeb5f19b7 Merge branch '2.5.x'
Closes gh-27636
2021-08-12 10:36:18 +01:00
Stephane Nicoll 57050fade4 Fix typo 2021-08-12 11:32:18 +02:00
Andy Wilkinson 35ea3b234d Prevent repository metrics from causing a circular reference
Fixes gh-27591
2021-08-12 10:26:16 +01:00
Stephane Nicoll 79462fa2da Start building against Spring Data 2021.0.4 snapshots
See gh-27633
2021-08-12 09:02:14 +02:00
Stephane Nicoll d888eb64de Start building against Spring Data 2020.0.12 snapshots
See gh-27632
2021-08-12 09:01:22 +02:00
Madhura Bhave 49c86e6e1b Allow health groups to be configured at an additional path
Closes gh-25471

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-08-11 19:25:25 -07:00
Andy Wilkinson 7a0fe0f95f Polish "Add auto-configuration for spring-rabbit-stream"
See gh-27480
2021-08-11 13:19:15 +01:00
Gary Russell 9784838229 Add auto-configuration for spring-rabbit-stream
See gh-27480
2021-08-11 12:05:59 +01:00
Andy Wilkinson 0ed9085ba2 Polish "Apply container customizer bean to AMQP MessageListenerContainer"
See gh-27625
2021-08-11 11:47:03 +01:00
Gary Russell 774941e958 Apply container customizer bean to AMQP MessageListenerContainer
See gh-27625
2021-08-11 11:18:16 +01:00
Stephane Nicoll fc5fd7fd75 Start building against Spring AMQP 2.4.0-M2 snapshots
See gh-27622
2021-08-10 20:45:03 +02:00
Stephane Nicoll 1862c6175a Upgrade to Reactor 2020.0.10
Closes gh-27606
2021-08-10 16:56:02 +02:00
Stephane Nicoll 2fd4ac67d1 Upgrade to Reactor 2020.0.10
Closes gh-27600
2021-08-10 16:55:19 +02:00
Stephane Nicoll 7d326bd0dc Upgrade to Reactor 2020.0.10
Closes gh-27595
2021-08-10 16:54:24 +02:00
Andy Wilkinson c43c22283d Merge branch '2.5.x'
Closes gh-27621
2021-08-10 10:45:31 +01:00
Andy Wilkinson f19fff4c64 Merge branch '2.4.x' into 2.5.x
Closes gh-27620
2021-08-10 10:45:07 +01:00
Andy Wilkinson d4d1ca007e Mention productionRuntimeClasspath in the docs
Closes gh-27558
2021-08-10 10:44:57 +01:00
Stephane Nicoll 94c347c64d Merge branch '2.5.x'
Closes gh-27619
2021-08-10 10:04:09 +02:00
Stephane Nicoll 1d29443e71 Merge branch '2.4.x' into 2.5.x
Closes gh-27618
2021-08-10 10:04:01 +02:00
Henning Pöttker 5b15c2191b Fix typo in javadoc
See gh-27614
2021-08-10 09:59:30 +02:00
Stephane Nicoll 72433e8f53 Merge branch '2.5.x'
Closes gh-27617
2021-08-10 09:58:50 +02:00
Stephane Nicoll a393c2982c Merge branch '2.4.x' into 2.5.x
Closes gh-27616
2021-08-10 09:58:40 +02:00
Stephane Nicoll cd0bb969db Fix Potential NPE in TomcatMetricsBinder.findContext()
Closes gh-27576
2021-08-10 09:58:18 +02:00
Stephane Nicoll 91fe94bf17 Start building against Spring Session 2021.1.0 snapshots
See gh-27612
2021-08-10 09:24:01 +02:00
Stephane Nicoll 00989f5ce7 Start building against Spring Integration 5.5.3 snapshots
See gh-27611
2021-08-10 09:24:01 +02:00
Stephane Nicoll e17d9cbf79 Start building against Spring Security 5.6.0-M2 snapshots
See gh-27610
2021-08-10 09:24:01 +02:00
Stephane Nicoll a4eda34170 Start building against Spring Kafka 2.8.0-M2 snapshots
See gh-27609
2021-08-10 09:24:01 +02:00
Stephane Nicoll ad7d40b11f Start building against Spring Data 2021.1.0-M2 snapshots
See gh-27608
2021-08-10 08:33:47 +02:00
Stephane Nicoll a916bc855f Start building against Micrometer 1.8.0-M2 snapshots
See gh-27607
2021-08-10 08:33:12 +02:00
Stephane Nicoll 4977d7438f Start building against Reactor 2020.0.10 snapshots
See gh-27606
2021-08-10 08:32:44 +02:00
Stephane Nicoll 585eb00af6 Start building against Spring Session 2021.0.2 snapshots
See gh-27605
2021-08-09 15:18:16 +02:00
Stephane Nicoll a304494508 Start building against Spring Integration 5.5.3 snapshots
See gh-27604
2021-08-09 15:17:50 +02:00
Stephane Nicoll 53bdcc9586 Start building against Spring Security 5.5.2 snapshots
See gh-27603
2021-08-09 15:17:20 +02:00
Stephane Nicoll 93f9c60540 Start building against Spring Kafka 2.7.6 snapshots
See gh-27602
2021-08-09 15:16:54 +02:00
Stephane Nicoll b09aea8ec1 Start building against Micrometer 1.7.3 snapshots
See gh-27601
2021-08-09 15:16:32 +02:00
Stephane Nicoll d4b6fd2344 Start building against Reactor 2020.0.10 snapshots
See gh-27600
2021-08-09 15:16:06 +02:00
Stephane Nicoll a4bf490582 Start building against Spring Session 2020.0.6 snapshots
See gh-27599
2021-08-09 14:24:23 +02:00
Stephane Nicoll e377a59f51 Start building against Spring Integration 5.4.10 snapshots
See gh-27598
2021-08-09 14:23:58 +02:00
Stephane Nicoll 7e3ad42fd3 Start building against Spring Security 5.4.8 snapshots
See gh-27597
2021-08-09 14:23:32 +02:00
Stephane Nicoll 1f2a5becf7 Start building against Micrometer 1.6.10 snapshots
See gh-27596
2021-08-09 14:23:03 +02:00
Stephane Nicoll 50b3b73ca7 Start building against Reactor 2020.0.10 snapshots
See gh-27595
2021-08-09 14:22:25 +02:00
Andy Wilkinson ee669dbf11 Merge branch '2.5.x'
Closes gh-27594
2021-08-09 11:41:15 +01:00
Andy Wilkinson 7610fe02c5 Test our Gradle plugin against 7.2-rc-2
Closes gh-27593
2021-08-09 09:50:07 +01:00
Stephane Nicoll 9826304e29 Merge branch '2.4.x' into 2.5.x
Closes gh-27557
2021-08-04 09:25:25 +02:00
izeye 9f44cefc56 Use deprecated mainClassName in Gradle test
See gh-27537
2021-08-04 09:23:52 +02:00
Stephane Nicoll e86ba076ec Merge branch '2.5.x'
Closes gh-27556
2021-08-04 08:56:02 +02:00
Stephane Nicoll a9ea8d95f3 Merge branch '2.4.x' into 2.5.x
Closes gh-27555
2021-08-04 08:55:51 +02:00
wuwen 46c47dcd29 Remove dead code in DefaultErrorAttributes
See gh-27538
2021-08-04 08:45:30 +02:00
Brian Clozel 8b3bea173c Configure WebTestClient for @AutoConfigureMockMvc tests
As of Spring Framework 5.3, `WebTestClient` can now be configured on top
of `MockMvc` for testing Spring MVC applications in a mock environment.

Prior to this commit, `WebTestClient` would be already configured for
WebFlux mock setups with `@AutoConfigureWebTestClient` or live servers
(for both MVC and WebFlux apps).

This commit enhances the `@AutoConfigureWebMvc` support so that a
`WebTestClient` instance is auto-configured if the spring-webflux
dependency is present on the classpath.

Closes gh-23067
2021-08-03 09:43:44 +02:00
Brian Clozel a1fe82c3dd Fix formatting 2021-08-02 16:54:25 +02:00
Brian Clozel e48cb12252 Polish "Add spring.webflux.multipart configuration properties"
See gh-26254
2021-08-02 15:40:42 +02:00
bono007 4c0b6304ac Add spring.webflux.multipart configuration properties
See gh-26254
2021-08-02 15:40:42 +02:00
Scott Frederick dc5bf0368d Merge branch '2.5.x'
Closes gh-27536
2021-07-30 13:51:25 -05:00
Scott Frederick f60d998ea1 Merge branch '2.4.x' into 2.5.x
Closes gh-27535
2021-07-30 13:50:56 -05:00
Scott Frederick 5d793afcb5 Prevent hanging when deleting Docker builder container after exception
An exception being thrown while the Maven plugin is uploading the app
archive bits to an ephemeral builder container would leave the
interaction with the Docker daemon in a state that caused further
interaction with the daemon (such as deleting the ephemeral builder)
to hang indefinitely. This commit cleans up the connection on an
exception to prevent this condition.

Fixes gh-27515
2021-07-30 13:41:40 -05:00
Andy Wilkinson 64c0eceec7 Add support for dumping the heap on OpenJ9
Closes gh-26466
2021-07-30 15:35:59 +01:00
Andy Wilkinson e30bf0e3e5 Merge branch '2.5.x'
Closes gh-27528
2021-07-29 18:47:40 +01:00
Andy Wilkinson 43d623e696 Merge branch '2.4.x' into 2.5.x
Closes gh-27527
2021-07-29 18:47:31 +01:00
Andy Wilkinson 7eb5f35f2f Make WebTestClient creation back off when no HTTP client available
Fixes gh-27520
2021-07-29 18:45:53 +01:00
Andy Wilkinson 2482607a06 Merge branch '2.5.x'
Closes gh-27526
2021-07-29 17:42:40 +01:00
Andy Wilkinson 533bb24b55 Merge branch '2.4.x' into 2.5.x
Closes gh-27525
2021-07-29 17:42:26 +01:00
Andy Wilkinson ad2d9c0ab1 Customize Cassandra's configuration to reduce container startup time
Closes gh-27524
2021-07-29 17:33:56 +01:00
Andy Wilkinson cdad8e2b7f Merge branch '2.5.x' 2021-07-29 17:28:38 +01:00
Andy Wilkinson 85054723f0 Reinstate GradleProjectBuilder for compatibility with JDK17-ea32
See gh-27521
2021-07-29 17:22:59 +01:00
Andy Wilkinson 23c4674352 Merge branch '2.5.x'
Closes gh-27522
2021-07-29 12:24:54 +01:00
Andy Wilkinson ca5af2d456 Test our Gradle plugin against Gradle 7.2-rc-1
Closes gh-27521
2021-07-29 12:05:14 +01:00
Andy Wilkinson 1bca2bbc85 Merge branch '2.5.x'
Closes gh-27511
2021-07-27 14:37:30 +01:00
Andy Wilkinson 30f63cc0cf Merge branch '2.4.x' into 2.5.x
Closes gh-27510
2021-07-27 14:37:16 +01:00
Andy Wilkinson ade922baec Stabilize LiveReloadServerTests
Closes gh-27503
2021-07-27 14:36:31 +01:00
Andy Wilkinson e265825653 Merge branch '2.5.x'
Closes gh-27506
2021-07-27 11:03:00 +01:00
Andy Wilkinson 08e26c97aa Merge branch '2.4.x' into 2.5.x
Closes gh-27505
2021-07-27 11:02:20 +01:00
Andy Wilkinson 031a036c9f Customize security filter registration in separate management context
Fixes gh-27372
2021-07-27 10:57:38 +01:00
Stephane Nicoll 6d0f5d5f21 Upgrade to Spring Integration 5.4.9
Closes gh-27500
2021-07-27 08:48:10 +02:00
Stephane Nicoll d31653e3c3 Upgrade to Spring Kafka 2.6.10
Closes gh-27501
2021-07-27 08:47:52 +02:00
Andy Wilkinson 4247131192 Start building against Spring Integration 5.4.9 snapshots
See gh-27500
2021-07-26 19:53:51 +01:00
Andy Wilkinson 04dc62904f Merge branch '2.4.x' into 2.5.x
Closes gh-27495
2021-07-26 15:23:17 +01:00
Andy Wilkinson 5d9da7206e Limit use of deprecated mainClassName in Gradle plugin tests
Closes gh-27320
2021-07-26 15:21:44 +01:00
Andy Wilkinson 11fc231cc9 Merge branch '2.5.x'
Closes gh-27491
2021-07-26 13:53:44 +01:00
Andy Wilkinson 1bf466702b Merge branch '2.4.x' into 2.5.x
Closes gh-27490
2021-07-26 13:53:31 +01:00
Andy Wilkinson 0326fa47b7 Make DataJpaTestSchemaCredentialsIntegrationTests create the schema
Closes gh-26106
2021-07-26 13:51:23 +01:00
Andy Wilkinson 621844abda Polish "Use MessageSource to interpolate bean validation messages"
See gh-17530
2021-07-26 12:10:15 +01:00
Dmytro Nosan bbb8367afb Use MessageSource to interpolate bean validation messages
See gh-17530
2021-07-26 12:10:15 +01:00
Andy Wilkinson ea9b155776 Remove dependency management for org.jboss:jboss-transaction-spi
Closes gh-26574
2021-07-26 11:43:43 +01:00
Andy Wilkinson 5163bdab22 Merge branch '2.5.x'
Closes gh-27489
2021-07-26 11:26:39 +01:00
Andy Wilkinson a71d19bce7 Merge branch '2.4.x' into 2.5.x
Closes gh-27488
2021-07-26 11:26:08 +01:00
Andy Wilkinson 388068cdff Polish "Sanitize URIs with non-alpha characters in their schemes"
See gh-27482
2021-07-26 11:13:58 +01:00
Billy Tobon bafa9c4784 Sanitize URIs with non-alpha characters in their schemes
See gh-27482
2021-07-26 11:03:18 +01:00
Andy Wilkinson 681df90d33 Generate metadata for records using implicit constructor binding
Closes gh-27216
2021-07-26 09:43:32 +01:00
Andy Wilkinson a5656e0932 Make @ConstructorBinding implict for config prop records
Closes gh-27216
2021-07-24 10:03:37 +01:00
Andy Wilkinson 3ff20ed4d9 Merge branch '2.5.x'
Closes gh-27485
2021-07-24 09:44:35 +01:00
Andy Wilkinson dead33a90a Merge branch '2.4.x' into 2.5.x
Closes gh-27484
2021-07-24 09:44:18 +01:00
Andy Wilkinson cff1827e27 Stabilize socketChannelClosedTriggersTunnelClose
Closes gh-27483
2021-07-24 09:43:41 +01:00
Andy Wilkinson 355226c21e Merge branch '2.5.x'
Closes gh-27474
2021-07-23 13:09:37 +01:00
Andy Wilkinson eaca9c7a83 Merge branch '2.4.x' into 2.5.x
Closes gh-27473
2021-07-23 13:09:27 +01:00
Andy Wilkinson ee07d6c3ca Increase response timeout for server-bound WebTestClients
Closes gh-27472
2021-07-23 13:06:25 +01:00
Andy Wilkinson dd7dd58f41 Merge branch '2.5.x'
Closes gh-27471
2021-07-23 11:02:43 +01:00
Andy Wilkinson 589a22eb0d Merge branch '2.4.x' into 2.5.x
Closes gh-27470
2021-07-23 11:02:24 +01:00
Andy Wilkinson 9e81fb3e38 Fix race condition in Jetty graceful shutdown tests
Some of the Jetty graceful shutdown tests were flaky due to the way
in which Jetty behaves when it is stopped.
Stopping the Jetty web server interrupts the thread that's handling
the active request. This initiates a race between the request-handling
thread which will decrement the number of active requests and the
main thread which expects an active request to cause the shutdown
result to be REQUESTS_ACTIVE. The test passes when the main thread
wins and fails as a request is active which it's checked. When the
request-handling thread wins the test fails as the count of active
requests has been deprecated before it is checked.

The blocking servlet that's used to stall a request and keep it
active needs to be updated to ignore the thread being interrupted
and continue waiting. This will ensure that a request remains active
until the main thread has checked the active request count and
determine the result of the shutdown.

Closes gh-27464
2021-07-23 10:30:17 +01:00
Phillip Webb 7e9ac39f0d Update copyright year of changed files 2021-07-22 09:50:37 -07:00
Phillip Webb 20a6073913 Polish 2021-07-22 09:50:17 -07:00
Andy Wilkinson c9361798be Merge branch '2.5.x'
Closes gh-27455
2021-07-22 11:42:45 +01:00
Andy Wilkinson 18b4898977 Polish "Fix deriving DataSources from custom type"
See gh-27453
2021-07-22 11:41:54 +01:00
saraswathy-krish d0e2823c49 Fix deriving DataSources from custom type
Eliminate the unsupported datasource property exception thrown
when trying to derive a datasource from an unknown datasource type.

See gh-27453
2021-07-22 11:41:54 +01:00
Andy Wilkinson 68c5f6cd30 Upgrade to Undertow 2.2.9.Final
Closes gh-27452
2021-07-22 10:05:59 +01:00
Andy Wilkinson 191bd8ca57 Upgrade to SLF4J 1.7.32
Closes gh-27451
2021-07-22 10:05:58 +01:00
Andy Wilkinson a279d42712 Upgrade to MySQL 8.0.26
Closes gh-27450
2021-07-22 10:05:57 +01:00
Andy Wilkinson 982d6c6097 Upgrade to Logback 1.2.4
Closes gh-27449
2021-07-22 10:05:55 +01:00
Andy Wilkinson 8044bd2424 Upgrade to Jedis 3.6.3
Closes gh-27448
2021-07-22 10:05:54 +01:00
Andy Wilkinson 3ca86435d1 Upgrade to Undertow 2.2.9.Final
Closes gh-27446
2021-07-22 09:05:30 +01:00
Andy Wilkinson aaf26245d5 Upgrade to SLF4J 1.7.32
Closes gh-27445
2021-07-22 09:05:29 +01:00
Andy Wilkinson 7fbfbfe21e Upgrade to MySQL 8.0.26
Closes gh-27444
2021-07-22 09:05:27 +01:00
Andy Wilkinson 37f690323f Polish
Closes gh-27432
2021-07-21 11:55:38 +01:00
Andy Wilkinson bb26b7bdf5 Polish
Closes gh-27431
2021-07-21 11:53:10 +01:00
izeye 734293d491 Polish
See gh-27418
2021-07-21 11:17:43 +01:00
Andy Wilkinson c211c971f1 Polishing
Closes gh-27429
2021-07-21 11:07:15 +01:00
Andy Wilkinson 4a533e14c3 Merge branch '2.4.x' into 2.5.x
Closes gh-27428
2021-07-21 11:06:40 +01:00
dreis2211 4d0c98011e Polishing
See gh-27417
2021-07-21 11:05:59 +01:00
Andy Wilkinson 91579158c3 Merge branch '2.5.x'
Closes gh-27425
2021-07-21 10:58:27 +01:00
Andy Wilkinson 29c83bfd76 Instantiate detectors with ClassLoader that discovered them
Fixes gh-27422
2021-07-21 10:57:30 +01:00
Andy Wilkinson 7e0fdb74f5 Merge branch '2.5.x'
Closes gh-27174
2021-07-20 19:15:22 +01:00
Andy Wilkinson dfe91be885 Upgrade to Spring Integration 5.5.2
Closes gh-27166
2021-07-20 19:14:21 +01:00
Andy Wilkinson 289ebef7da Merge branch '2.5.x'
Closes gh-27420
2021-07-20 18:00:21 +01:00
Andy Wilkinson a5e95ef4c8 Merge branch '2.4.x' into 2.5.x
Closes gh-27419
2021-07-20 17:59:53 +01:00
Andy Wilkinson b5587b053d Use ClassLoader that will load Yaml to check if it's present
Fixes gh-27133
2021-07-20 17:59:40 +01:00
Andy Wilkinson a05da3ae14 Merge branch '2.5.x'
Closes gh-27416
2021-07-20 15:14:44 +01:00
dreis2211 0ea3b9246a Add Java 17 to JavaVersion enum
See gh-26769
2021-07-20 15:12:50 +01:00
Andy Wilkinson 668f45f0e8 Polish "Make RabbitTemplateConfigurer's setters public"
See gh-27376
2021-07-20 14:59:24 +01:00
bono007 ce87928170 Make RabbitTemplateConfigurer's setters public
See gh-27376
2021-07-20 14:58:06 +01:00
Andy Wilkinson 6e7e72a481 Remove redundant deprecation suppressions
Closes gh-27415
2021-07-20 14:55:06 +01:00
dreis2211 f0df9671cd Remove redundant deprecation suppressions
See gh-27409
2021-07-20 14:53:28 +01:00
Andy Wilkinson 5783caabd7 Upgrade to Spring AMQP 2.3.10
Closes gh-27392
2021-07-20 13:14:48 +01:00
Andy Wilkinson 47289de332 Upgrade to Spring Kafka 2.7.4
Closes gh-27165
2021-07-20 13:14:07 +01:00
Scott Frederick 9f001efa29 Adjust fat jar central directory to account for launch script
An upgrade to Apache Commons Compress allows the build plugins to write
the launch script to the fat jar as a proper preamble, making the file
compatible with more jar and zip tooling.

Fixes gh-22336
2021-07-19 15:02:42 -05:00
Andy Wilkinson b5ef5a2d90 Merge branch '2.5.x'
Closes gh-27408
2021-07-19 20:20:19 +01:00
Andy Wilkinson 9d2cb162e6 Configure initializer dependencies grouped by detector
Previously, database initializers were detected and were configured
with dependencies based on their detection order. For example, if
detectors a, b, and c detected initializers a1, b1, b2, and c1,
c1 would depend on b2, b2 on b1, and b1 on a1:

------     ------     ------     ------
| c1 | --> | b2 | --> | b1 | --> | a1 |
------     ------     ------     ------

This could cause a dependency cycle in certain situations, for
example because the user had already configured b1 to depend on b2.

This commit reduces the risk of a cycle being created by batching
the initializers by their detector, with dependencies being
configured between each batch rather than between every initializer.
In the example above, this results in c1 depending on b1 and b2,
and b1 and b2 depending on a1:

           ------
------     | b1 |     ------
| c1 | --> |    | --> | a1 |
------     | b2 |     ------
           ------

As b1 and b2 were detected by the same detector, no dependency
between those initializers is defined.

Closes gh-27131
2021-07-19 20:00:59 +01:00
Andy Wilkinson 8e7a6ceb44 Polish "Make dev tools' home directory configurable"
See gh-17924
2021-07-19 17:56:34 +01:00
sfeldstein b9dbfad473 Make dev tools' home directory configurable
This allows separate projects to keep their own settings where common
settings such as spring.* or server.* don't conflict.

See gh-17924
2021-07-19 17:56:34 +01:00
Andy Wilkinson 48db35bf8d Upgrade to Spring Kafka 2.8.0-M1
Closes gh-27177
2021-07-19 17:50:02 +01:00
Andy Wilkinson a1cf18a06a Upgrade to Spring AMQP 2.4.0-M1
Closes gh-27171
2021-07-19 17:49:28 +01:00
Andy Wilkinson f1e99649df Upgrade to Spring Security 5.6.0-M1
Closes gh-27173
2021-07-19 17:47:43 +01:00
Andy Wilkinson 9d64269552 Upgrade to Logback 1.2.4
Closes gh-27380
2021-07-19 17:16:28 +01:00
Andy Wilkinson 9973937af3 Upgrade to Spring AMQP 2.3.10
Closes gh-27391
2021-07-19 17:15:50 +01:00
Andy Wilkinson 26bedd6527 Upgrade to Spring Data 2021.1.0-M1
See gh-27170
2021-07-19 15:43:37 +01:00
Andy Wilkinson ed38ac6ff0 Polish "Add idle timeout property for Reactor Netty"
See gh-27371
2021-07-19 14:58:15 +01:00
Saraswathy Hariharakrishnan cbcd7b939b Add idle timeout property for Reactor Netty
See gh-27371
2021-07-19 14:49:08 +01:00
izeye 14d8c33125 Polish
See gh-27405
2021-07-19 14:45:47 +01:00
Andy Wilkinson 51fedd6528 Reinstate support for Hibernate < 5.5
See gh-27352
2021-07-19 13:52:40 +01:00
Andy Wilkinson 6d50e65572 Revert "Add support for InfluxDB 2.x"
This reverts commit 52fedb2bb4.

See gh-25891
2021-07-19 13:28:08 +01:00
Andy Wilkinson 4d30eb453f Adopt Hiberate's CamelCaseToUnderscoresNamingStrategy
Closes gh-27352
2021-07-19 13:19:49 +01:00
Andy Wilkinson 99ada4e386 Upgrade to Rabbit AMQP Client 5.13.0
Closes gh-27404
2021-07-19 12:45:53 +01:00
Andy Wilkinson 02c1ce0953 Upgrade to Netty 4.1.66.Final
Closes gh-27403
2021-07-19 12:45:51 +01:00
Andy Wilkinson bae0a081fe Upgrade to jOOQ 3.14.13
Closes gh-27402
2021-07-19 12:45:50 +01:00
Andy Wilkinson 3112d163ea Upgrade to Jedis 3.6.2
Closes gh-27401
2021-07-19 12:45:49 +01:00
Andy Wilkinson d37e79a7f2 Upgrade to Infinispan 12.1.7.Final
Closes gh-27400
2021-07-19 12:45:47 +01:00
Andy Wilkinson 5f537cca39 Upgrade to Hibernate 5.5.4.Final
Closes gh-27399
2021-07-19 12:45:45 +01:00
Andy Wilkinson 9082e16a25 Upgrade to Git Commit ID Plugin 4.9.9
Closes gh-27398
2021-07-19 12:45:43 +01:00
Andy Wilkinson 5bedfe414f Upgrade to Flyway 7.11.2
Closes gh-27397
2021-07-19 12:45:42 +01:00
Andy Wilkinson 521155c48f Upgrade to Dropwizard Metrics 4.2.3
Closes gh-27396
2021-07-19 12:45:40 +01:00
Andy Wilkinson 3409c13b0e Upgrade to Byte Buddy 1.11.8
Closes gh-27395
2021-07-19 12:45:39 +01:00
Andy Wilkinson e1623708bd Upgrade to AppEngine SDK 1.9.90
Closes gh-27394
2021-07-19 12:45:37 +01:00
Andy Wilkinson 069074e490 Make ConnectionNameStrategy publicly settable
See gh-26982
2021-07-19 11:57:47 +01:00
Andy Wilkinson b354188bd8 Upgrade to Spring Data 2021.0.3
Closes gh-27164
2021-07-19 11:15:11 +01:00
Andy Wilkinson 6c8e040089 Upgrade to Netty 4.1.66.Final
Closes gh-27390
2021-07-19 11:13:59 +01:00
Andy Wilkinson ff31dffb0b Upgrade to jOOQ 3.14.13
Closes gh-27389
2021-07-19 11:13:58 +01:00
Andy Wilkinson 67739d9126 Upgrade to Jetty Reactive HTTPClient 1.1.10
Closes gh-27388
2021-07-19 11:13:56 +01:00
Andy Wilkinson db6ab63a38 Upgrade to Jedis 3.6.2
Closes gh-27387
2021-07-19 11:13:55 +01:00
Andy Wilkinson f6e4e0b299 Upgrade to Infinispan 12.1.7.Final
Closes gh-27386
2021-07-19 11:13:54 +01:00
Andy Wilkinson b4c3d00bd0 Upgrade to Dropwizard Metrics 4.1.25
Closes gh-27385
2021-07-19 11:13:52 +01:00
Andy Wilkinson 0ffafae375 Upgrade to AppEngine SDK 1.9.90
Closes gh-27384
2021-07-19 11:13:51 +01:00
Andy Wilkinson 3e0829cd47 Upgrade to Spring Data 2020.0.11
Closes gh-27161
2021-07-19 10:30:49 +01:00
Andy Wilkinson d8959f4bb2 Upgrade to Netty 4.1.66.Final
Closes gh-27381
2021-07-19 10:30:49 +01:00
Andy Wilkinson 47afdc0218 Upgrade to jOOQ 3.14.13
Closes gh-27379
2021-07-19 10:20:14 +01:00
Andy Wilkinson f8e3d86223 Upgrade to Dropwizard Metrics 4.1.25
Closes gh-27378
2021-07-19 10:20:12 +01:00
Andy Wilkinson 1d3b0d6262 Upgrade to AppEngine SDK 1.9.90
Closes gh-27377
2021-07-19 10:20:11 +01:00
Scott Frederick a0b32251eb Split gradle test support into a separate module
See gh-25824
2021-07-16 12:52:39 -05:00
Andy Wilkinson d60191add2 Merge pull request #26258 from pirgeo
* gh-26258:
  Polish "Refine documentation"
  Refine documentation
  Polish "Add properties for Dynatrace metrics API v2 ingest with Micrometer"
  Add properties for Dynatrace metrics API v2 ingest with Micrometer

Closes gh-26258
2021-07-16 17:39:38 +01:00
Andy Wilkinson 21b3202ab2 Polish "Refine documentation"
See gh-26258
2021-07-16 17:17:57 +01:00
Georg Pirklbauer d0cd3ab1d3 Refine documentation
See gh-26258
2021-07-16 17:05:19 +01:00
Andy Wilkinson 3d581847e6 Merge branch '2.5.x'
Closes gh-27370
2021-07-16 15:46:39 +01:00
Andy Wilkinson 96111514e1 Merge branch '2.4.x' into 2.5.x
Closes gh-27369
2021-07-16 15:46:27 +01:00
Andy Wilkinson 06a3c40506 Use a 10s init query timeout in Cassandra tests
Closes gh-27368
2021-07-16 15:45:49 +01:00
Andy Wilkinson 25234219ce Merge branch '2.5.x'
Closes gh-27365
2021-07-16 11:51:43 +01:00
dreis2211 be38ce3645 Disable Gradle plugin tests that fail on JDK 17
See gh-27328
2021-07-16 11:42:51 +01:00
Andy Wilkinson 43f1b98864 Polish "Add @WebServiceServerTest slice test support"
See gh-27091
2021-07-16 11:28:39 +01:00
Daniil Razorenov c897b1e689 Add @WebServiceServerTest slice test support
Add `@WebServiceServerTest` and related test auto-configuration to
allow slice testing of Spring Web Service server applications.

See gh-27091
2021-07-16 10:11:06 +01:00
Andy Wilkinson bc8ab6c755 Merge branch '2.5.x'
Closes gh-27362
2021-07-16 09:43:55 +01:00
Andy Wilkinson 1e09ef1db3 Merge branch '2.4.x' into 2.5.x
Closes gh-27361
2021-07-16 09:43:33 +01:00
Andy Wilkinson fe081b1742 Add Gson converter immediately before default Jackson converter
Previously, when the preferred json mapper was set to Gson, the Gson
HTTP message converter was added before any other converters. This
changed the form of String responses that were already valid. When
Jackson is in use, a string converter is used as it appears earlier
in the list than the Jackson converter. When the mapper is switched
to Gson, the Gson converter is added first in the list of converters
and the Strong converter is no longer used. This results in the
String, that was already valid JSON, being converted again. This
changes its form as quotes are escaped, etc.

This commit updates HttpMessageConverters so that the Gson converter
is added to the list immediately before the default Jackson
converter. This is done by considering the Gson converter to be an
equivalent of the Jackson converter.

Fixes gh-27354
2021-07-16 09:04:46 +01:00
Madhura Bhave cdd80e660a Merge branch '2.5.x' into main
Closes gh-27358
2021-07-15 16:16:31 -07:00
anvithabs e48efa158b Fix reference to a configuration property in cloud.adoc
See gh-27357
2021-07-15 16:14:55 -07:00