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

16673 Commits

Author SHA1 Message Date
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
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 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 febea4711e Make Reactive and ServletWebServerFactory extend marker interface 
Closes gh-30579
 2022-04-07 18:20:38 +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 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 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 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 71e52a475b Upgrade to Embedded Mongo 3.4.5 
Closes gh-30546
 2022-04-05 15:32:52 +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 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
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 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 eedb8573b7 Polish documentation 2022-04-04 14:27:18 +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
Jonatan Ivanov d0bc31a5e9 Add support for Prometheus Exemplars 
See gh-30472
 2022-04-04 13:35:38 +02:00
Brian Clozel 51c45d5b10 Switch to Spring Framework 5.3.19-SNAPSHOT 
See gh-30518
 2022-04-04 11:08:36 +02:00
Stephane Nicoll 2a2c4be809 Merge branch '2.6.x' into 2.7.x 
Closes gh-30510
 2022-04-03 09:33:02 +02:00
Stephane Nicoll b2a4ae38e8 Merge branch '2.5.x' into 2.6.x 
Closes gh-30509
 2022-04-03 09:32:39 +02:00
izeye 40d0e38e76 Test Spring Boot Gradle Plugin against Gradle 7.4.2 
See gh-30506
 2022-04-03 09:29:50 +02:00
Stephane Nicoll 2c5398898b Polish "Deprecate running an application in the Maven JVM" 
See gh-30479
 2022-04-01 11:57:59 +02:00
Stephane Nicoll 09696c90c7 Deprecate running an application in the Maven JVM 
This commit deprecates the "fork" property so that the application
always runs in a dedicated process. This aligns with the behaviour of
the Gradle plugin, and simplifies the lifecycle of certain features that
would not work in a non-forked process.

Closes gh-30479
 2022-04-01 11:35:34 +02:00
Stephane Nicoll 1da5a7a600 Merge branch '2.6.x' into 2.7.x 2022-03-31 12:45:05 +02:00
Stephane Nicoll 546a7e5edb Merge branch '2.5.x' into 2.6.x 2022-03-31 12:44:52 +02:00
Stephane Nicoll 17936b855c Polish 2022-03-31 12:42:37 +02:00
Stephane Nicoll 9168e63e62 Upgrade to Spring Framework 5.3.18 
Closes gh-30493
 2022-03-31 12:02:46 +02:00
Stephane Nicoll 7ccbdda1e7 Upgrade to Spring Framework 5.3.18 
Closes gh-30492
 2022-03-31 11:30:14 +02:00
Stephane Nicoll 94c40c7234 Upgrade to Spring Framework 5.3.18 
Closes gh-30491
 2022-03-31 11:29:49 +02:00
Andy Wilkinson 2da44a0b4f Upgrade to Jackson Bom 2.13.2.20220328 
Closes gh-30478
 2022-03-30 14:29:38 +01:00
Andy Wilkinson 06c5e26f81 Upgrade to Jackson Bom 2.12.6.20220326 
Closes gh-30477
 2022-03-30 13:30:42 +01:00
Andy Wilkinson b9029fcf9e Merge branch '2.6.x' into 2.7.x 
Closes gh-30476
 2022-03-30 10:57:10 +01:00
Andy Wilkinson 64beaba99f Merge branch '2.5.x' into 2.6.x 
Closes gh-30475
 2022-03-30 10:56:56 +01:00
Andy Wilkinson 8cb11b74cd Polish "Make MustacheViewResolver bean back off without Spring MVC" 
See gh-30456
 2022-03-30 10:33:35 +01:00
Craig Andrews 7101b5099f Make MustacheViewResolver bean back off without Spring MVC 
See gh-30456
 2022-03-30 10:31:44 +01:00
Andy Wilkinson 24e6417ddc Adapt to latest changes in Spring for GraphQL snapshots 
See gh-30463
 2022-03-29 16:50:12 +01:00
Brian Clozel 93817c708e Switch to Spring for GraphQL 1.0.0-SNAPSHOT 
See gh-30463
 2022-03-29 16:37:21 +02:00
Brian Clozel 4466a0b041 Upgrade to GraphQL Java 18.0 
Closes gh-30464
 2022-03-29 16:37:21 +02:00
Andy Wilkinson 4722d9d17e Merge branch '2.6.x' into 2.7.x 
Closes gh-30470
 2022-03-29 15:06:56 +01:00
Andy Wilkinson 880d33f391 Merge branch '2.5.x' into 2.6.x 
Closes gh-30469
 2022-03-29 15:06:47 +01:00
Andy Wilkinson 05b7befc7a Fix javadoc of ResolveMainClassName setClasspath(Object) 
Closes gh-30468
 2022-03-29 15:05:54 +01:00
Andy Wilkinson 2f3ae02385 Merge branch '2.6.x' into 2.7.x 
Closes gh-30466
 2022-03-29 14:24:42 +01:00
Andy Wilkinson 8f985474a6 Merge branch '2.5.x' into 2.6.x 
Closes gh-30465
 2022-03-29 14:24:25 +01:00
Andy Wilkinson d574563616 Document @ConstructorBinding and @DefaultValue with records 
Closes gh-30460
 2022-03-29 14:14:28 +01:00
Stephane Nicoll 5466444826 Merge branch '2.6.x' into 2.7.x 
Closes gh-30450
 2022-03-28 09:46:42 +02:00
Stephane Nicoll 5dc4ff5366 Update copyright year of changed file 
See gh-30446
 2022-03-28 09:46:21 +02:00
Vikey Chen f9d1c400a7 Remove redundant Javadoc 
See gh-30446
 2022-03-28 09:45:33 +02:00
Moritz Halbritter 018281f3d0 Merge branch '2.6.x' into 2.7.x 
Closes gh-30441
 2022-03-25 16:28:24 +01:00
Moritz Halbritter cee51783fd Merge branch '2.5.x' into 2.6.x 
Closes gh-30440
 2022-03-25 16:28:07 +01:00
Moritz Halbritter 24e748d5cd Remove unnecessary entries in additional config metadata 
Add the 'enabled' fields directly to the classes instead.

Closes gh-30439
 2022-03-25 16:22:47 +01:00
Andy Wilkinson 685d2d4391 Polish 
See gh-30152
 2022-03-25 15:15:02 +00:00
Guirong Hu df417bf317 Simplify registration of Jackson mixin types 
See gh-30152
 2022-03-25 15:15:02 +00:00
Moritz Halbritter 45f393b76b Merge branch '2.6.x' into 2.7.x 
Closes gh-30437
 2022-03-25 14:56:01 +01:00
Moritz Halbritter c003d5b533 Merge branch '2.5.x' into 2.6.x 
Closes gh-30436
 2022-03-25 14:55:31 +01:00
Moritz Halbritter 0ff8119a1b Sort entries in additional-spring-configuration metadata alphabetically 
Closes gh-30434
 2022-03-25 14:54:39 +01:00
Andy Wilkinson 8646ac4215 Move JsonComponent docs to general Jackson section 
Closes gh-30405
 2022-03-25 13:30:06 +00:00
Andy Wilkinson 64888b0deb Merge branch '2.6.x' into 2.7.x 
Closes gh-30433
 2022-03-25 12:03:24 +00:00
Phillip Webb dcfaadfb88 Upgrade to SendGrid 4.9.1 
Closes gh-30417
 2022-03-24 11:04:45 -07:00
Phillip Webb 123e22afb0 Upgrade to MongoDB 4.5.1 
Closes gh-30416
 2022-03-24 11:04:39 -07:00
Moritz Halbritter 47bf218bd2 Add prohibit clauses to shut up bomr 2022-03-24 15:18:19 +01:00
Andy Wilkinson 5d55c663ba Allow spring.data.mongodb.uri to take precedence over separate props 
Closes gh-30067
 2022-03-23 20:15:04 +00:00
Andy Wilkinson 06c3e2a041 Merge branch '2.6.x' into 2.7.x 
Closes gh-30394
 2022-03-23 15:30:43 +00:00
Andy Wilkinson 2317f69f4c Add Apache Kafka to Messaging section's description 
Closes gh-30389
 2022-03-23 15:29:56 +00:00
Andy Wilkinson b911530c31 Merge branch '2.6.x' into 2.7.x 
Closes gh-30393
 2022-03-23 15:29:09 +00:00
Andy Wilkinson 9c128f1acc Merge branch '2.5.x' into 2.6.x 
Closes gh-30392
 2022-03-23 15:28:56 +00:00
Andy Wilkinson 73d9e0e0ed Fix equals when adapt removes trailing characters from element 
Closes gh-30317
 2022-03-23 14:55:00 +00:00
Stephane Nicoll b70c409178 Upgrade to Selenium HtmlUnit 3.60.0 
Closes gh-30391
 2022-03-23 15:32:00 +01:00
Stephane Nicoll d7ca7763da Upgrade to HtmlUnit 2.60.0 
Closes gh-30390
 2022-03-23 15:31:57 +01:00
Andy Wilkinson 3255da23a2 Merge branch '2.6.x' into 2.7.x 
Closes gh-30388
 2022-03-23 12:11:13 +00:00
Andy Wilkinson c739831087 Merge branch '2.5.x' into 2.6.x 
Closes gh-30387
 2022-03-23 12:11:02 +00:00
Andy Wilkinson d8cf332c2e Document default value of spring.thymeleaf.reactive.media-types 
Closes gh-30280
 2022-03-23 12:09:48 +00:00
Andy Wilkinson 3ee44ca0b0 Merge branch '2.6.x' into 2.7.x 
Closes gh-30386
 2022-03-23 11:47:53 +00:00
Andy Wilkinson f378627f94 Merge branch '2.5.x' into 2.6.x 
Closes gh-30385
 2022-03-23 11:45:31 +00:00
Andy Wilkinson 8d882fa09b Fix possible duplicate templateEngine bean in Thymeleaf auto-config 
Closes gh-30384
 2022-03-23 11:44:59 +00:00
Andy Wilkinson bcb71dfd1b Merge branch '2.6.x' into 2.7.x 
Closes gh-30383
 2022-03-23 11:18:04 +00:00
Andy Wilkinson 1244c429a6 Merge branch '2.5.x' into 2.6.x 
Closes gh-30382
 2022-03-23 11:17:36 +00:00
Andy Wilkinson e927cd71dd Clarify type matching performed by MockBean and SpyBean 
Closes gh-28656
 2022-03-23 11:17:07 +00:00
Andy Wilkinson 47540eec61 Align default indices options with Spring Data Elasticsearch 
Closes gh-30378
 2022-03-23 09:39:05 +00:00
Andy Wilkinson ac3b0ea24a Merge branch '2.6.x' into 2.7.x 
Closes gh-30380
 2022-03-23 09:36:31 +00:00
Andy Wilkinson 24aa4070c9 Merge pull request #30349 from hpoettker 
* gh-30349:
  Fix links to Spring Security Reference Guide

Closes gh-30349
 2022-03-23 09:35:58 +00:00
Henning Poettker 22eb301bcf Fix links to Spring Security Reference Guide 
See gh-30349
 2022-03-23 09:35:30 +00:00
Stephane Nicoll dc7c1f246f Upgrade to Spring Integration 5.5.10 
Closes gh-30193
 2022-03-23 08:07:11 +01:00
Stephane Nicoll 589804000b Upgrade to Spring Integration 5.5.10 
Closes gh-30183
 2022-03-23 08:06:25 +01:00
Stephane Nicoll acdfa31f5a Upgrade to Spring Integration 5.5.10 
Closes gh-30175
 2022-03-23 08:05:45 +01:00
Andy Wilkinson 79ee53a587 Merge branch '2.6.x' into 2.7.x 
Closes gh-30377
 2022-03-22 20:13:04 +00:00
Andy Wilkinson f063da30d2 Merge branch '2.5.x' into 2.6.x 
Closes gh-30376
 2022-03-22 20:12:48 +00:00
Andy Wilkinson a8bddeb9cf Remove redundant setting of refresh policy 
Closes gh-30375
 2022-03-22 20:12:09 +00:00
Andy Wilkinson 219d946e33 Upgrade to Spring for GraphQL 1.0.0-M6 
Closes gh-29637
 2022-03-22 17:30:21 +00:00
Andy Wilkinson 91fe362e94 Merge branch '2.6.x' into 2.7.x 
Closes gh-30352
 2022-03-21 20:44:51 +00:00
Andy Wilkinson f53c5178c3 Upgrade to Spring Kafka 2.8.4 
Closes gh-30181
 2022-03-21 20:44:19 +00:00