Commit Graph

17296 Commits

Author SHA1 Message Date
Phillip Webb bfc703a40d Merge branch '2.6.x' into 2.7.x
Closes gh-31879
2022-07-26 18:16:13 +01:00
Phillip Webb 59c9a9cd8a Polish "Call the value adapter during NamedContributorsMapAdapter construction"
See gh-31676
2022-07-26 18:15:32 +01:00
Guirong Hu c530f12cc3 Call the value adapter during NamedContributorsMapAdapter construction
Update `NamedContributorsMapAdapter` so that the adapter function is
called only once per entry. Prior to this commit, the adapter was called
dynamically which made `CompositeHealthContributor` behave differently
from a regular `HealthContributor`.

See gh-31676
2022-07-26 18:15:32 +01:00
Andy Wilkinson 3a9525b5b7 Merge branch '2.6.x' into 2.7.x
Closes gh-31877
2022-07-26 17:58:12 +01:00
Andy Wilkinson 5243cb8369 Broaded dependency management for REST Assured
Closes gh-31864
2022-07-26 17:54:47 +01:00
Phillip Webb fd076ab9ef Merge branch '2.6.x' into 2.7.x
Closes gh-31875
2022-07-26 17:46:20 +01:00
aoyvx 8c93d2e8a7 Ensure PROTOCOL_HANDLER system property is reset
See gh-31870
2022-07-26 17:20:55 +01:00
Phillip Webb fcf12686b7 Merge branch '2.6.x' into 2.7.x 2022-07-26 16:14:18 +01:00
Phillip Webb 9329acdad8 Reduce size of 'repeated-open-array.txt' file
Attempt to fix CI memory issues.
2022-07-26 16:13:44 +01:00
Phillip Webb 96fa4cd63c Merge branch '2.6.x' into 2.7.x 2022-07-26 15:53:17 +01:00
Phillip Webb da91cde304 Protect against deeply nested JSON maps
See gh-31868
2022-07-26 15:52:57 +01:00
Phillip Webb 06805f06af Merge branch '2.6.x' into 2.7.x
Closes gh-31873
2022-07-26 15:52:12 +01:00
Phillip Webb 4132414206 Protect against deeply malformed JSON map keys
Fixes gh-31869
2022-07-26 15:47:50 +01:00
Phillip Webb 466724f77a Merge branch '2.6.x' into 2.7.x
Closes gh-31871
2022-07-26 15:37:41 +01:00
Phillip Webb 6966ebd2a3 Protect against deeply nested JSON lists
Update `BasicJsonParser` to protect against deeply nested JSON lists
in the same way as Jackson.

Fixes gh-31868
2022-07-26 15:25:38 +01:00
Phillip Webb a4ef6a7c5c Merge branch '2.6.x' into 2.7.x
Closes gh-31865
2022-07-26 12:13:16 +01:00
Phillip Webb f8412847dc Update copyright year for "Fix typos in code and documentation"
See gh-31734
2022-07-26 12:08:30 +01:00
Marc Wrobel dbfc6bded4 Fix typos in code and documentation
See gh-31734
2022-07-26 12:08:07 +01:00
Phillip Webb 3931e82841 Merge branch '2.6.x' into 2.7.x 2022-07-26 10:50:42 +01:00
Phillip Webb 4bcec6e0ee Polish 2022-07-26 10:50:01 +01:00
Andy Wilkinson ac3f552dde Merge branch '2.6.x' into 2.7.x
Closes gh-31846
2022-07-22 14:47:45 +01:00
dreis2211 de5834d203 Polish
See gh-31845
2022-07-22 14:46:01 +01:00
Andy Wilkinson 64dcfe520d Merge branch '2.6.x' into 2.7.x
Closes gh-31842
2022-07-22 12:15:39 +01:00
Andy Wilkinson a1443d1cdc Enforce ordering in additional-spring-configuration-metadata.json files
Closes gh-31575
2022-07-22 12:09:58 +01:00
Stephane Nicoll aa93b2153a Upgrade to Embedded Mongo 3.4.7
Closes gh-31830
2022-07-21 07:50:49 +02:00
Scott Frederick 9da38c8d2d Merge branch '2.6.x' into 2.7.x
Closes gh-31826
2022-07-20 17:29:58 -05:00
Scott Frederick 4e0b3aad9f Clarify how docker image publishing registry is determined
Closes gh-31820
2022-07-20 17:29:40 -05:00
Scott Frederick f9cf31e59e Fix compile errors
See gh-28844
2022-07-20 16:07:19 -05:00
Scott Frederick 09c7ce6dab Merge branch '2.6.x' into 2.7.x
Closes gh-31824
2022-07-20 15:10:43 -05:00
Scott Frederick a7dfeae09c Merge branch 'gh-28844' into 2.6.x
Closes gh-31823
2022-07-20 15:10:27 -05:00
Scott Frederick 9b0cdac58a Simplify support for pushing images to unauthenticated registries
This commit removes the requirement that `docker.publishRegistry`
configuration must be provided when an image is published by the Gradle
or Maven plugin.

Fixes gh-28844
2022-07-20 15:06:05 -05:00
Andy Wilkinson 2e98cafcca Merge branch '2.6.x' into 2.7.x
Closes gh-31818
2022-07-20 21:01:47 +01:00
Andy Wilkinson ab2b04fafd Find health contributors in ancestor contexts in non-reactive apps
Previously, health contributors in a non-reative app were found by
retrieving them from the application context rather than via
dependency injection. This results in only contributors from the
current context being found, with contributors in ancestor contexts
ignored.

This commit moves to injection of the contributors, aligning the
behaviour with that of a reactive application.

Closes gh-27308
2022-07-20 20:52:02 +01:00
Andy Wilkinson cd1ce50105 Merge branch '2.6.x' into 2.7.x
Closes gh-31814
2022-07-20 19:24:38 +01:00
Andy Wilkinson 182adeed35 Add modules to dependency management for Derby
Closes gh-31570
2022-07-20 19:23:50 +01:00
Brian Clozel 53b9ff5e89 Upgrade to Spring for GraphQL 1.0.1
Closes gh-31616
2022-07-20 17:37:41 +02:00
Brian Clozel 8cb2a0de94 Upgrade to GraphQL Java 18.2
Closes gh-31812
2022-07-20 17:36:45 +02:00
Andy Wilkinson c3f3a2a707 Merge branch '2.6.x' into 2.7.x
Closes gh-31810
2022-07-20 11:54:01 +01:00
Andy Wilkinson efdd844c7a Log a warning if determining the app's PID takes too long
Closes gh-31572
2022-07-20 11:53:12 +01:00
Andy Wilkinson 84efc89d76 Merge branch '2.6.x' into 2.7.x
Closes gh-31806
2022-07-20 10:52:00 +01:00
Andy Wilkinson bcbe072d96 Fix 500 from mappings endpoint with attributed WebFlux router function
Closes gh-31784
2022-07-20 10:42:56 +01:00
Andy Wilkinson 10e19d504a Merge branch '2.6.x' into 2.7.x
Closes gh-31804
2022-07-20 10:17:39 +01:00
Andy Wilkinson 628c2cd0b1 Ensure JMX endpoints are uniquely named in a context hierarchy
Closes gh-31718
2022-07-20 10:15:52 +01:00
Stephane Nicoll 6469a02c35 Merge branch '2.6.x' into 2.7.x
Closes gh-31801
2022-07-20 09:52:41 +02:00
Stephane Nicoll 585a57be76 Update copyright year of changed file
See gh-31798
2022-07-20 09:45:57 +02:00
aoyvx abe938eb2c Use Bean ClassLoader consistently to resolve class names
See gh-31798
2022-07-20 09:45:33 +02:00
Stephane Nicoll b9cf951423 Upgrade to Spring Integration 5.5.14
Closes gh-31800
2022-07-20 09:16:59 +02:00
Stephane Nicoll ac65835103 Upgrade to Spring Integration 5.5.14
Closes gh-31799
2022-07-20 09:16:17 +02:00
Brian Clozel 7c7a32a568 Auto-configure GraphQL subscription exception handling
Closes gh-31794
2022-07-19 16:53:11 +02:00
Stephane Nicoll a62ea1e3b8 Upgrade to AppEngine SDK 1.9.98
Closes gh-31790
2022-07-19 14:14:05 +02:00
Stephane Nicoll 4449f41cf5 Upgrade to Kotlin Coroutines 1.6.4
Closes gh-31742
2022-07-19 14:12:20 +02:00
Stephane Nicoll e48f5de20f Upgrade to AppEngine SDK 1.9.98
Closes gh-31788
2022-07-19 14:09:31 +02:00
Andy Wilkinson 4278683f26 Upgrade to Spring Kafka 2.8.8
Closes gh-31786
2022-07-18 20:12:04 +01:00
Andy Wilkinson a326a1291e Upgrade to Spring Kafka 2.8.8
Closes gh-31785
2022-07-18 20:10:36 +01:00
Stephane Nicoll 503656000d Upgrade to Spring Data 2021.1.6
Closes gh-31611
2022-07-18 15:17:46 +02:00
Stephane Nicoll e25d3d6a03 Upgrade to Spring Data 2021.1.6
Closes gh-31611
2022-07-18 15:17:02 +02:00
Stephane Nicoll 52d4dd9347 Merge branch '2.6.x' into 2.7.x
Closes gh-31780
2022-07-18 11:49:22 +02:00
Stephane Nicoll 4eb5037828 Update copyright year of changed files
See gh-31571
2022-07-18 11:48:35 +02:00
TheoCaldas 869ed4f71a Delimit output value in failure analysis
See gh-31571
2022-07-18 11:36:39 +02:00
Stephane Nicoll 92a7af4038 Merge branch '2.6.x' into 2.7.x
Closes gh-31777
2022-07-18 11:30:36 +02:00
Johnny Lim f591c75ad7 Disable incompatible tests on macOS AArch64
This commit also updates related test support classes.

See gh-31539
2022-07-18 11:25:52 +02:00
Andy Wilkinson 9c250cae92 Merge branch '2.6.x' into 2.7.x
Closes gh-31754
2022-07-14 17:28:54 +01:00
Stephane Nicoll 186f93c3cb Revert "Upgrade to Elasticsearch 7.17.5"
This reverts commit ac4c3d2b81.

See gh-31737
2022-07-14 18:26:48 +02:00
Andy Wilkinson 8c4708982b Test our Gradle plugin against 7.5
Closes gh-31753
2022-07-14 17:25:34 +01:00
Stephane Nicoll b603138248 Upgrade to SendGrid 4.9.3
Closes gh-31747
2022-07-14 18:25:34 +02:00
Stephane Nicoll 59a394c5a5 Upgrade to Netty 4.1.79.Final
Closes gh-31746
2022-07-14 18:25:34 +02:00
Stephane Nicoll 37e0ea5142 Upgrade to Neo4j Java Driver 4.4.9
Closes gh-31745
2022-07-14 18:25:34 +02:00
Stephane Nicoll 5f65301cbc Upgrade to MariaDB 3.0.6
Closes gh-31744
2022-07-14 18:25:34 +02:00
Stephane Nicoll 90ac0e87ee Upgrade to Lettuce 6.1.9.RELEASE
Closes gh-31743
2022-07-14 18:25:33 +02:00
Stephane Nicoll 38e90497ac Upgrade to Kotlin Coroutines 1.6.3-native-mt
Closes gh-31742
2022-07-14 18:25:33 +02:00
Stephane Nicoll 611514ae89 Upgrade to JsonAssert 1.5.1
Closes gh-31741
2022-07-14 18:25:33 +02:00
Stephane Nicoll 191509292b Upgrade to Jetty Reactive HTTPClient 1.1.12
Closes gh-31740
2022-07-14 18:25:33 +02:00
Stephane Nicoll 1a4d0b2d9c Upgrade to HttpCore5 5.1.4
Closes gh-31739
2022-07-14 18:25:33 +02:00
Stephane Nicoll 689dae1b14 Upgrade to Hibernate 5.6.10.Final
Closes gh-31738
2022-07-14 18:25:32 +02:00
Stephane Nicoll ac4c3d2b81 Upgrade to Elasticsearch 7.17.5
Closes gh-31737
2022-07-14 18:25:32 +02:00
Stephane Nicoll 01fbdac192 Upgrade to Couchbase Client 3.3.2
Closes gh-31736
2022-07-14 18:25:32 +02:00
Stephane Nicoll 30a10164a8 Upgrade to Byte Buddy 1.12.12
Closes gh-31735
2022-07-14 18:25:32 +02:00
Stephane Nicoll 8a58fc438f Upgrade to Netty 4.1.79.Final
Closes gh-31731
2022-07-14 17:02:48 +02:00
Stephane Nicoll 99ad445229 Upgrade to Neo4j Java Driver 4.4.9
Closes gh-31730
2022-07-14 17:02:48 +02:00
Stephane Nicoll 877fffc02b Upgrade to MariaDB 2.7.6
Closes gh-31729
2022-07-14 17:02:47 +02:00
Stephane Nicoll e99d53bfeb Upgrade to Lettuce 6.1.9.RELEASE
Closes gh-31728
2022-07-14 17:02:47 +02:00
Stephane Nicoll 6181db3f20 Upgrade to JsonAssert 1.5.1
Closes gh-31727
2022-07-14 17:02:47 +02:00
Stephane Nicoll 38713f2586 Upgrade to Jetty Reactive HTTPClient 1.1.12
Closes gh-31726
2022-07-14 17:02:46 +02:00
Stephane Nicoll 02bf666f88 Upgrade to HttpCore5 5.1.4
Closes gh-31725
2022-07-14 17:02:46 +02:00
Stephane Nicoll 6b54aefe3e Upgrade to Hibernate 5.6.10.Final
Closes gh-31724
2022-07-14 17:02:46 +02:00
Andy Wilkinson b6b4b3b5b6 Merge branch '2.6.x' into 2.7.x
Closes gh-31732
2022-07-14 15:39:15 +01:00
Andy Wilkinson 9443713c53 Disable Log4j2's shutdown hook with 2.18 and later
Closes gh-31719
2022-07-14 15:38:19 +01:00
Stephane Nicoll 585a7ca71f Upgrade to Spring Framework 5.3.22
Closes gh-31613
2022-07-14 16:10:37 +02:00
Stephane Nicoll 77194eed29 Upgrade to Spring Framework 5.3.22
Closes gh-31610
2022-07-14 16:09:35 +02:00
Jonas 6afd041bb2 Fix typo
See gh-31518
2022-07-13 16:18:53 +02:00
Stephane Nicoll 3e4a5703c6 Merge branch '2.6.x' into 2.7.x
Closes gh-31706
2022-07-13 14:11:44 +02:00
Stephane Nicoll 628a7b0c5c Update copyright year of changed files
See gh-31516
2022-07-13 14:08:22 +02:00
“Jakub ed7b333138 Add missing descriptions for HTTP Server and Data repositories metrics
See gh-31516
2022-07-13 13:55:36 +02:00
Stephane Nicoll b8647551cb Merge branch '2.6.x' into 2.7.x
Closes gh-31704
2022-07-13 13:50:17 +02:00
Johnny Lim b17cb9b92b Polish gh-31231
See gh-31540
2022-07-13 13:49:13 +02:00
Andy Wilkinson 1664ce0f20 Uses tabs consistently for indentation in spring-boot-dependencies 2022-07-12 15:47:54 +01:00
Andy Wilkinson 1c2b0ae705 Merge branch '2.6.x' into 2.7.x
Closes gh-31693
2022-07-12 14:28:10 +01:00
Andy Wilkinson 7c55639167 Depend on log4j-api directly rather than via Elastic's transitives
Closes gh-31692
2022-07-12 14:27:56 +01:00
Stephane Nicoll cb2844d527 Merge branch '2.6.x' into 2.7.x
Closes gh-31690
2022-07-12 14:51:33 +02:00
Stephane Nicoll a368919600 Polish "Fix deprecation metadata for grid-fs-database"
See gh-31689
2022-07-12 14:42:49 +02:00
Felix Scheinost d5e18e61c5 Fix deprecation metadata for grid-fs-database
See gh-31689
2022-07-12 14:42:36 +02:00
Stephane Nicoll c7d8323158 Upgrade to Reactor 2020.0.21
Closes gh-31608
2022-07-12 14:34:21 +02:00
Stephane Nicoll 793586f898 Upgrade to Reactor 2020.0.21
Closes gh-31607
2022-07-12 14:33:38 +02:00
Andy Wilkinson eb13f80ff4 Upgrade to Micrometer 1.9.2
Closes gh-31614
2022-07-11 21:05:47 +01:00
Andy Wilkinson fe19984147 Upgrade to Micrometer 1.8.8
Closes gh-31612
2022-07-11 21:04:15 +01:00
Andy Wilkinson c6d5652dcc Start building against Spring GraphQL 1.0.1 snapshots
See gh-31616
2022-07-08 09:58:24 +01:00
Andy Wilkinson 28b4938c9b Startin building against Spring Data 2021.2.2 snapshots
See gh-31615
2022-07-08 09:57:38 +01:00
Andy Wilkinson 2c74a9376a Start building against Micrometer 1.9.2 snapshots
See gh-31614
2022-07-08 09:56:52 +01:00
Andy Wilkinson 292d351b16 Start building against Reactor 2020.0.21 snapshots
See gh-31608
2022-07-08 09:55:52 +01:00
Andy Wilkinson 55aa17eb11 Start building against Spring Framework 5.3.22 snapshots
See gh-31613
2022-07-08 09:55:15 +01:00
Andy Wilkinson b94527de3b Start building against Micrometer 1.8.8 snapshots
See gh-31612
2022-07-07 17:04:02 +01:00
Andy Wilkinson f417b4b9b2 Start building against Spring Data 2021.1.6 snapshots
See gh-31611
2022-07-07 17:04:02 +01:00
Andy Wilkinson ece51636fd Start building against Spring Framework 5.3.22 snapshots
See gh-31610
2022-07-07 17:04:01 +01:00
Andy Wilkinson c38a3c0da4 Start building against Reactor 2020.0.21 snapshots
See gh-31607
2022-07-07 16:37:55 +01:00
Moritz Halbritter d4b1c219ab Move test imports from main to test resources
They shouldn't have been in main resources in the first place, this was
an accident.
2022-07-07 15:15:34 +02:00
Scott Frederick e24c49a09a Merge branch '2.6.x' into 2.7.x
Closes gh-31558
2022-06-30 14:58:28 -05:00
Scott Frederick 17bdc526f6 Avoid adding layers for buildpacks that exist in the builder
This commit adds validation of any buildpacks that are specified for
image building to match them against buildpacks that are bundled in
the builder. If an image buildpack's ID, version, and one layer
hash match the same information stored in a label on the builder
image, that buildpack won't be added and the buildpack bundled in
the builder will be used instead. This reduces the chance of adding to
the total count of layers in a builder image unnecessarily.

Fixes gh-31233
2022-06-30 14:35:34 -05:00
Andy Wilkinson 5299e849b9 Merge branch '2.6.x' into 2.7.x
Closes gh-31556
2022-06-30 20:11:28 +01:00
Andy Wilkinson 6411f88f28 Upgrade to Dependency Management Plugin 1.0.12.RELEASE
Closes gh-31555
2022-06-30 19:45:40 +01:00
Andy Wilkinson 2f01739e0d Polish since date on new SslStoreProvider API
See gh-31253
2022-06-26 08:18:21 +01:00
Andy Wilkinson 71526bf44f Polish
See gh-31253
2022-06-25 13:47:25 +01:00
Andy Wilkinson 7abc7df7b8 Allow PEM certificates to be used without a key store password
Closes gh-31253
2022-06-24 18:01:20 +01:00
Andy Wilkinson dfb8979456 Merge branch '2.6.x' into 2.7.x 2022-06-24 15:03:25 +01:00
Andy Wilkinson c87340e5c1 Remove unnecessary throws 2022-06-24 15:02:58 +01:00
Andy Wilkinson 1e08f545d0 Merge branch '2.6.x' into 2.7.x
Closes gh-31525
2022-06-24 13:05:06 +01:00
Andy Wilkinson f49b16c645 Upgrade to Spring Java Format 0.0.34
Closes gh-31524
2022-06-24 12:57:52 +01:00
Stephane Nicoll a94e7d6672 Upgrade to Jetty 9.4.48.v20220622
Closes gh-31509
2022-06-23 08:41:23 +02:00
Stephane Nicoll 5976457271 Upgrade to Byte Buddy 1.12.11
Closes gh-31508
2022-06-23 08:41:19 +02:00
Stephane Nicoll 6484be2aa5 Upgrade to Jetty 9.4.48.v20220622
Closes gh-31507
2022-06-23 08:37:51 +02:00
Phillip Webb 28775c2c53 Merge branch '2.6.x' into 2.7.x
Closes gh-31503
2022-06-22 20:31:58 -07:00
Phillip Webb 904feb2490 Polish 'Allow spring.data.cassandra.config file to override default values'
See gh-31238
2022-06-22 19:51:32 -07:00
Stern, Ittay (is9613) 1c7d99890e Allow spring.data.cassandra.config file to override default values
Update `CassandraAutoConfiguration` so that properties in a
`spring.data.cassandra.config` file can override the default values
defined in `CassandraProperties`.

This commit changes two things:

1. Any primitive on `CassandraProperties` are replaced with object values.
   This allows distinguishing between defaults values and no-values. Then
   CassandraAutoConfiguration.mapConfig() can use whenNonNull() predicate
   to ignore those.

2. `CassandraProperties` no longer populate default values on any
   property. With that, the defaults can be applied on top of the file
   spring.data.cassandra.config; i.e. the config file have higher
   precedence than the defaults, but lower that any spring.data.cassandra.*
   property.

See gh-31238
2022-06-22 19:27:40 -07:00
Phillip Webb d64f601dfd Merge branch '2.6.x' into 2.7.x
Closes gh-31501
2022-06-22 16:31:52 -07:00
Phillip Webb aed4c47adb Polish CompositeHandlerExceptionResolver
See gh-31495
2022-06-22 16:23:38 -07:00
Guirong Hu 3592292e4b Use ExceptionHandler when Spring MVC uses a different management port
Update `CompositeHandlerExceptionResolver` to search for beans in
all contexts. Note that `BeanFactoryUtils.beansOfTypeIncludingAncestors`
cannot not be used since we need to pick up all beans, even if they
have the same name.

See gh-31495
2022-06-22 16:13:26 -07:00
Andy Wilkinson a784156f66 Revert "Start building against Spring Session 2021.1.4 snapshots"
This reverts commit 2f40c52d81.
2022-06-22 21:13:18 +01:00
Andy Wilkinson 83932cfe94 Merge branch '2.6.x' into 2.7.x
Closes gh-31483
2022-06-22 20:54:56 +01:00
Andy Wilkinson 17c757c600 Upgrade to Spring Integration 5.5.13
Closes gh-31482
2022-06-22 20:38:19 +01:00
Andy Wilkinson 268f13dbd7 Merge branch '2.6.x' into 2.7.x
Closes gh-31499
2022-06-22 19:49:38 +01:00
Andy Wilkinson 522ea0a90e Handle malformed JSON more consistently
Closes gh-31301
2022-06-22 18:31:16 +01:00
Stephane Nicoll e967d0383b Merge branch '2.6.x' into 2.7.x 2022-06-22 08:16:18 +02:00
Stephane Nicoll 79d3e3080f Polish 2022-06-22 08:15:04 +02:00
Stephane Nicoll f27adeb241 Upgrade to Solr 8.11.2
Closes gh-31491
2022-06-22 08:03:53 +02:00
Stephane Nicoll 4f6bc3c2e0 Upgrade to Kotlin Coroutines 1.6.3
Closes gh-31490
2022-06-22 08:03:51 +02:00
Stephane Nicoll 7266dd5270 Upgrade to Jetty 9.4.47.v20220610
Closes gh-31489
2022-06-22 08:03:47 +02:00
Stephane Nicoll 296e88db51 Upgrade to Dropwizard Metrics 4.2.10
Closes gh-31488
2022-06-22 08:03:45 +02:00
Stephane Nicoll 72257ba302 Upgrade to Jetty 9.4.47.v20220610
Closes gh-31487
2022-06-22 07:55:16 +02:00
Stephane Nicoll e74163704c Upgrade to Dropwizard Metrics 4.2.10
Closes gh-31486
2022-06-22 07:55:14 +02:00
Stephane Nicoll 1c2e3b731b Upgrade to Spring Kafka 2.8.7
Closes gh-31377
2022-06-22 07:52:14 +02:00
Stephane Nicoll 09cd024817 Upgrade to Spring Kafka 2.8.7
Closes gh-31350
2022-06-22 07:51:32 +02:00
Phillip Webb 13b2de3bb8 Merge branch '2.6.x' into 2.7.x
Closes gh-31484
2022-06-21 19:10:23 -07:00
Phillip Webb 7fc9debf2a Consider super classes when detecting nested property classes
Update `PropertyDescriptor.isParentTheSame` to consider the candidate
as well as all super classes.

Fixes gh-21626
2022-06-21 19:09:32 -07:00
Phillip Webb 4c0a4cb669 Polish 2022-06-21 12:08:03 -07:00
Andy Wilkinson 390554a84f Upgrade to Spring AMQP 2.4.6
Closes gh-31376
2022-06-21 16:36:55 +01:00
Andy Wilkinson 49fd727ef0 Upgrade to Spring AMQP 2.4.6
Closes gh-31348
2022-06-21 16:34:47 +01:00
Moritz Halbritter ae75d4386c Merge branch '2.6.x' into 2.7.x 2022-06-21 14:01:18 +02:00
Moritz Halbritter b56b95d429 Add Apache HttpClient WebClient support to documentation 2022-06-21 14:00:55 +02:00
Andy Wilkinson d45e42f2e1 Upgrade to Spring Security 5.6.6
Closes gh-31351
2022-06-20 20:46:38 +01:00
Andy Wilkinson 79580617a6 Upgrade to Spring Security 5.7.2
Closes gh-31375
2022-06-20 20:33:56 +01:00
Sébastien Deleuze b5d380c1cb Make SpringApplication Kotlin samples idiomatic
See gh-31463
2022-06-20 14:38:43 +02:00
Stephane Nicoll c04b407913 Upgrade to Spring Data 2021.2.1
Closes gh-31374
2022-06-20 14:22:25 +02:00
Stephane Nicoll 4f78f9556d Upgrade to Spring HATEOAS 1.5.1
Closes gh-31465
2022-06-20 14:21:48 +02:00
Stephane Nicoll 46a5e5d9d4 Upgrade to Spring Data 2021.1.5
Closes gh-31349
2022-06-20 14:19:53 +02:00
Stephane Nicoll 87ecbc7073 Upgrade to Spring HATEOAS 1.4.4
Closes gh-31464
2022-06-20 14:19:17 +02:00
Stephane Nicoll 8b9579eeb7 Polish "Harmonize Kotlin example"
See gh-31458
2022-06-20 10:33:34 +02:00
ningenMe 6685d49faa Harmonize Kotlin example
See gh-31458
2022-06-20 10:27:04 +02:00
Johnny Lim 11a07a9d1e Polish OAuth2ResourceServerAutoConfigurationTests
See gh-31453
2022-06-19 10:11:48 +02:00
Stephane Nicoll 3366e4de25 Upgrade to Spring LDAP 2.4.1
Closes gh-31373
2022-06-17 11:00:10 +02:00
Stephane Nicoll c61fab2777 Upgrade to Undertow 2.2.18.Final
Closes gh-31438
2022-06-17 10:59:47 +02:00
Stephane Nicoll 4f95fdea82 Upgrade to Reactive Streams 1.0.4
Closes gh-31436
2022-06-17 10:59:42 +02:00
Stephane Nicoll 91d9d48446 Upgrade to Postgresql 42.3.6
Closes gh-31435
2022-06-17 10:59:40 +02:00
Stephane Nicoll 548e8728e4 Upgrade to Netty 4.1.78.Final
Closes gh-31434
2022-06-17 10:59:38 +02:00
Stephane Nicoll e43e9c3c40 Upgrade to Neo4j Java Driver 4.4.6
Closes gh-31433
2022-06-17 10:59:35 +02:00
Stephane Nicoll 8e911affad Upgrade to MongoDB 4.6.1
Closes gh-31432
2022-06-17 10:59:33 +02:00
Stephane Nicoll c93d3201ff Upgrade to MariaDB 3.0.5
Closes gh-31431
2022-06-17 10:59:31 +02:00
Stephane Nicoll 338d8d997b Upgrade to Kotlin Coroutines 1.6.2
Closes gh-31430
2022-06-17 10:59:29 +02:00
Stephane Nicoll dbf3677c0a Upgrade to jOOQ 3.14.16
Closes gh-31429
2022-06-17 10:59:26 +02:00
Stephane Nicoll 26b64e7713 Upgrade to Hazelcast 5.1.2
Closes gh-31428
2022-06-17 10:59:24 +02:00
Stephane Nicoll 670876b52d Upgrade to H2 2.1.214
Closes gh-31427
2022-06-17 10:59:22 +02:00
Stephane Nicoll cd2a8a91da Upgrade to Groovy 3.0.11
Closes gh-31426
2022-06-17 10:59:19 +02:00
Stephane Nicoll 4d03653b74 Upgrade to Flyway 8.5.13
Closes gh-31425
2022-06-17 10:59:16 +02:00
Stephane Nicoll e60a235194 Upgrade to Embedded Mongo 3.4.6
Closes gh-31424
2022-06-17 10:59:14 +02:00
Stephane Nicoll 54e4ff8e81 Upgrade to Elasticsearch 7.17.4
Closes gh-31423
2022-06-17 10:59:12 +02:00
Stephane Nicoll 9590a9914a Upgrade to Couchbase Client 3.3.1
Closes gh-31422
2022-06-17 10:59:10 +02:00
Stephane Nicoll d82c6dc291 Upgrade to AppEngine SDK 1.9.97
Closes gh-31421
2022-06-17 10:59:07 +02:00
Stephane Nicoll 8548f1a1cb Upgrade to Undertow 2.2.18.Final
Closes gh-31420
2022-06-17 10:30:34 +02:00
Stephane Nicoll 0edf12c07c Upgrade to Reactive Streams 1.0.4
Closes gh-31418
2022-06-17 10:30:30 +02:00
Stephane Nicoll 898cf7665a Upgrade to Postgresql 42.3.6
Closes gh-31417
2022-06-17 10:30:28 +02:00
Stephane Nicoll 854578c936 Upgrade to Netty tcNative 2.0.53.Final
Closes gh-31416
2022-06-17 10:30:25 +02:00
Stephane Nicoll 9076e38f06 Upgrade to Netty 4.1.78.Final
Closes gh-31415
2022-06-17 10:30:23 +02:00
Stephane Nicoll 71e5b90948 Upgrade to Neo4j Java Driver 4.4.6
Closes gh-31414
2022-06-17 10:30:21 +02:00
Stephane Nicoll 3b20c67f02 Upgrade to jOOQ 3.14.16
Closes gh-31413
2022-06-17 10:30:19 +02:00
Stephane Nicoll 78d0db7ff0 Upgrade to Infinispan 12.1.12.Final
Closes gh-31412
2022-06-17 10:30:16 +02:00
Stephane Nicoll 623a48fb03 Upgrade to Groovy 3.0.11
Closes gh-31411
2022-06-17 10:30:14 +02:00
Stephane Nicoll ae1b47c245 Upgrade to AppEngine SDK 1.9.97
Closes gh-31410
2022-06-17 10:30:12 +02:00
Phillip Webb 7c91ebb1b0 Merge branch '2.6.x' into 2.7.x
Closes gh-31408
2022-06-16 15:36:00 -07:00
Phillip Webb ae6311ddda Prevent Logback from accidentally being used in Log4J2LoggingSystemTests
Update `Log4J2LoggingSystemTests` to exclude Logback and include
'log4j-slf4j-impl'. The `ModifiedClassPathClassLoader` has also been
updated so that it no longer automatically excludes `log4j` artifacts,
instead we now use `@ClassPathExclusions` on the relevant tests.

Fixes gh-19365
2022-06-16 15:35:32 -07:00
Andy Wilkinson 89bef73846 Polish 2022-06-16 15:39:04 +01:00
Andy Wilkinson a1cc5bf238 Allow multiple JWS algorithms to be configured
Closes gh-31321
2022-06-16 12:59:13 +01:00
Andy Wilkinson 5e1cd28d3f Merge branch '2.6.x' into 2.7.x
Closes gh-31402
2022-06-16 12:14:28 +01:00
Lars Grefer e8a1a0399a Upgrade to Bouncycastle 1.71
Closes gh-31400
2022-06-16 12:14:06 +01:00
Stephane Nicoll e5bb1cd108 Upgrade to Micrometer 1.9.1
Closes gh-31372
2022-06-16 11:04:42 +02:00
Stephane Nicoll 7e6acfd2ab Upgrade to Micrometer 1.8.7
Closes gh-31347
2022-06-16 11:03:51 +02:00
Phillip Webb bcbcc53a09 Merge branch '2.6.x' into 2.7.x
Closes gh-31395
2022-06-15 10:51:40 -07:00
Phillip Webb b42f056ddb Don't close jar files early
Update `JarFile` and related classes so that `close()` is not longer
called early.

Prior to this commit, we would always immediately close the underlying
jar file to prevent file locking issues with our build. This causes
issues on certain JVMs when they attempt to verify a signed jar.

The file lock issues have now been solved by returning a custom input
stream from `JarUrlConnection` which captures and delegates the close
method.

Fixes gh-29356
2022-06-15 10:51:01 -07:00
Stephane Nicoll 8c7923da6a Upgrade to Spring Framework 5.3.21
Closes gh-31319
2022-06-15 11:07:33 +02:00
Stephane Nicoll 49b71005de Upgrade to Spring Framework 5.3.21
Closes gh-31318
2022-06-15 11:06:29 +02:00
Stephane Nicoll 1bf2e0bb8e Upgrade to Reactor 2020.0.20
Closes gh-31371
2022-06-15 08:13:35 +02:00
Stephane Nicoll cb4f5ed08e Upgrade to Reactor 2020.0.20
Closes gh-31346
2022-06-15 08:12:33 +02:00
Phillip Webb e0947459b6 Merge branch '2.6.x' into 2.7.x
Closes gh-31384
2022-06-14 09:38:05 -07:00
Phillip Webb 9f8a262e6b Log a warning when a health indicator takes too long to run
Update `HealthEndpointSupport` so that it logs a warning if a health
indicator takes too long to respond.

Fixes gh-31231
2022-06-14 09:32:07 -07:00
Andy Wilkinson ab67136664 Merge branch '2.6.x' into 2.7.x
Closes gh-31381
2022-06-14 11:55:17 +01:00
Andy Wilkinson 2094722e5d Remove duplicate content from "The Spring WebFlux Framework"
Closes gh-31378
2022-06-14 11:52:06 +01:00
Andy Wilkinson 6de4ade0cf Merge branch '2.6.x' into 2.7.x
Closes gh-31379
2022-06-14 11:16:57 +01:00
Andy Wilkinson 5d7cab09b8 Revert BindConverter changes that are now handled by Framework
See gh-28592 and spring-projects/spring-framework#28609

Closes gh-31343
2022-06-14 10:37:35 +01:00
Stephane Nicoll 97e0c8e79c Start building against Spring Kafka 2.8.7 snapshots
See gh-31377
2022-06-14 08:03:31 +02:00
Stephane Nicoll 2f40c52d81 Start building against Spring Session 2021.1.4 snapshots
See gh-31352
2022-06-14 07:59:44 +02:00
Stephane Nicoll 342d01314a Start building against Spring Security 5.6.6 snapshots
See gh-31351
2022-06-14 07:59:44 +02:00
Stephane Nicoll ba572e5e16 Start building against Spring Kafka 2.8.7 snapshots
See gh-31350
2022-06-14 07:59:43 +02:00
Stephane Nicoll d22c0a22c3 Start building against Spring Data 2021.1.5 snapshots
See gh-31349
2022-06-14 07:59:43 +02:00
Stephane Nicoll bc6d2ea16d Start building against Spring AMQP 2.4.6 snapshots
See gh-31348
2022-06-14 07:59:43 +02:00
Stephane Nicoll a2f323b4ed Start building against Micrometer 1.8.7 snapshots
See gh-31347
2022-06-14 07:59:43 +02:00
Stephane Nicoll 2c7812e504 Start building against Reactor 2020.0.20 snapshots
See gh-31346
2022-06-14 07:59:43 +02:00
Stephane Nicoll 379344ea59 Start building against Spring AMQP 2.4.6 snapshots
See gh-31376
2022-06-14 07:52:04 +02:00
Stephane Nicoll 7841789735 Start building against Spring Security 5.7.2 snapshots
See gh-31375
2022-06-14 07:51:02 +02:00
Stephane Nicoll ba4bb2ff32 Start building against Spring Data 2021.2.1 snapshots
See gh-31374
2022-06-14 07:46:51 +02:00
Stephane Nicoll 02da20ec98 Start building against Spring LDAP 2.4.1 snapshots
See gh-31373
2022-06-14 07:43:52 +02:00
Stephane Nicoll 37af43cb18 Start building against Micrometer 1.9.1 snapshots
See gh-31372
2022-06-14 07:42:02 +02:00
Stephane Nicoll 0e1417935d Start building against Reactor 2020.0.20 snapshots
See gh-31371
2022-06-14 07:40:51 +02:00
Phillip Webb 0be5078a73 Merge branch '2.6.x' into 2.7.x
Closes gh-31369
2022-06-13 18:20:07 -07:00
Phillip Webb b3a46fc50e Document that placeholders should us the canonical property name form
Closes gh-31309
2022-06-13 18:19:47 -07:00
Phillip Webb 378e56f1d3 Add Order annotation to GraphQL RouterFunction beans
Update GraphQL auto-configuration so that `RouterFunction` beans have
and `@Order` of 0.

Fixes gh-31314
2022-06-13 16:44:20 -07:00
Phillip Webb 7e2b325b36 Include auto-configuration and management import files in parent POM
Update the `maven-shade-plugin` configuration to include transformation
of the new `AutoConfiguration.imports` and
`ManagementContextConfiguration.imports` files.

Fixes gh-31316
2022-06-13 13:40:53 -07:00
Stephane Nicoll 961b979d6e Merge branch '2.6.x' into 2.7.x
Closes gh-31366
2022-06-13 16:04:00 +02:00
Anthony Vanelverdinghe 1fffdbae2a Fix typos in the reference documentation
See gh-31328
2022-06-13 16:02:48 +02:00
Stephane Nicoll 499f54a335 Merge branch '2.6.x' into 2.7.x
Closes gh-31362
2022-06-13 15:51:45 +02:00
Lars Grefer 8c9557f552 Enable Links for the Javadoc of the Gradle Plugins
See gh-31279
2022-06-13 15:51:08 +02:00
Stephane Nicoll 56913a08b8 Merge branch '2.6.x' into 2.7.x
Closes gh-31360
2022-06-13 14:54:00 +02:00
Anthony Vanelverdinghe b1ccb600f3 Remove reference to outdated location
See gh-31276
2022-06-13 14:52:38 +02:00
Stephane Nicoll 06d7e67e79 Merge branch '2.6.x' into 2.7.x
Closes gh-31358
2022-06-13 14:50:35 +02:00
Stern, Ittay (is9613) e05363f9b0 Restore Custom Favicon section in the reference guide
The section about favicon was mistakenly removed in 5fceb9d and this
commit reinstates it.

See gh-31224
2022-06-13 14:50:18 +02:00
Stephane Nicoll 4b0fe63bdf Merge branch '2.6.x' into 2.7.x
Closes gh-31356
2022-06-13 14:45:54 +02:00
Stephane Nicoll d896d995d1 Polish contribution
See gh-31190
2022-06-13 14:39:58 +02:00
tudormarc e313aa5f6c Document that Lombok must be configured before our annotation processor
See gh-31190
2022-06-13 14:33:21 +02:00
Stephane Nicoll 72dd51ae0b Merge branch '2.6.x' into 2.7.x
Closes gh-31354
2022-06-13 14:29:18 +02:00
Henning Poettker 9fdd471adf Use Lambda-based API in Spring Security examples
See gh-31143
2022-06-13 13:15:56 +02:00
Phillip Webb 7bf82b5349 Merge branch '2.6.x' into 2.7.x 2022-06-10 16:13:35 -07:00
Phillip Webb 63fdd729f5 Refine conversion service type check
Update fix to account for primitive types.

See gh-28592
2022-06-10 16:12:38 -07:00
Phillip Webb beb1c15219 Merge branch '2.6.x' into 2.7.x
Closes gh-31341
2022-06-10 14:30:02 -07:00
Phillip Webb 31b0264d94 Ensure conversion service actually converts to the correct type
Update `BindConverter` with a guard to ensure that the resulting object
is the correct type.

Fixes gh-28592
2022-06-10 14:29:25 -07:00