Commit Graph

21511 Commits

Author SHA1 Message Date
Johnny Lim 1effd3723f Correct description of overrides for spring.redis.url
See gh-36477
2023-07-21 14:47:25 +01:00
Andy Wilkinson fe67932a56 Merge branch '3.0.x' into 3.1.x
See gh-36468
2023-07-20 09:31:30 +01:00
Andy Wilkinson 960f0ea1da Revert "Upgrade to R2DBC Pool 1.0.1.RELEASE"
This reverts commit e754a1b11e.

See gh-36464
2023-07-20 09:22:21 +01:00
Andy Wilkinson 46a83d7def Upgrade to Spring HATEOAS 2.1.2
Closes gh-36454
2023-07-20 08:26:40 +01:00
Andy Wilkinson 8ee8bb440f Upgrade to R2DBC Postgresql 1.0.2.RELEASE
Closes gh-36469
2023-07-20 08:26:39 +01:00
Andy Wilkinson da5cb6d3ab Upgrade to R2DBC Pool 1.0.1.RELEASE
Closes gh-36468
2023-07-20 08:26:34 +01:00
Andy Wilkinson e200638311 Upgrade to R2DBC MSSQL 1.0.2.RELEASE
Closes gh-36467
2023-07-20 08:26:29 +01:00
Andy Wilkinson e30b3fe4f2 Upgrade to Spring HATEOAS 2.0.6
Closes gh-36453
2023-07-20 08:21:42 +01:00
Andy Wilkinson 277efdc6b1 Upgrade to R2DBC Postgresql 1.0.2.RELEASE
Closes gh-36465
2023-07-20 08:21:41 +01:00
Andy Wilkinson e754a1b11e Upgrade to R2DBC Pool 1.0.1.RELEASE
Closes gh-36464
2023-07-20 08:21:36 +01:00
Andy Wilkinson 4d6ee92e21 Merge branch '3.0.x' into 3.1.x
Closes gh-36448
2023-07-19 14:38:28 +01:00
Andy Wilkinson f145ca0c3c Fix reflection hint generation for properties nested in superclass
Fixes gh-36406
2023-07-19 14:37:52 +01:00
Stephane Nicoll 271059cd23 Upgrade to Spring Integration 6.1.2
Closes gh-36404
2023-07-19 07:42:35 +02:00
Stephane Nicoll e909e81a7d Upgrade to Spring GraphQL 1.2.2
Closes gh-36186
2023-07-19 07:42:34 +02:00
Andy Wilkinson fe123e5b10 Fix handling of additional-hosts with Mongo
Closes gh-36441
2023-07-18 21:15:20 +01:00
Stephane Nicoll 5af99fe219 Upgrade to Spring Security 6.1.2
Closes gh-36298
2023-07-18 06:22:50 +02:00
Stephane Nicoll 1dcfb3cfb1 Upgrade to Spring Security 6.0.5
Closes gh-36293
2023-07-18 06:22:09 +02:00
Stephane Nicoll 7ec9f45929 Upgrade to Spring Security 5.7.10
Closes gh-36295
2023-07-18 06:21:22 +02:00
Stephane Nicoll 7913b22f6a Upgrade to Spring Kafka 3.0.9
Closes gh-36182
2023-07-17 19:57:22 +02:00
Stephane Nicoll 5014861c96 Upgrade to Spring Kafka 3.0.9
Closes gh-36187
2023-07-17 19:57:01 +02:00
Stephane Nicoll 3b53c15084 Upgrade to Spring AMQP 3.0.6
Closes gh-36403
2023-07-17 19:57:01 +02:00
Stephane Nicoll 10720721bf Upgrade to Lettuce 6.2.5.RELEASE
Closes gh-36436
2023-07-17 19:57:01 +02:00
Stephane Nicoll c5a951dc9d Upgrade to Dependency Management Plugin 1.1.2
Closes gh-36435
2023-07-17 19:56:56 +02:00
Stephane Nicoll a838cab65c Upgrade to Spring AMQP 3.0.6
Closes gh-36401
2023-07-17 19:55:53 +02:00
Stephane Nicoll bf5cdbf3f3 Upgrade to Lettuce 6.2.5.RELEASE
Closes gh-36434
2023-07-17 19:55:53 +02:00
Stephane Nicoll 0f396c91f4 Upgrade to Dependency Management Plugin 1.1.2
Closes gh-36433
2023-07-17 19:55:48 +02:00
Stephane Nicoll 250868ad84 Upgrade to Spring AMQP 2.4.14
Closes gh-36399
2023-07-17 19:53:54 +02:00
Stephane Nicoll 7195d87e6c Merge branch '3.0.x' into 3.1.x
Closes gh-36429
2023-07-17 15:48:30 +02:00
Stephane Nicoll 750096b9c2 Polish "Allow custom ExemplarSampler to be used"
See gh-35619
2023-07-17 15:46:48 +02:00
Johnny Goncalves 94b17ecd26 Allow custom ExemplarSampler to be used
See gh-35619
2023-07-17 15:44:05 +02:00
Stephane Nicoll bb16ed1245 Merge branch '3.0.x' into 3.1.x
Closes gh-36427
2023-07-17 15:24:58 +02:00
Stephane Nicoll 3586bfb629 Merge branch '2.7.x' into 3.0.x
Closes gh-36426
2023-07-17 15:22:43 +02:00
Stephane Nicoll 09e5d38348 Polish "Replace @CsvSource with @ValueSource where feasible"
See gh-36062
2023-07-17 15:16:27 +02:00
Yanming Zhou acb7acd5d9 Replace @CsvSource with @ValueSource where feasible
@ValueSource is more appropriate for single parameter.

See gh-36062
2023-07-17 15:16:26 +02:00
Stephane Nicoll 588129318c Merge branch '3.0.x' into 3.1.x
Closes gh-36423
2023-07-17 15:06:00 +02:00
Jonatan Ivanov 58cfdbfa2d Add missing OTel Span attributes
OTel semantic conventions mandate certain resource attributes to present
on exported spans. This commits make sure that the attribute we add are
merged with the defaults, rather than replacing them.

See gh-36155
2023-07-17 15:00:51 +02:00
Johnny Lim 9b38db6672 Polish PemSslBundleProperties
See gh-36281
2023-07-17 13:22:27 +02:00
Stephane Nicoll d2912c6442 Update copyright year of changed files
See gh-36306
2023-07-17 09:40:57 +02:00
Christoph Dreis 8321887d6a Fix typos
See gh-36306
2023-07-17 09:40:16 +02:00
Stephane Nicoll 0e3a151657 Upgrade to Spring HATEOAS 2.1.1
Closes gh-36414
2023-07-14 19:09:00 +02:00
Stephane Nicoll 225abf73c6 Upgrade to Spring Data Bom 2023.0.2
Closes gh-36184
2023-07-14 19:08:56 +02:00
Stephane Nicoll 60150d96bd Upgrade to Spring HATEOAS 2.0.5
Closes gh-36181
2023-07-14 19:08:06 +02:00
Stephane Nicoll 0a29a6a8c3 Upgrade to Spring Data Bom 2022.0.8
Closes gh-36179
2023-07-14 19:08:06 +02:00
Stephane Nicoll beb4010d07 Upgrade to Spring HATEOAS 1.5.5
Closes gh-36413
2023-07-14 19:05:56 +02:00
Stephane Nicoll 67bae9de36 Upgrade to Spring Data Bom 2021.2.14
Closes gh-36173
2023-07-14 19:05:52 +02:00
Andy Wilkinson 3f4474031f Merge branch '3.0.x' into 3.1.x
Closes gh-36409
2023-07-14 10:42:05 +01:00
Pengfei-Lu 8697d9ddd5 Correct conditions on auto-configured JacksonJsonpMapper
See gh-36109

Signed-off-by: Pengfei-Lu <459360594@qq.com>
2023-07-13 18:10:21 +01:00
Stephane Nicoll 9f462546e8 Start building against Spring Integration 6.1.2 snapshots
See gh-36404
2023-07-13 16:06:47 +02:00
Stephane Nicoll f6b96040ad Start building against Spring AMQP 3.0.6 snapshots
See gh-36403
2023-07-13 16:06:42 +02:00
Stephane Nicoll 9d0360cc1e Upgrade to Reactor Bom 2022.0.9
Closes gh-36297
2023-07-13 16:04:29 +02:00
Stephane Nicoll babfff3060 Upgrade to Dependency Management Plugin 1.1.1
Closes gh-36402
2023-07-13 16:04:29 +02:00
Stephane Nicoll fbde75e149 Start building against Spring AMQP 3.0.6 snapshots
See gh-36401
2023-07-13 16:01:59 +02:00
Stephane Nicoll fc9006f53c Upgrade to Reactor Bom 2022.0.9
Closes gh-36292
2023-07-13 15:57:34 +02:00
Stephane Nicoll 23653e72be Upgrade to Dependency Management Plugin 1.1.1
Closes gh-36400
2023-07-13 15:57:33 +02:00
Stephane Nicoll b3513b5d89 Start building against Spring AMQP 2.4.14 snapshots
See gh-36399
2023-07-13 15:53:13 +02:00
Andy Wilkinson 218f4f2679 Merge branch '3.0.x' into 3.1.x
Closes gh-36359
2023-07-12 12:00:11 +01:00
Andy Wilkinson 090802b11b Use existing value rather than deducing bind method
When there is an existing value, deducing the bind method may
incorrectly result in the use of constructor binding. This
results in a failure in the configuration properties
post-processor as it refuses to bind properties to a bean whose
attributes indicate that constructor binding should have been used.

This commit updates ConfigurationPropertiesBean to avoid tryin to
deduce the bind method and instead use the presence or absence of an
existing value to determine the type of binding that should be used.
Only when there is no existing value is constructor binding
appropriate.

Fixes gh-36175
2023-07-12 11:13:48 +01:00
Andy Wilkinson d5ca66d47c Merge branch '3.0.x' into 3.1.x
Closes gh-36355
2023-07-12 08:33:43 +01:00
Andy Wilkinson 2a5a5d19b7 Update Servlet container system requirements
Closes gh-36354
2023-07-12 08:33:10 +01:00
Stephane Nicoll d45903060d Upgrade to Reactor Bom 2020.0.34
Closes gh-36172
2023-07-11 16:07:58 +02:00
Stephane Nicoll 324539e707 Upgrade to Rabbit AMQP Client 5.14.3
Closes gh-36316
2023-07-11 16:07:58 +02:00
Stephane Nicoll eb0e50f909 Upgrade to Neo4j Java Driver 4.4.12
Closes gh-36315
2023-07-11 16:07:58 +02:00
Stephane Nicoll 328d86092b Upgrade to Micrometer 1.9.13
Closes gh-36171
2023-07-11 16:07:57 +02:00
Stephane Nicoll 6d0d1ffbad Upgrade to Johnzon 1.2.21
Closes gh-36314
2023-07-11 16:07:57 +02:00
Stephane Nicoll 9142f1516e Upgrade to Janino 3.1.10
Closes gh-36313
2023-07-11 16:07:57 +02:00
Stephane Nicoll 2bc135c23b Upgrade to Groovy 3.0.18
Closes gh-36312
2023-07-11 16:07:57 +02:00
Stephane Nicoll 45cdb53e23 Upgrade to Elasticsearch 7.17.11
Closes gh-36311
2023-07-11 16:07:57 +02:00
Stephane Nicoll d5c3790cc3 Upgrade to Rabbit AMQP Client 5.17.1
Closes gh-36341
2023-07-11 15:31:27 +02:00
Stephane Nicoll b9556d1819 Upgrade to Micrometer Tracing 1.1.3
Closes gh-36296
2023-07-11 15:31:21 +02:00
Stephane Nicoll f43f9a35cf Upgrade to Micrometer 1.11.2
Closes gh-36183
2023-07-11 15:31:21 +02:00
Stephane Nicoll 97f81c3f33 Upgrade to jOOQ 3.18.5
Closes gh-36340
2023-07-11 15:31:20 +02:00
Stephane Nicoll a48ccc2c13 Upgrade to JBoss Logging 3.5.3.Final
Closes gh-36339
2023-07-11 15:31:15 +02:00
Stephane Nicoll 4168375397 Upgrade to Janino 3.1.10
Closes gh-36338
2023-07-11 15:31:10 +02:00
Stephane Nicoll 5171eef1c1 Upgrade to Jakarta WebSocket 2.1.1
Closes gh-36337
2023-07-11 15:31:04 +02:00
Stephane Nicoll 6ab571a30d Upgrade to Infinispan 14.0.12.Final
Closes gh-36336
2023-07-11 15:30:59 +02:00
Stephane Nicoll 863b0df570 Upgrade to Hibernate Validator 8.0.1.Final
Closes gh-36335
2023-07-11 15:30:55 +02:00
Stephane Nicoll 6ef030e851 Upgrade to Hibernate 6.2.6.Final
Closes gh-36334
2023-07-11 15:30:49 +02:00
Stephane Nicoll 62cdca61a8 Upgrade to Groovy 4.0.13
Closes gh-36333
2023-07-11 15:30:45 +02:00
Stephane Nicoll 28e6ed7c66 Upgrade to ActiveMQ 5.18.2
Closes gh-36332
2023-07-11 15:30:40 +02:00
Stephane Nicoll 8d94b4b059 Upgrade to Rabbit AMQP Client 5.16.1
Closes gh-36329
2023-07-11 14:59:57 +02:00
Stephane Nicoll 17e27251a8 Upgrade to Micrometer Tracing 1.0.8
Closes gh-36291
2023-07-11 14:59:52 +02:00
Stephane Nicoll dd6cbd3d8c Upgrade to Micrometer 1.10.9
Closes gh-36178
2023-07-11 14:59:52 +02:00
Stephane Nicoll 601a7d9043 Upgrade to jOOQ 3.17.14
Closes gh-36328
2023-07-11 14:59:51 +02:00
Stephane Nicoll 11104412c0 Upgrade to JBoss Logging 3.5.3.Final
Closes gh-36327
2023-07-11 14:59:46 +02:00
Stephane Nicoll abd9494d0a Upgrade to Janino 3.1.10
Closes gh-36326
2023-07-11 14:59:41 +02:00
Stephane Nicoll e99311d10b Upgrade to Jakarta WebSocket 2.1.1
Closes gh-36325
2023-07-11 14:59:37 +02:00
Stephane Nicoll a9a93fed6f Upgrade to Infinispan 14.0.12.Final
Closes gh-36324
2023-07-11 14:59:32 +02:00
Stephane Nicoll d6c468a46d Upgrade to Hibernate Validator 8.0.1.Final
Closes gh-36323
2023-07-11 14:59:27 +02:00
Stephane Nicoll 642be39556 Upgrade to Groovy 4.0.13
Closes gh-36322
2023-07-11 14:59:22 +02:00
Andy Wilkinson 0f59cf7938 Start building against Spring Security 6.1.2 snapshots
See gh-36298
2023-07-10 13:59:57 +01:00
Andy Wilkinson 6f9bf7273c Start building against Reactor Bom 2022.0.9 snapshots
See gh-36297
2023-07-10 13:59:52 +01:00
Andy Wilkinson a2bb4e8ab8 Start building against Micrometer Tracing 1.1.3 snapshots
See gh-36296
2023-07-10 13:59:47 +01:00
Andy Wilkinson 9a03a353ec Start building against Spring Security 5.7.10 snapshots
See gh-36295
2023-07-10 13:56:57 +01:00
Andy Wilkinson 4a9327b3f1 Start building against Spring Security 6.0.5 snapshots
See gh-36293
2023-07-10 13:43:24 +01:00
Andy Wilkinson 7462065f38 Start building against Reactor Bom 2022.0.9 snapshots
See gh-36292
2023-07-10 13:43:19 +01:00
Andy Wilkinson b1f9be6a28 Start building against Micrometer Tracing 1.0.8 snapshots
See gh-36291
2023-07-10 13:43:14 +01:00
Andy Wilkinson 0d06747b41 Fix problem with @ and : chars in Mongo username and password
Fixes gh-36261
2023-07-10 13:35:08 +01:00
Andy Wilkinson 1085c1707e Merge branch '3.0.x' into 3.1.x 2023-07-07 12:19:15 +01:00
Andy Wilkinson 732424f7cb Polish 2023-07-07 12:19:05 +01:00
Andy Wilkinson c4157bb515 Merge branch '3.0.x' into 3.1.x
Closes gh-36276
2023-07-07 12:07:07 +01:00
Andy Wilkinson cc80bb78fe Merge branch '2.7.x' into 3.0.x
Closes gh-36275
2023-07-07 12:06:51 +01:00
Andy Wilkinson 52f732920b Support multiple health groups with an additional path with Jersey
This commit knowingly makes breaking API changes to
JerseyHealthEndpointAdditionalPathResourceFactory. We considered
other options but they all had the potential to be backwards
incompatible in one way or another. Faced with that situation we
concluded that the likelihood of anyone using the modified API
directly is small enough to warrant making the breaking changes.
If it becomes apparent that we have misjudged things we can revisit
the changes in the future.

Closes gh-36250
2023-07-07 11:21:56 +01:00
Andy Wilkinson b7099094b9 Merge branch '3.0.x' into 3.1.x
Closes gh-36268
2023-07-06 19:42:47 +01:00
Andy Wilkinson 4d70b83e80 Improve javadoc of ClientHttpRequestFactories
Closes gh-36267
2023-07-06 19:42:17 +01:00
Phillip Webb 034803ee2f Polish 2023-07-05 20:59:39 +01:00
Andy Wilkinson c9f8d92656 Merge branch '3.0.x' into 3.1.x
Closes gh-36237
2023-07-05 09:47:43 +01:00
Johnny Lim 0fa58c04e7 Use Stream.toList()
See gh-36167
2023-07-05 09:38:19 +01:00
Andy Wilkinson 20cfc3c9d0 Merge branch '3.0.x' into 3.1.x
Closes gh-36235
2023-07-05 09:19:49 +01:00
Eddú Meléndez f57e6a1fa5 Use spring-amqp-bom
See gh-36168
2023-07-05 09:19:24 +01:00
Andy Wilkinson 0bfc3c3872 Merge branch '3.0.x' into 3.1.x
Closes gh-36233
2023-07-05 09:12:47 +01:00
Yanming Zhou 9439494923 Polish formatting in "Running Spring Batch Jobs on Startup"
See gh-36225
2023-07-05 09:12:07 +01:00
Andy Wilkinson bdb7fdc6fc Merge branch '3.0.x' into 3.1.x
Closes gh-36230
2023-07-05 09:09:26 +01:00
Andy Wilkinson 581c2633f8 Merge branch '2.7.x' into 3.0.x
Closes gh-36229
2023-07-05 09:09:07 +01:00
Andy Wilkinson f4c996b432 Polish "Check for Class and ResolvableType object type attributes"
See gh-36224
2023-07-05 09:04:58 +01:00
Bernardo Bulgarelli 3a7185206e Check for Class and ResolvableType object type attributes
See gh-36224
2023-07-05 09:04:04 +01:00
Andy Wilkinson 480049ef5b Merge branch '3.0.x' into 3.1.x
Closes gh-36227
2023-07-05 08:53:15 +01:00
Andy Wilkinson cbc0f7117f Merge branch '2.7.x' into 3.0.x
Closes gh-36226
2023-07-05 08:52:55 +01:00
Andy Wilkinson fe08c70973 Test Gradle plugin against Gradle 8.2
Closes gh-36207
2023-07-05 08:13:24 +01:00
Johnny Lim e97c5a7118 Use kebab-case for property default values in metadata
See gh-36170
2023-07-04 15:20:42 +01:00
Phillip Webb 2e11349c93 Merge branch '3.0.x' into 3.1.x
Closes gh-36219
2023-07-04 15:18:32 +01:00
Phillip Webb 9884abb379 Merge branch '2.7.x' into 3.0.x
Closes gh-36218
2023-07-04 15:18:15 +01:00
Phillip Webb fc31e14e72 Polish 'Improve Kubernetes probe customization documentation'
See gh-34978
2023-07-04 15:17:20 +01:00
Ivo Smid 028ff3a7be Improve Kubernetes probe customization documentation
See gh-34978
2023-07-04 15:17:20 +01:00
Andy Wilkinson 215763bded Merge branch '3.0.x' into 3.1.x
Closes gh-36215
2023-07-04 15:13:35 +01:00
Andy Wilkinson b764b5beee Merge branch '2.7.x' into 3.0.x
Closes gh-36214
2023-07-04 15:13:19 +01:00
Andy Wilkinson 1f75ba557e Document HTTP client auto-detection for RestTemplate and WebClient
Closes gh-34136
2023-07-04 15:09:40 +01:00
Phillip Webb 97ef8f38a4 Merge branch '3.0.x' into 3.1.x
Closes gh-36209
2023-07-04 12:19:20 +01:00
Phillip Webb ab7e4da703 Merge branch '2.7.x' into 3.0.x
Closes gh-36208
2023-07-04 12:18:52 +01:00
Phillip Webb 5d0640a356 Use MergedAnnotations for `@AliasFor` support
Update `ImportsContextCustomizer` to use `MergedAnnotations` so
that `@AliasFor` can be supported.

See gh-34917
2023-07-04 12:17:58 +01:00
Laurent Martelli 9baf23ccd5 Test that ImportsContextCustomizer can support @AliasFor
Add test to ensure that `ImportsContextCustomizer` can support
`@AliasFor` annotations.

See gh-34917
2023-07-04 12:17:58 +01:00
Andy Wilkinson d0a61c2e78 Start building against Spring Kafka 3.0.9 snapshots
See gh-36187
2023-07-03 17:52:53 +01:00
Andy Wilkinson 3c00a04211 Start building against Spring GraphQL 1.2.2 snapshots
See gh-36186
2023-07-03 17:52:48 +01:00
Andy Wilkinson 9d0e058352 Start building against Spring Data Bom 2023.0.2 snapshots
See gh-36184
2023-07-03 17:52:38 +01:00
Andy Wilkinson ffd3944bc7 Start building against Micrometer 1.11.2 snapshots
See gh-36183
2023-07-03 17:52:33 +01:00
Andy Wilkinson 2b1189ff31 Start building against Spring Kafka 3.0.9 snapshots
See gh-36182
2023-07-03 16:50:09 +01:00
Andy Wilkinson 356504ade4 Start building against Spring HATEOAS 2.0.5 snapshots
See gh-36181
2023-07-03 16:50:04 +01:00
Andy Wilkinson c6d0c15c57 Start building against Spring Data Bom 2022.0.8 snapshots
See gh-36179
2023-07-03 16:49:55 +01:00
Andy Wilkinson fc7e9d277b Start building against Micrometer 1.10.9 snapshots
See gh-36178
2023-07-03 16:49:50 +01:00
Andy Wilkinson a3990f16b9 Start building against Spring Data Bom 2021.2.14 snapshots
See gh-36173
2023-07-03 15:41:15 +01:00
Andy Wilkinson b9881fa6f0 Start building against Reactor Bom 2020.0.34 snapshots
See gh-36172
2023-07-03 15:41:10 +01:00
Andy Wilkinson 90760e834f Start building against Micrometer 1.9.13 snapshots
See gh-36171
2023-07-03 15:41:05 +01:00
Phillip Webb 1f68db06ba Merge branch '3.0.x' into 3.1.x
Closes gh-36163
2023-07-02 19:47:17 +01:00
Phillip Webb f1b0d76d9b Merge branch '2.7.x' into 3.0.x
Closes gh-36162
2023-07-02 19:46:45 +01:00
Phillip Webb b6990940b1 Polish 'Choose SAML party based on entity ID rather than always using first'
See gh-35902
2023-07-02 19:02:08 +01:00
Lasse Lindqvist 864af59adc Choose SAML party based on entity ID rather than always using first
Update `Saml2RelyingPartyRegistrationConfiguration` so that
`RelyingPartyRegistrations` uses `collectionFromMetadataLocation`
rather than `fromMetadataLocation` and searches candidates for a
matching entity ID.

Prior to this commit, it was possible for the wrong provider to be
used if multiple candidates existed in the returned metadata.

See gh-35902
2023-07-02 18:54:34 +01:00
Phillip Webb dcde1fac7e Merge branch '3.0.x' into 3.1.x
Closes gh-36160
2023-07-02 14:01:08 +01:00
Phillip Webb 566549021b Merge branch '2.7.x' into 3.0.x
Closes gh-36159
2023-07-02 14:00:47 +01:00
Phillip Webb 51ee702dac Allow configprops endpoint stringify primitive wrappers
Update `ConfigurationPropertiesReportEndpoint` so that primitive
wrapper input values in the Environment are stringified for display.

Fixes gh-36076
2023-07-02 13:59:30 +01:00
Phillip Webb 7c63870305 Merge branch '3.0.x' into 3.1.x 2023-06-30 14:54:36 +01:00
Phillip Webb a14ddd6900 Polish adoc formatting 2023-06-30 14:54:21 +01:00