Commit Graph

14796 Commits

Author SHA1 Message Date
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