Commit Graph

16577 Commits

Author SHA1 Message Date
Stephane Nicoll 1dd859da10 Upgrade to AppEngine SDK 1.9.96
Closes gh-30710
2022-04-18 10:49:10 +02:00
Stephane Nicoll e46f92b278 Upgrade to Micrometer 1.9.0-RC1
Closes gh-30605
2022-04-17 19:24:32 +02:00
Stephane Nicoll 73b98d0cb8 Polish 2022-04-16 09:07:46 +02:00
Stephane Nicoll 7a6bb7208d Start building against Spring Integration 5.5.11 snapshots
See gh-30704
2022-04-16 09:06:23 +02:00
Stephane Nicoll f340a90ade Start building against Spring AMQP 2.4.4 snapshots
See gh-30703
2022-04-16 09:05:45 +02:00
Stephane Nicoll 140c14cefc Start building against Spring Integration 5.5.11 snapshots
See gh-30702
2022-04-16 08:56:33 +02:00
Stephane Nicoll aed4bc5696 Start building against Spring AMQP 2.4.4 snapshots
See gh-30701
2022-04-16 08:55:39 +02:00
Stephane Nicoll 8e1e909444 Start building against Spring Integration 5.5.11 snapshots
See gh-30700
2022-04-16 08:54:14 +02:00
Stephane Nicoll 5cdcdbdcf1 Start building against Spring AMQP 2.3.16 snapshots
See gh-30699
2022-04-16 08:53:18 +02:00
Stephane Nicoll af7c20491b Upgrade to Undertow 2.2.17.Final
Closes gh-30690
2022-04-15 08:29:10 +02:00
Stephane Nicoll 7d8128adc8 Upgrade to RSocket 1.1.2
Closes gh-30688
2022-04-15 08:29:05 +02:00
Stephane Nicoll aa76f451e3 Upgrade to Pooled JMS 1.2.4
Closes gh-30687
2022-04-15 08:29:03 +02:00
Stephane Nicoll 5d430b4267 Upgrade to Netty 4.1.76.Final
Closes gh-30686
2022-04-15 08:29:01 +02:00
Stephane Nicoll 9a89e83be4 Upgrade to Jetty 9.4.46.v20220331
Closes gh-30684
2022-04-15 08:28:57 +02:00
Stephane Nicoll aa629c8510 Upgrade to Hibernate 5.6.8.Final
Closes gh-30683
2022-04-15 08:28:54 +02:00
Stephane Nicoll be5c168e8c Upgrade to AppEngine SDK 1.9.96
Closes gh-30682
2022-04-15 08:28:52 +02:00
Stephane Nicoll 1be434e0a3 Upgrade to Spring Retry 1.3.3
Closes gh-30599
2022-04-15 08:26:19 +02:00
Stephane Nicoll 9299329256 Upgrade to Spring Retry 1.3.3
Closes gh-30590
2022-04-15 08:25:42 +02:00
Stephane Nicoll be2b70452e Upgrade to Undertow 2.2.17.Final
Closes gh-30681
2022-04-15 07:49:53 +02:00
Stephane Nicoll ded1810bd1 Upgrade to RSocket 1.1.2
Closes gh-30679
2022-04-15 07:49:49 +02:00
Stephane Nicoll a913e4fdd5 Upgrade to Pooled JMS 1.2.4
Closes gh-30678
2022-04-15 07:49:46 +02:00
Stephane Nicoll 0389bc84db Upgrade to Netty 4.1.76.Final
Closes gh-30677
2022-04-15 07:49:44 +02:00
Stephane Nicoll a245028b05 Upgrade to Jetty 9.4.46.v20220331
Closes gh-30676
2022-04-15 07:49:42 +02:00
Stephane Nicoll c6473bb5b5 Upgrade to AppEngine SDK 1.9.96
Closes gh-30675
2022-04-15 07:49:40 +02:00
Stephane Nicoll 2fd04d9711 Upgrade to Micrometer 1.8.5
Closes gh-30597
2022-04-15 07:46:20 +02:00
Stephane Nicoll 5661c18d26 Upgrade to Micrometer 1.7.11
Closes gh-30588
2022-04-15 07:45:32 +02:00
Brian Clozel eddb2b16ff Configure RSocket server support in GraphQL
This commit adds the RSocket server auto-configuration for GraphQL.

See gh-30453
2022-04-14 19:54:40 +02:00
Andy Wilkinson 74494f1d37 Merge branch '2.6.x' into 2.7.x
Closes gh-30671
2022-04-14 18:38:09 +01:00
Andy Wilkinson 1720290234 Merge branch '2.5.x' into 2.6.x
Closes gh-30670
2022-04-14 18:37:55 +01:00
Andy Wilkinson f7d181e65b Handle null additional properties more gracefully
Closes gh-30654
2022-04-14 18:36:15 +01:00
Andy Wilkinson 7789a18d23 Merge branch '2.6.x' into 2.7.x
Closes gh-30667
2022-04-14 14:51:22 +01:00
Andy Wilkinson d4348279a7 Merge branch '2.5.x' into 2.6.x
Closes gh-30666
2022-04-14 14:51:09 +01:00
Andy Wilkinson 8f1b8622ba Ensure that webEnvironment=NONE creates non-web context
Previously, if spring.main.web-application-type was configured in
application.properties to servlet or reactive, setting
webEnvironment=NONE on @SpringBootTest would not work correctly and
a servlet or reactive web application context would be created
based on the value of spring.main.web-application-type.

This commit updates the test context bootstapper to set
spring.main.web-application-type to none when webEnvironment has been
set to none. This is done in the merged context configuration's
property source properties which are applied to the environment in a
high-precedence test property source that will override configuration
in application.properties.

Closes gh-29695
2022-04-14 14:44:30 +01:00
Andy Wilkinson 4545d39603 Merge branch '2.6.x' into 2.7.x
Closes gh-30665
2022-04-14 13:28:39 +01:00
Andy Wilkinson 887fa4a13f Merge branch '2.5.x' into 2.6.x
Closes gh-30664
2022-04-14 12:40:29 +01:00
Andy Wilkinson c8de843d85 Honor final web application type when creating context in tests
Previously, SpringBootContextLoader would configure its
SpringApplication with an ApplicationContextFactory that ignores
the WebApplicationType with which its called and instead returns a
hard-coded type of context based on the type of the
MergedContextConfiguration. This hard-coding would result in the
wrong type of context being used if a subsequent change was made to
the application's WebApplicationType, for example due to binding of
the spring.main.web-application-type configuration property.

This commit updates SpringBootContextLoader to configure
SpringApplication with an ApplicationContextFactory that takes the
WebApplicationType with which it is called into consideration.

Fixes gh-29170
2022-04-14 12:26:07 +01:00
Scott Frederick d387b3fa81 Support configuration of web SSL using PEM-encoded certificates
This commit adds the ability to configure SSL in embedded web containers
using PEM-encoded certificate and private key files, as an alternative
to configuring SSL with Java KeyStore files.

Closes gh-29273
2022-04-13 16:28:04 -05:00
Scott Frederick f032690d0a Add support for CNB platform API 0.9
Fixes gh-30566
2022-04-13 16:09:32 -05:00
Andy Wilkinson ff40c8b6f5 Use MeterBinders to bind DataSource metrics
Closes gh-30282
2022-04-13 19:24:06 +01:00
Andy Wilkinson 5e76671859 Remove remaining code that was deprecated in 2.5
Closes gh-30442
2022-04-13 18:09:39 +01:00
Andy Wilkinson 631b876165 Deprecate DatabaseDriver.GAE
Closes gh-29984
2022-04-13 14:19:09 +01:00
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 b5713ba5e7 Upgrade to Spring Framework 5.3.19
Closes gh-30518
2022-04-13 13:20:01 +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 27a936e466 Fix Elastic health indicator without RestHighLevelClient
Closes gh-28496
2022-04-13 10:02:47 +01:00
Stephane Nicoll 00a481e4e9 Upgrade to Reactor 2020.0.18
Closes gh-30604
2022-04-13 09:17:43 +02: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 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 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
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
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 6580f6c742 Align with latest changes in Micrometer 1.9 snapshots
See gh-30605
2022-04-12 11:47:34 +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 b8b903527a Update tag keys to comply with Micrometer recommendations
Closes gh-30536
2022-04-11 15:21:35 +01: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
Stephane Nicoll 719fb625ef Start building against Reactor 2020.0.18 snapshots
See gh-30604
2022-04-09 17:15:20 +02:00
Stephane Nicoll 2ded2bf71a Adapt to latest change in Spring Framework snapshots 2022-04-09 17:10:48 +02:00
Stephane Nicoll 2a36d3dd14 Start building against Spring Session 2021.1.3 snapshots
See gh-30603
2022-04-09 10:01:02 +02:00
Stephane Nicoll c080a29feb Start building against Spring Security 5.6.3 snapshots
See gh-30601
2022-04-09 10:01:02 +02:00
Stephane Nicoll e42eeca549 Start building against Spring Kafka 2.8.5 snapshots
See gh-30600
2022-04-09 10:01:01 +02:00
Stephane Nicoll 65e2c20ca8 Start building against Spring Data 2021.1.4 snapshots
See gh-30602
2022-04-09 10:01:01 +02:00
Stephane Nicoll 33994a9f54 Start building against Spring Retry 1.3.3 snapshots
See gh-30599
2022-04-09 10:01:01 +02:00
Stephane Nicoll 9eb6f714b5 Start building against Spring LDAP 2.3.7 snapshots
See gh-30598
2022-04-09 10:01:01 +02:00
Stephane Nicoll ccdd49040f Start building against Micrometer 1.8.5 snapshots
See gh-30597
2022-04-09 10:01:01 +02:00
Stephane Nicoll e735bb2fcd Start building against Spring Framework 5.3.19 snapshots
See gh-30517
2022-04-09 10:01:00 +02:00
Stephane Nicoll 13cd3d2ce0 Start building against Reactor 2020.0.18 snapshots
See gh-30596
2022-04-09 09:35:22 +02:00
Andy Wilkinson 7534e50d0b Merge branch '2.6.x' into 2.7.x
Closes gh-30621
2022-04-08 21:02:16 +01:00
Andy Wilkinson 7e44745816 Merge branch '2.5.x' into 2.6.x
Closes gh-30620
2022-04-08 21:01:48 +01:00
Andy Wilkinson b88f062f04 Polish "Remove assumptions about ordering when comparing JSON in tests"
See gh-30514
2022-04-08 20:56:20 +01:00
Vivek Gupta 5b3bc1a936 Remove assumptions about ordering when comparing JSON in tests
See gh-30514
2022-04-08 20:55:54 +01:00
Andy Wilkinson f209d77cb2 Merge branch '2.6.x' into 2.7.x
Closes gh-30617
2022-04-08 14:04:43 +01:00
Andy Wilkinson d6731805b6 Merge branch '2.5.x' into 2.6.x
Closes gh-30616
2022-04-08 14:03:58 +01:00
Andy Wilkinson 70fa7e5e93 Make properties field final
Closes gh-30615
2022-04-08 14:03:29 +01:00
Stephane Nicoll 6aa8436c6d Start building against Spring Session 2021.0.6 snapshots
See gh-30595
2022-04-08 10:09:30 +02:00
Stephane Nicoll 455c37645d Start building against Spring Security 5.5.6 snapshots
See gh-30593
2022-04-08 10:09:00 +02:00
Stephane Nicoll bb8be2425a Start building against Spring Kafka 2.7.13 snapshots
See gh-30592
2022-04-08 10:08:35 +02:00
Stephane Nicoll aab8fc80ec Start building against Spring Data 2021.0.11 snapshots
See gh-30594
2022-04-08 10:08:10 +02:00
Stephane Nicoll 0080e45172 Start building against Spring Retry 1.3.3 snapshots
See gh-30590
2022-04-08 10:07:41 +02:00
Stephane Nicoll 5b05304c2c Start building against Spring LDAP 2.3.7 snapshots
See gh-30589
2022-04-08 10:07:13 +02:00
Stephane Nicoll ea6e87adef Start building against Micrometer 1.7.11 snapshots
See gh-30588
2022-04-08 10:06:34 +02:00
Stephane Nicoll e70451635c Start building against Spring Framework 5.3.19 snapshots
See gh-30516
2022-04-08 10:06:02 +02:00
Stephane Nicoll 9dda20cfab Start building against Reactor 2020.0.18 snapshots
See gh-30587
2022-04-08 09:48:36 +02:00
Scott Frederick 90aee8ef2f Polish FailureAnalyzers deprecation message
Fixes gh-30578
2022-04-07 17:10:45 -05:00
Scott Frederick d67dcf16cd Migrate FailureAnalyzers to constructor injection
All `FailureAnalyzer` implementations should use constructor
injection for `BeanFactory` and `Environment` instead of implementing
`BeanFactoryAware` or `EnvironmentAware` interfaces.

Fixes gh-30585
2022-04-07 16:58:59 -05:00
Andy Wilkinson 612e4114d2 Merge branch '2.6.x' into 2.7.x
Closes gh-30584
2022-04-07 20:44:29 +01:00
Andy Wilkinson f027faafa2 Merge branch '2.5.x' into 2.6.x
Closes gh-30583
2022-04-07 20:44:10 +01:00
izeye 618d113fad Move Jetty 9 specific exclusions to correct dependency
See gh-30522
2022-04-07 20:41:42 +01:00
Andy Wilkinson 5a26e936de Merge branch '2.6.x' into 2.7.x
Closes gh-30582
2022-04-07 20:31:46 +01:00
Andy Wilkinson a2c08f9f99 Merge branch '2.5.x' into 2.6.x
Closes gh-30581
2022-04-07 20:31:22 +01:00