Commit Graph

50613 Commits

Author SHA1 Message Date
Andy Wilkinson
de2382e61c Merge pull request #36303 from dependabot[bot]
* gh-36303:
  Update to gradle-build-action 2.6.0

Closes gh-36303
2023-07-11 13:35:08 +01:00
dependabot[bot]
365f524ea2 Update to gradle-build-action 2.6.0
Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 2.5.1 to 2.6.0.
- [Release notes](https://github.com/gradle/gradle-build-action/releases)
- [Commits](40b6781dcd...bd57605957)

See gh-36303
2023-07-11 13:34:31 +01:00
Stephane Nicoll
d9b58cf17e Upgrade to Tomcat 9.0.78
Closes gh-36317
2023-07-11 14:30:54 +02:00
Stephane Nicoll
b72fea74ce Upgrade to Reactor Bom 2020.0.34
Closes gh-36172
2023-07-11 14:30:49 +02:00
Stephane Nicoll
a508606fd0 Upgrade to Rabbit AMQP Client 5.14.3
Closes gh-36316
2023-07-11 14:30:49 +02:00
Stephane Nicoll
f50f76962d Upgrade to Neo4j Java Driver 4.4.12
Closes gh-36315
2023-07-11 14:30:44 +02:00
Stephane Nicoll
a9746b25c3 Upgrade to Micrometer 1.9.13
Closes gh-36171
2023-07-11 14:30:39 +02:00
Stephane Nicoll
a19c421b99 Upgrade to Johnzon 1.2.21
Closes gh-36314
2023-07-11 14:30:38 +02:00
Stephane Nicoll
7782d3573d Upgrade to Janino 3.1.10
Closes gh-36313
2023-07-11 14:30:33 +02:00
Stephane Nicoll
4488d91e95 Upgrade to Groovy 3.0.18
Closes gh-36312
2023-07-11 14:30:28 +02:00
Stephane Nicoll
9312888381 Upgrade to Elasticsearch 7.17.11
Closes gh-36311
2023-07-11 14:30:23 +02:00
Andy Wilkinson
0e182035c5 Merge branch '3.1.x'
Closes gh-36310
2023-07-11 11:20:51 +01:00
Andy Wilkinson
e8ced6ea37 Merge branch '3.0.x' into 3.1.x
Closes gh-36309
2023-07-11 11:20:38 +01:00
Andy Wilkinson
f61f5216b9 Merge branch '2.7.x' into 3.0.x
Closes gh-36308
2023-07-11 11:20:00 +01:00
Andy Wilkinson
4e7527e74f Upload build/reports artifacts in PR builds
Closes gh-36307
2023-07-11 11:18:51 +01:00
Andy Wilkinson
7e5bfc4b2e Start building against Reactor Bom 2023.0.0 snapshots
See gh-36300
2023-07-10 16:19:05 +01:00
Andy Wilkinson
a285a7389c Start building against Spring LDAP 3.2.0 snapshots
See gh-36299
2023-07-10 14:02:25 +01:00
Andy Wilkinson
24c19d6d73 Merge branch '3.1.x' 2023-07-10 14:00:06 +01: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
316959c5c9 Merge branch '3.1.x' 2023-07-10 13:57:22 +01:00
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