root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
37,686 Commits 23 Branches 345 Tags 278 MiB
Commit Graph

17173 Commits

Author SHA1 Message Date
Stephane Nicoll e09840ae65 Upgrade to Undertow 2.2.17.Final 
Closes gh-30732
 2022-04-18 13:10:13 +02:00
Stephane Nicoll 6b007448d4 Upgrade to RSocket 1.1.2 
Closes gh-30729
 2022-04-18 10:54:40 +02:00
Stephane Nicoll cbf2da995b Upgrade to Postgresql 42.3.4 
Closes gh-30728
 2022-04-18 10:54:39 +02:00
Stephane Nicoll 390b97cb42 Upgrade to Pooled JMS 1.2.4 
Closes gh-30727
 2022-04-18 10:54:39 +02:00
Stephane Nicoll 5921eda8b9 Upgrade to Netty 4.1.76.Final 
Closes gh-30726
 2022-04-18 10:54:39 +02:00
Stephane Nicoll 53c38f7601 Upgrade to MIMEPull 1.10.0 
Closes gh-30725
 2022-04-18 10:54:39 +02:00
Stephane Nicoll 5737a92fa1 Upgrade to Maven Shade Plugin 3.3.0 
Closes gh-30724
 2022-04-18 10:54:38 +02:00
Stephane Nicoll 1b167bfdf2 Upgrade to Maven Clean Plugin 3.2.0 
Closes gh-30723
 2022-04-18 10:54:38 +02:00
Stephane Nicoll 313b203540 Upgrade to MariaDB 3.0.4 
Closes gh-30722
 2022-04-18 10:54:38 +02:00
Stephane Nicoll bb394b2294 Upgrade to Lombok 1.18.24 
Closes gh-30721
 2022-04-18 10:54:38 +02:00
Stephane Nicoll fe966bc24e Upgrade to Liquibase 4.9.1 
Closes gh-30720
 2022-04-18 10:54:38 +02:00
Stephane Nicoll 3ed0716646 Upgrade to Kotlin Coroutines 1.6.1 
Closes gh-30719
 2022-04-18 10:54:37 +02:00
Stephane Nicoll 8655cfd3f1 Upgrade to Jetty 9.4.46.v20220331 
Closes gh-30717
 2022-04-18 10:54:37 +02:00
Stephane Nicoll 95123c93b4 Upgrade to Jackson Bom 2.13.2.20220328 
Closes gh-30716
 2022-04-18 10:54:36 +02:00
Stephane Nicoll eb6603c265 Upgrade to Hibernate 5.6.8.Final 
Closes gh-30715
 2022-04-18 10:49:21 +02:00
Stephane Nicoll 79a3d098e6 Upgrade to H2 2.1.212 
Closes gh-30714
 2022-04-18 10:49:19 +02:00
Stephane Nicoll 634ba0ace1 Upgrade to Flyway 8.5.8 
Closes gh-30713
 2022-04-18 10:49:17 +02:00
Stephane Nicoll e918a4d21d Upgrade to Elasticsearch 7.17.2 
Closes gh-30712
 2022-04-18 10:49:15 +02:00
Stephane Nicoll 4c3a7670e2 Upgrade to Byte Buddy 1.12.9 
Closes gh-30711
 2022-04-18 10:49:12 +02:00
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 6cbb4a4f33 Merge branch '2.7.x' 2022-04-16 09:07:59 +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 8c68b33240 Polish "Start building against Micrometer 1.10.0 snapshots" 
See gh-30693
 2022-04-15 15:59:24 +02:00
Marcin Grzejszczak 87991d93a5 Start building against Micrometer 1.10.0 snapshots 
See gh-30693
 2022-04-15 14:16:16 +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
Andy Wilkinson 4a401bfa16 Adapt to breaking changes in Spring Session Data Redis 
See gh-30639
 2022-04-14 20:41:20 +01: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 7e97073994 Merge branch '2.7.x' 2022-04-14 18:38:26 +01: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 9658661bd4 Merge branch '2.7.x' 2022-04-14 14:53:40 +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 21ccd58f67 Merge branch '2.7.x' 2022-04-14 13:29:08 +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
Stephane Nicoll c654638654 Polish "Add link to @Order annotation" 
See gh-30572
 2022-04-14 10:39:22 +02:00
prd c72f3d79af Add link to @Order annotation 
See gh-30572
 2022-04-14 10:36:33 +02:00
Moritz Halbritter 3860eb211a Implement auto-configurations for Brave and OpenTelemetry 
- Configure Zipkin
- Configure Wavefront
- Configure Brave
- Configure OpenTelemetry
- Configure Micrometer Tracing bridges for OpenTelemetry and Brave
- Create the ObservationHandler for tracing with Micrometer

Closes gh-30156
 2022-04-14 09:14:44 +02:00
Scott Frederick f5f7fc8e9a Merge branch '2.7.x' 2022-04-13 16:29:00 -05: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 9aff0a998f Merge branch '2.7.x' 2022-04-13 16:09:48 -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 3d5086a42d Merge branch '2.7.x' 2022-04-13 19:24:47 +01:00
Andy Wilkinson ff40c8b6f5 Use MeterBinders to bind DataSource metrics 
Closes gh-30282
 2022-04-13 19:24:06 +01:00
Andy Wilkinson d1cd95eb13 Merge branch '2.7.x' 2022-04-13 18:13:29 +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 c37857c6c6 Merge branch '2.7.x' 2022-04-13 14:20:27 +01:00
Andy Wilkinson 631b876165 Deprecate DatabaseDriver.GAE 
Closes gh-29984
 2022-04-13 14:19:09 +01:00
Moritz Halbritter 2c42be9392 Merge branch '2.7.x' 2022-04-13 15:00:27 +02: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 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 00a481e4e9 Upgrade to Reactor 2020.0.18 
Closes gh-30604
 2022-04-13 09:17:43 +02:00
Andy Wilkinson 258ae5e153 Merge branch '2.7.x' 2022-04-12 21:58:41 +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 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
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 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 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 6d865c2646 Merge branch '2.7.x' 2022-04-08 21:02:35 +01: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 136189c86f Merge branch '2.7.x' 2022-04-08 14:05:07 +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 0dd9493dc1 Merge branch '2.7.x' 2022-04-07 17:12:14 -05: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 2dcc1ea257 Merge branch '2.7.x' 2022-04-07 20:44:38 +01: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 41213a8c4e Merge branch '2.7.x' 2022-04-07 20:33:30 +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
Andy Wilkinson 35154a96f3 Polish "Fix NPE in configprops endpoint" 
See gh-30068
 2022-04-07 19:44:06 +01:00
qxo a1fe05f40b Fix NPE in configprops endpoint 
This works around spring-projects/spring-framework#28298. The bug
means that when a @Configuration class is annotated with
@ConfigurationProperties any bean defined by a static @Bean method
is considered to be annotated with @ConfigurationProperties.

See gh-30068
 2022-04-07 19:40:29 +01:00
Andy Wilkinson fac2430dff Merge branch 'gh-30358' 2022-04-07 19:17:27 +01:00
Andy Wilkinson dbc59052ba Polish "Add failure analyzer for missing web factory bean" 
See gh-30358
 2022-04-07 18:55:04 +01:00
Guirong Hu dfafccaba5 Add failure analyzer for missing web factory bean 
See gh-30358
 2022-04-07 18:50:50 +01:00
Andy Wilkinson 95c8d7f79d Merge branch '2.7.x' 2022-04-07 18:50:13 +01:00
Andy Wilkinson febea4711e Make Reactive and ServletWebServerFactory extend marker interface 
Closes gh-30579
 2022-04-07 18:20:38 +01:00
Andy Wilkinson e6b485b317 Merge branch '2.7.x' 2022-04-07 16:31:58 +01:00
Andy Wilkinson 8727361221 Polish "Order ExitCodeGenerators and return first non-zero exit code" 
See gh-30457
 2022-04-07 16:31:19 +01:00
dugenkui 6718b10fa9 Order ExitCodeGenerators and return first non-zero exit code 
See gh-30457
 2022-04-07 16:30:09 +01:00
Stephane Nicoll 3e67ffd233 Merge branch '2.7.x' 2022-04-07 09:18:26 +02:00
Stephane Nicoll 245e602ae0 Merge branch '2.6.x' into 2.7.x 
Closes gh-30573
 2022-04-07 09:18:17 +02:00
luozhenyu 09daad0a16 Add metadata for management.endpoint.health.probes.add-additional-paths 
See gh-30562
 2022-04-07 09:14:02 +02:00
Moritz Halbritter 4307edbb1b Merge branch '2.7.x' 2022-04-06 10:28:35 +02:00
Moritz Halbritter 98bbbc910b Merge branch '2.6.x' into 2.7.x 
Closes gh-30554
 2022-04-06 10:28:24 +02:00
Moritz Halbritter c54b825a82 Merge branch '2.5.x' into 2.6.x 
Closes gh-30553
 2022-04-06 10:28:11 +02:00
dugenkui03 035a16278e Make ApplicationAvailabilityBean threadsafe 
See gh-30489
 2022-04-06 10:26:21 +02:00
Moritz Halbritter 8f275353ef Merge branch '2.7.x' 2022-04-06 08:57:15 +02:00
Moritz Halbritter 1b5927b325 Merge branch '2.6.x' into 2.7.x 
Closes gh-30552
 2022-04-06 08:56:59 +02:00
Moritz Halbritter 99a1b98e03 Merge branch '2.5.x' into 2.6.x 
Closes gh-30551
 2022-04-06 08:56:47 +02:00
Moritz Halbritter 41ab46d0c7 Fix wrong replacement hint for 'spring.data.neo4j.username' 
Closes gh-30550
 2022-04-06 08:56:23 +02:00
Andy Wilkinson d6f111ce59 Merge branch '2.7.x' 
Closes gh-30547
 2022-04-05 16:00:34 +01:00
Andy Wilkinson 71e52a475b Upgrade to Embedded Mongo 3.4.5 
Closes gh-30546
 2022-04-05 15:32:52 +01:00
Andy Wilkinson a70249e368 Merge branch '2.7.x' 2022-04-05 15:11:41 +01:00
Andy Wilkinson ffc0fafe1a Merge branch '2.6.x' into 2.7.x 
Closes gh-30545
 2022-04-05 15:11:25 +01:00
Andy Wilkinson 05d4093381 Merge branch '2.5.x' into 2.6.x 
Closes gh-30544
 2022-04-05 15:11:01 +01:00
Andy Wilkinson 83cfc951f8 Polish "Refer to list of internal proxies in reference documentation" 
See gh-30461
 2022-04-05 14:37:08 +01:00
Damiano Albani 91306b58d5 Refer to list of internal proxies in reference documentation 
See gh-30461
 2022-04-05 14:34:37 +01:00
Moritz Halbritter 43c647e898 Merge branch '2.7.x' 2022-04-05 14:17:14 +02:00
Moritz Halbritter f8c54655f6 Merge branch '2.6.x' into 2.7.x 
Closes gh-30542
 2022-04-05 14:17:00 +02:00
Moritz Halbritter 53b2c85df0 Merge branch '2.5.x' into 2.6.x 
Closes gh-30541
 2022-04-05 14:16:38 +02:00
Chris Hut 65d8c76ac3 Add Tomcat locale mapping for Japanese to preserve UTF-8 charset 
See gh-30535
 2022-04-05 14:15:40 +02:00
Moritz Halbritter 5ab9112bbc Add auto-configuration for Micrometer 2.0.0 Observation API 
- Adds a ObservationRegistry bean
- Add support for ObservationRegistryCustomizers
- Enables timer creation for observations if micrometer-core is on
  the classpath
- Registers ObservationPredicate, GlobalTagsProvider and
  ObservationHandler on the MeterRegistry
- Applies grouping to the ObservationHandlers: MeterObservationHandler
  are added to a FirstMatchingCompositeObservationHandler
- If micrometer-tracing is on the classpath, the
  TracingObservationHandler are added to a
  FirstMatchingCompositeObservationHandler

Closes gh-29666
 2022-04-05 13:57:31 +02:00
Moritz Halbritter 4a8901b94c Start building against Spring Batch 5.0.0-SNAPSHOT 
See gh-30459
 2022-04-05 13:57:00 +02:00
Scott Frederick e32511516e Merge branch '2.7.x' 2022-04-04 16:29:52 -05:00
Scott Frederick ef79a18514 Use provided scope for Maven core dependencies in Maven plugin 
Fixes gh-29520
 2022-04-04 16:00:15 -05:00
Scott Frederick 92936c6ed3 Merge branch '2.7.x' 2022-04-04 15:27:11 -05:00
Scott Frederick 103c2bdd7d Use Tomcat SSLHostConfig API for SSL configuration 
Closes gh-30531
 2022-04-04 15:22:43 -05:00
Brian Clozel 1c71567c94 Support "application/graphql+json" media type in GraphQL HTTP mapping 
As seen in spring-projects/spring-graphql#108, the GraphQL HTTP spec now
requires the "application/graphql+json" media type and accepts
"application/json" for backwards compatibility.

This commit updates the `RouterFunction` definition for the GraphQL HTTP
endpoints so that both types are accepted.

Closes gh-30407
 2022-04-04 16:45:11 +02:00
Moritz Halbritter 5b05fd9fb2 Merge branch '2.7.x' 2022-04-04 14:27:24 +02:00
Moritz Halbritter eedb8573b7 Polish documentation 2022-04-04 14:27:18 +02:00
Moritz Halbritter 6fa696f13d Merge branch '2.7.x' 2022-04-04 14:23:24 +02:00
Moritz Halbritter bd1424b004 Merge branch '2.6.x' into 2.7.x 
Closes gh-30528
 2022-04-04 14:22:49 +02:00
Moritz Halbritter bf3c2d713d Merge branch '2.5.x' into 2.6.x 
Closes gh-30526
 2022-04-04 14:18:45 +02:00
izeye 09d6215b65 Polish documentation 
See gh-30498
 2022-04-04 14:09:28 +02:00
Moritz Halbritter 9791318e55 Merge branch '2.7.x' 2022-04-04 13:49:05 +02:00