Andy Wilkinson
732424f7cb
Polish
2023-07-07 12:19:05 +01:00
Andy Wilkinson
8ed2ef5640
Merge branch '3.1.x'
...
Closes gh-36277
2023-07-07 12:07:25 +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
f4e05c91c7
Use converter beans in preference to ObjectToObjectConverter
...
Previously, with the converter beans in a conversion service that
appears after the bean factory's conversion service, they would not
be called for a conversion that could be handled by the
ObjectToObjectConverter in the bean factory's conversion service.
This commit creates a new FormattingConversionService that is empty
except for the converter beans and places it first in the list.
It's followed by the bean factory's conversion service. The shared
application conversion service is added to the end of the list to
pick up any conversions that the previous two services could not
handle. This should maintain backwards compatibility with the
previous arrangement where the converter beans were added to an
application conversion service that went after the bean factory's
conversion service.
Fixes gh-34631
2023-07-07 08:33:15 +01:00
Spencer Gibb
62674de472
Skip int conversion in ClientHttpRequestFactories
...
@poutsma added `JdkClientHttpRequestFactory.setReadTimeout(Duration)`
so the conversion to and from int is no longer needed.
See gh-36270
2023-07-06 16:09:31 -07:00
Andy Wilkinson
a460f7474f
Merge branch '3.1.x'
...
Closes gh-36269
2023-07-06 19:45:14 +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
Andy Wilkinson
bb2c4cc742
Polish "Support JDK HttpClient in ClientHttpRequestFactories"
...
See gh-36118
2023-07-06 17:59:15 +01:00
Arjen Poutsma
3bbfee5e93
Support JDK HttpClient in ClientHttpRequestFactories
...
See gh-36118
2023-07-06 17:52:36 +01:00
Andy Wilkinson
3b90919313
Polish RestClient auto-config and tests
...
For consistency, replace webClient and WebClient with restClient and
RestClient. This also address a bean name clash between
RestClientAutoConfiguration's RestClient.Builder bean and
WebClientAutoConfiguration's WebClient.Builder bean that were both
previously named webClientBuilder.
2023-07-06 12:22:54 +01:00
Spencer Gibb
89880a773c
Add RestClientAutoConfiguration to AutoConfiguration.imports
...
See gh-36249
2023-07-06 11:38:48 +01:00
Phillip Webb
cfdc173e34
Add RestClient SSL support
...
Add `RestClientSsl` support class to help apply an `SslBundle` to a
`RestClient.Builder`.
See gh-36213
2023-07-05 21:22:52 +01:00
Phillip Webb
7c1b168ed6
Overhaul reference documentation for RestClient
...
Reorder "Calling REST services" documentation and add a new section
covering `RestClient`.
See gh-36213
2023-07-05 21:22:49 +01:00
Phillip Webb
5e01c66552
Add RestClient HttpMessageConverters support
...
Update `RestClientAutoConfiguration` to apply `HttpMessageConverters`
configuration.
See gh-36213
2023-07-05 21:17:42 +01:00
Phillip Webb
2d2f050262
Polish 'Add initial support for RestClient'
...
See gh-36213
2023-07-05 21:17:23 +01:00
Arjen Poutsma
a1a5acf128
Add initial support for RestClient
...
Introduce initial support for Spring Framework's `RestClient`, in the
form of a `RestClientCustomizer` and `RestClientAutoConfiguration`.
See gh-36213
2023-07-05 21:16:02 +01:00
Phillip Webb
8b3070e027
Merge branch '3.1.x'
2023-07-05 21:00:12 +01:00
Phillip Webb
034803ee2f
Polish
2023-07-05 20:59:39 +01:00
Andy Wilkinson
fc8a8d363f
Polish
2023-07-05 15:50:32 +01:00
Andy Wilkinson
4feaa28fd1
Polish "Support custom token validators for OAuth2"
...
See gh-35874
2023-07-05 14:01:08 +01:00
Roman Golovin
7500dab321
Support custom token validators for OAuth2
...
See gh-35874
2023-07-05 11:48:48 +01:00
Andy Wilkinson
ce8253ea95
Merge branch '3.1.x'
...
Closes gh-36238
2023-07-05 09:51:35 +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
12cd753652
Merge branch '3.1.x'
...
Closes gh-36236
2023-07-05 09:20: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
62eb3d3051
Merge branch '3.1.x'
...
Closes gh-36234
2023-07-05 09:12:59 +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
2de6447a79
Merge branch '3.1.x'
...
Closes gh-36232
2023-07-05 09:09:39 +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
8ed160a144
Merge branch '3.1.x'
...
Closes gh-36228
2023-07-05 08:53:33 +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
Andy Wilkinson
c3e2c9d684
Polish "Support Jetty in ClientHttpRequestFactories"
...
See gh-36116
2023-07-04 17:49:07 +01:00
Arjen Poutsma
7ceece3d3d
Support Jetty in ClientHttpRequestFactories
...
This commit introduces support for the JettyClientHttpRequestFactory
in ClientHttpRequestFactories.
See gh-36116
2023-07-04 17:49:07 +01:00
Phillip Webb
2cbd916cdb
Merge branch '3.1.x'
...
Closes gh-36221
2023-07-04 15:21:32 +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
41cdfb891f
Merge branch '3.1.x'
...
Closes gh-36220
2023-07-04 15:18: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
eb58ade3a2
Merge branch '3.1.x'
...
Closes gh-36216
2023-07-04 15:13:51 +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
7c942679ad
Polish 'Switch ImportsContextCustomizer to use MergedAnnotations.search'
...
See gh-36211
2023-07-04 14:05:48 +01:00
Laurent Martelli
4562189125
Switch ImportsContextCustomizer to use MergedAnnotations.search #36211
...
Use `MergedAnnotations.search` in `ImportsContextCustomizer` rather than
needing dedicated search logic.
See gh-36211
2023-07-04 13:58:53 +01:00
Andy Wilkinson
2350d9c870
Adapt to Data changes missed due to predictive test selection
...
See gh-36190
2023-07-04 12:39:52 +01:00
Andy Wilkinson
9985c845f2
Adapt to Framework changes missed due to predictive test selection
...
See gh-36198
2023-07-04 12:39:52 +01:00
Phillip Webb
b2985676aa
Merge branch '3.1.x'
...
Closes gh-36210
2023-07-04 12:19:47 +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
5a9ca67fba
Start building against Spring Framework 6.2.0-M2 snapshots
...
See gh-36198
2023-07-04 10:20:33 +01:00
Andy Wilkinson
1fa079d9b5
Start building against Micrometer Tracing 1.2.0 snapshots
...
See gh-36199
2023-07-04 09:44:55 +01:00
Andy Wilkinson
afdc133d6a
Start building against Spring Session 3.2.0 snapshots
...
See gh-36196
2023-07-04 09:44:54 +01:00
Andy Wilkinson
e1b5eb5040
Start building against Spring Security 6.2.0 snapshots
...
See gh-36195
2023-07-04 09:44:54 +01:00
Andy Wilkinson
32d8355191
Start building against Spring Kafka 3.0.9 snapshots
...
See gh-36194
2023-07-04 09:44:54 +01:00
Andy Wilkinson
1e0a572dfa
Start building against Spring Integration 6.2.0 snapshots
...
See gh-36193
2023-07-04 09:44:54 +01:00
Andy Wilkinson
c794f52085
Start building against Spring HATEOAS 2.2.0 snapshots
...
See gh-36192
2023-07-04 09:44:53 +01:00
Andy Wilkinson
f85ba2a37e
Start building against Spring GraphQL 1.2.2 snapshots
...
See gh-36191
2023-07-04 09:44:53 +01:00
Andy Wilkinson
ec8e1e2c95
Start building against Spring Data Bom 2023.1.0 snapshots
...
See gh-36190
2023-07-04 09:44:53 +01:00
Andy Wilkinson
e847e662c2
Start building against Spring Batch 5.1.0 snapshots
...
See gh-36189
2023-07-03 19:26:45 +01:00
Andy Wilkinson
dc1d458e64
Start building against Micrometer 1.12.0 snapshots
...
See gh-36188
2023-07-03 19:26:40 +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
Johnny Lim
df107890c7
Fix metadata for logging.include-application-name
...
See gh-36157
2023-07-02 20:10:19 +01:00
Johnny Lim
7c77e1bb85
Polish 'Log correlation IDs when Micrometer tracing is being used'
...
See gh-36158
2023-07-02 20:08:45 +01:00
Phillip Webb
77245c3bd0
Merge branch '3.1.x'
...
Closes gh-36164
2023-07-02 19:47:24 +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
1cced11ea3
Merge branch '3.1.x'
...
Closes gh-36161
2023-07-02 14:01:26 +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
1bf334ae0f
Polish config metadata changelog generator
...
See gh-21486
2023-07-01 00:30:26 +01:00
Andy Wilkinson
318198ae5d
Polish "Change WebServer log messages to use port or ports, not port(s)"
...
See gh-36103
2023-06-30 19:41:14 +01:00
Ahmed Ashour
298bfd96c2
Change WebServer log messages to use port or ports, not port(s)
...
See gh-36103
2023-06-30 16:28:21 +01:00