Commit Graph

37611 Commits

Author SHA1 Message Date
Moritz Halbritter 6c04241ad6 Merge branch '2.6.x' into 2.7.x
Closes gh-30652
2022-04-13 15:00:14 +02:00
Moritz Halbritter 9e98ccd8ab Merge branch '2.5.x' into 2.6.x
Closes gh-30651
2022-04-13 14:59:59 +02:00
Moritz Halbritter dfc0f21932 Fix language in WavefrontProperties
Closes gh-30649
2022-04-13 14:59:48 +02:00
Stephane Nicoll 95d226fea8 Merge branch '2.7.x' 2022-04-13 13:20:35 +02:00
Stephane Nicoll b0bc06fb7f Merge branch '2.6.x' into 2.7.x 2022-04-13 13:20:27 +02:00
Stephane Nicoll b5713ba5e7 Upgrade to Spring Framework 5.3.19
Closes gh-30518
2022-04-13 13:20:01 +02:00
Stephane Nicoll e2dd454233 Merge branch '2.5.x' into 2.6.x 2022-04-13 13:19:36 +02:00
Stephane Nicoll 138192230c Upgrade to Spring Framework 5.3.19
Closes gh-30517
2022-04-13 13:19:06 +02:00
Stephane Nicoll 08954fce85 Upgrade to Spring Framework 5.3.19
Closes gh-30516
2022-04-13 13:11:13 +02:00
Andy Wilkinson fe46392144 Merge branch '2.7.x' 2022-04-13 10:04:02 +01:00
Andy Wilkinson 27a936e466 Fix Elastic health indicator without RestHighLevelClient
Closes gh-28496
2022-04-13 10:02:47 +01:00
Stephane Nicoll 62069ead48 Merge branch '2.7.x' 2022-04-13 09:18:54 +02:00
Stephane Nicoll f96efa72ab Merge branch '2.6.x' into 2.7.x 2022-04-13 09:18:20 +02:00
Stephane Nicoll 00a481e4e9 Upgrade to Reactor 2020.0.18
Closes gh-30604
2022-04-13 09:17:43 +02:00
Stephane Nicoll d489bf00be Merge branch '2.5.x' into 2.6.x 2022-04-13 09:17:18 +02:00
Andy Wilkinson 258ae5e153 Merge branch '2.7.x' 2022-04-12 21:58:41 +01:00
Andy Wilkinson e32c314bff Merge branch '2.7.x' 2022-04-12 21:58:24 +01:00
Andy Wilkinson 562627fb42 Deprecate auto-configuration for RestHighLevelClient
Closes gh-28598
2022-04-12 21:58:08 +01:00
Andy Wilkinson 4e054385a4 Polish 2022-04-12 21:58:08 +01:00
Andy Wilkinson d5a92ccb8b Merge branch '2.7.x' 2022-04-12 21:20:34 +01:00
Andy Wilkinson 227c3164f1 Merge pull request #28496 from filiphr
* gh-28496:
  Polish "Bring back Elasticsearch RestClient auto-configuration"
  Bring back Elasticsearch RestClient auto-configuration

Closes gh-28496
2022-04-12 21:13:15 +01:00
Andy Wilkinson a7a71da9ef Polish "Bring back Elasticsearch RestClient auto-configuration"
See gh-28496
2022-04-12 21:13:05 +01:00
Filip Hrisafov eb3bf40bdb Bring back Elasticsearch RestClient auto-configuration
Prior to this commit, Spring Boot would only auto-configure the
`RestHighLevelClient` and `RestClientBuilder` if the
`RestHighLevelClient` was present. This was done in 1d73d4ed.

This commit brings back the exposing of the `RestClient` bean in when
exposing the `RestHighLevelClient` or when the `RestHighLevelClient`
is not present. It allows for using the auto-configuration and its
customizers of the `RestClientBuilder` in a similar way as it is done
for the `RestTemplateBuilder` and the `WebClient.Builder`.

The presence of the `elasticsearch-rest-high-level-client` module is
now optional. This opens the door for potentially adding support for
the new Elasticsearch Java Client[1] that is based on the same
`RestClient`.

The health contributor and its configuration has also been updated to
only depend on the low-level RestClient.

See gh-28496

[1] https://github.com/elastic/elasticsearch-java
2022-04-12 21:13:05 +01:00
Brian Clozel e42f2673ca Merge branch '2.7.x' 2022-04-12 21:34:35 +02:00
Brian Clozel e0ae1d3501 Use auto-configured JSON codecs for GraphQlTester
Prior to this commit, the auto-configured
`ExecutionGraphQlServiceTester` would use a default Jackson
`ObjectMapper` provided by the builder for its JSON
serialization/deserialization needs. Other testers, like the
`HttpGraphQlTester` are based on auto-configured components which
already use the auto-configured `ObjectMapper`.

This commit uses the newly introduced `encoder(Encoder<?>)` and
`decoder(Decoder<?>)` builder methods to configure custom JSON codecs
honoring the application configuration.

Closes gh-30646
2022-04-12 21:28:21 +02:00
Brian Clozel 127d2bf63c Merge branch '2.7.X' 2022-04-12 20:18:24 +02:00
rstoyanchev b91bfc7067 Update WebMVC GraphQL autoconfig to the latest
As a result of changes for
https://github.com/spring-projects/spring-graphql/issues/342,
GraphQlWebSocketHandler now exposes a method to create the
WebSocketHttpRequestHandler, pre-configured with a context propagating
HandshakeInterceptor. This commit updates the autoconfig to use it.

Closes gh-30641
2022-04-12 20:17:29 +02:00
Brian Clozel e57bbdfcf5 Polish
See gh-29666
2022-04-12 18:41:01 +02:00
Brian Clozel 3485070aee Switch to Spring Kafka SNAPSHOTs
See gh-30645
2022-04-12 17:40:01 +02:00
Brian Clozel be88b62302 Switch to Spring Session SNAPSHOTs
See gh-30639
2022-04-12 17:22:46 +02:00
Brian Clozel f2e295802d Switch to Spring Security SNAPSHOTs
See gh-30633
2022-04-12 17:22:16 +02:00
Brian Clozel 305a0c5c96 Switch to Spring HATEOAS SNAPSHOTs
See gh-30632
2022-04-12 17:03:34 +02:00
Brian Clozel 2651068c17 Switch to Spring Data SNAPSHOTs
See gh-30634
2022-04-12 17:02:51 +02:00
Brian Clozel 77b7f2f1ce Switch to Spring Framework SNAPSHOTs
See gh-30624
2022-04-12 17:02:03 +02:00
Stephane Nicoll 368ba019de Upgrade to Reactor 2020.0.18
Closes gh-30596
2022-04-12 16:46:31 +02:00
Stephane Nicoll a1fe2b8857 Upgrade to Reactor 2020.0.18
Closes gh-30587
2022-04-12 16:26:56 +02:00
Andy Wilkinson 44211564a4 Adapt to latest changes in Micrometer 2.0 snapshots
See gh-29666
2022-04-12 15:25:43 +01:00
Andy Wilkinson cb44a9c8a8 Merge branch '2.7.x' 2022-04-12 11:48:16 +01:00
Andy Wilkinson 6580f6c742 Align with latest changes in Micrometer 1.9 snapshots
See gh-30605
2022-04-12 11:47:34 +01:00
Andy Wilkinson b871a1e457 Merge branch '2.7.x' 2022-04-12 08:51:47 +01:00
Andy Wilkinson 48f8021d88 Migrate @Local*Port annotations to spring-boot-test
Closes gh-29589
2022-04-12 08:48:43 +01:00
Andy Wilkinson 8d18e5fc0e Merge branch '2.7.x' 2022-04-11 15:23:10 +01:00
Andy Wilkinson b8b903527a Update tag keys to comply with Micrometer recommendations
Closes gh-30536
2022-04-11 15:21:35 +01:00
Stephane Nicoll 52d7424de8 Merge branch '2.7.x' 2022-04-09 18:05:09 +02:00
Stephane Nicoll 6f62e1c743 Start building against Spring Session 2021.2.0-RC1 snapshots
See gh-30611
2022-04-09 17:27:48 +02:00
Stephane Nicoll 2ed65b3035 Start building against Spring Security 2.7.0-RC1 snapshots
See gh-30609
2022-04-09 17:27:48 +02:00
Stephane Nicoll 8658765eb4 Start building against Spring Kafka 2.8.5 snapshots
See gh-30608
2022-04-09 17:27:48 +02:00
Stephane Nicoll 726c4e9ced Start building against Spring Retry 1.3.3 snapshots
See gh-30607
2022-04-09 17:15:20 +02:00
Stephane Nicoll 65efc75c6f Start building against Spring LDAP 2.4.0-RC1 snapshots
See gh-30606
2022-04-09 17:15:20 +02:00
Stephane Nicoll 454f409a14 Start building against Micrometer 1.9.0-RC1 snapshots
See gh-30605
2022-04-09 17:15:20 +02:00