root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
43,891 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

43891 Commits

Author SHA1 Message Date
Andy Wilkinson 0d22afc8e2 Merge branch '3.0.x' into 3.1.x 2023-07-10 13:57:15 +01:00
Andy Wilkinson 8659372551 Merge branch '2.7.x' into 3.0.x 2023-07-10 13:57:08 +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 fd9b222b21 Merge branch '3.1.x' 2023-07-10 13:53:26 +01:00
Andy Wilkinson c351b7a331 Merge branch '3.0.x' into 3.1.x 2023-07-10 13:53:12 +01:00
Andy Wilkinson 07be2990a2 Merge branch '3.1.x' 
Closes gh-36294
 2023-07-10 13:52: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 3b2551619f Merge branch '3.1.x' 2023-07-07 12:19:23 +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 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
Jonatan Ivanov 6041fe9b7a
Merge pull request #36270 from spencergibb 
* pr/36270:
  Skip int conversion in ClientHttpRequestFactories

Closes gh-36270
 2023-07-06 16:15:01 -07: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 1191282004 Merge pull request #36118 from poutsma 
* gh-36118:
  Polish "Support JDK HttpClient in ClientHttpRequestFactories"
  Support JDK HttpClient in ClientHttpRequestFactories

Closes gh-36118
 2023-07-06 19:34:53 +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 46aeeab148 Merge branch '3.1.x' 
Closes gh-36244
 2023-07-06 12:31:17 +01:00
Andy Wilkinson ea91b2f861 Merge branch '3.0.x' into 3.1.x 
Closes gh-36247
 2023-07-06 12:30:09 +01:00
Andy Wilkinson 7ae030adad Merge branch '2.7.x' into 3.0.x 
Closes gh-36245
 2023-07-06 12:29:38 +01:00
Andy Wilkinson 76cd102aa6 Upgrade CI images to ubuntu:jammy-20230624 
Closes gh-36246
 2023-07-06 12:28:22 +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
Andy Wilkinson 3a07f4df80 Merge branch '3.1.x' 
Closes gh-36260
 2023-07-06 12:12:08 +01:00
Andy Wilkinson e1459c922e Merge branch '3.0.x' into 3.1.x 
Closes gh-36259
 2023-07-06 12:11:55 +01:00
Andy Wilkinson f63e84c25f Merge branch '2.7.x' into 3.0.x 
Closes gh-36258
 2023-07-06 12:11:43 +01:00
Andy Wilkinson 4e4da9fce0 Disable parallel execution for PR builds on GitHub Actions 
Closes gh-36257
 2023-07-06 12:11:08 +01:00
Andy Wilkinson 486879e2ef Merge pull request #36249 from spencergibb 
* gh-36249:
  Add RestClientAutoConfiguration to AutoConfiguration.imports

Closes gh-36249
 2023-07-06 11:39:10 +01:00
Spencer Gibb 89880a773c Add RestClientAutoConfiguration to AutoConfiguration.imports 
See gh-36249
 2023-07-06 11:38:48 +01:00
Andy Wilkinson 7088d0e04a Merge branch '3.1.x' 
Closes gh-36256
 2023-07-06 11:33:42 +01:00
Andy Wilkinson 64eaca4db3 Merge branch '3.0.x' into 3.1.x 
Closes gh-36255
 2023-07-06 11:32:33 +01:00
Andy Wilkinson 81510441aa Merge branch '2.7.x' into 3.0.x 
Closes gh-36254
 2023-07-06 11:25:52 +01:00
Andy Wilkinson 142a3983a0 Check that AutoConfiguration classes are listed in imports file 
Closes gh-36253
 2023-07-06 11:19:03 +01:00
Phillip Webb f978051127 Merge pull request #36213 from poutsma 
* pr/36213:
  Add RestClient SSL support
  Overhaul reference documentation for RestClient
  Add RestClient HttpMessageConverters support
  Polish 'Add initial support for RestClient'
  Add initial support for RestClient

Closes gh-36213
 2023-07-05 21:29:03 +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