Commit Graph

3996 Commits

Author SHA1 Message Date
Andy Wilkinson 96ade2d07a Upgrade to Jedis 4.2.3
Closes gh-31586
2022-07-07 15:13:19 +01:00
Andy Wilkinson 048bab4400 Upgrade to jOOQ 3.17.1
Closes gh-31587
2022-07-07 14:34:16 +01:00
Andy Wilkinson 344a216feb Upgrade to Artemis 2.23.1
Closes gh-31583
2022-07-07 14:34:15 +01:00
dreis2211 458f989cf3 Use switch expressions where appropriate
See gh-31527
2022-06-24 16:19:28 +01:00
Andy Wilkinson 631b1e0d76 Merge branch '2.7.x'
Closes gh-31526
2022-06-24 13:10:10 +01:00
Andy Wilkinson 1e08f545d0 Merge branch '2.6.x' into 2.7.x
Closes gh-31525
2022-06-24 13:05:06 +01:00
Andy Wilkinson f49b16c645 Upgrade to Spring Java Format 0.0.34
Closes gh-31524
2022-06-24 12:57:52 +01:00
Andy Wilkinson 7c5aacc5f9 Adapt to upstream Spring Framework exception changes 2022-06-23 17:05:58 -07:00
Phillip Webb 2c22f21835 Merge branch '2.7.x'
Closes gh-31504
2022-06-22 20:32:23 -07:00
Phillip Webb 28775c2c53 Merge branch '2.6.x' into 2.7.x
Closes gh-31503
2022-06-22 20:31:58 -07:00
Phillip Webb 904feb2490 Polish 'Allow spring.data.cassandra.config file to override default values'
See gh-31238
2022-06-22 19:51:32 -07:00
Stern, Ittay (is9613) 1c7d99890e Allow spring.data.cassandra.config file to override default values
Update `CassandraAutoConfiguration` so that properties in a
`spring.data.cassandra.config` file can override the default values
defined in `CassandraProperties`.

This commit changes two things:

1. Any primitive on `CassandraProperties` are replaced with object values.
   This allows distinguishing between defaults values and no-values. Then
   CassandraAutoConfiguration.mapConfig() can use whenNonNull() predicate
   to ignore those.

2. `CassandraProperties` no longer populate default values on any
   property. With that, the defaults can be applied on top of the file
   spring.data.cassandra.config; i.e. the config file have higher
   precedence than the defaults, but lower that any spring.data.cassandra.*
   property.

See gh-31238
2022-06-22 19:27:40 -07:00
Madhura Bhave 7cb53b3c45 Remove session store type in favor of defined order
Closes gh-27756
2022-06-22 15:22:48 -07:00
Andy Wilkinson c9e0e8891f Make reactive user details back off with Auth Manager Resolver bean
Closes gh-31317
2022-06-22 10:41:54 +01:00
Phillip Webb 4c0a4cb669 Polish 2022-06-21 12:08:03 -07:00
dreis2211 5db04da275 Use pattern matching for instanceof where appropriate
See gh-31475
2022-06-20 17:55:36 +01:00
dreis2211 93defdaa17 Use String.repeat() where possible
See gh-31456
2022-06-20 08:03:01 +02:00
Johnny Lim aab59c5f2e Static-import Mockito.mock()
See gh-31443
2022-06-19 10:31:28 +02:00
Stephane Nicoll cb22905944 Merge branch '2.7.x'
Closes gh-31455
2022-06-19 10:15:13 +02:00
Johnny Lim 11a07a9d1e Polish OAuth2ResourceServerAutoConfigurationTests
See gh-31453
2022-06-19 10:11:48 +02:00
Johnny Lim 5d7d0d8047 Use 3.0.0 for Javadoc since tags
See gh-31448
2022-06-17 16:48:58 +02:00
Andy Wilkinson bde06a3115 Merge branch '2.7.x' 2022-06-16 15:39:48 +01:00
Andy Wilkinson 89bef73846 Polish 2022-06-16 15:39:04 +01:00
Andy Wilkinson 80ae3f36a9 Merge branch '2.7.x'
Closes gh-31404
2022-06-16 13:06:00 +01:00
Andy Wilkinson a1cc5bf238 Allow multiple JWS algorithms to be configured
Closes gh-31321
2022-06-16 12:59:13 +01:00
Madhura Bhave 55d6a87fef Remove support for multiple batch jobs
Closes gh-25373
2022-06-15 09:34:10 -07:00
Stephane Nicoll b536b209ab Refine assertions on exception messages 2022-06-14 18:20:27 +02:00
Phillip Webb 378e56f1d3 Add Order annotation to GraphQL RouterFunction beans
Update GraphQL auto-configuration so that `RouterFunction` beans have
and `@Order` of 0.

Fixes gh-31314
2022-06-13 16:44:20 -07:00
Stephane Nicoll b3601643af Add hints for web resource default locations
Closes gh-31278
2022-06-13 11:09:48 +02:00
Andy Wilkinson d4be484d27 Upgrade to AssertJ 3.23.1
Closes gh-31331
2022-06-10 13:44:21 +01:00
Andy Wilkinson 36f01eb40b Fix compilation error with Tomcat 10
There's no setter for the max header size in Tomcat 10 as it's now
inherited from the underlying HTTP 1.1 protocol. The test that
was merged forwards from 2.7.x is retained to verify that this is
the case.

See gh-31330
2022-06-10 12:40:40 +01:00
Andy Wilkinson b6ebf4a7db Merge branch '2.7.x'
Closes gh-31330
2022-06-10 11:36:11 +01:00
Andy Wilkinson 7f584a95a6 Merge branch '2.6.x' into 2.7.x
Closes gh-31329
2022-06-10 11:35:54 +01:00
Andy Wilkinson e02803d341 Configure max HTTP header size when using HTTP2 with Tomcat
Closes gh-31322
2022-06-10 11:32:57 +01:00
Andy Wilkinson 91bb5aa222 Move auto-config of ReactiveElasticClient to elasticsearch pkg
Closes gh-28068
2022-06-09 11:42:09 +01:00
Stephane Nicoll cf19c176f6 Adapt test to change in Spring Framework snapshots 2022-06-03 18:11:10 +02:00
Stephane Nicoll 6e9ea85835 Adapt BasePackages bean definition for AOT processing
This commit adapts how the BasePackages bean is registered so that
AOT processing works with it out-of-the-box. Previously we were using
an instance supplier with the accumulated base packages. This commit
changes that to set a constructor argument values.

Closes gh-31223
2022-05-31 15:19:35 +02:00
Stephane Nicoll b2e63db57f Merge branch '2.7.x'
Closes gh-31209
2022-05-30 15:14:23 +02:00
Stephane Nicoll dd437c4cf4 Merge branch '2.6.x' into 2.7.x
Closes gh-31208
2022-05-30 15:14:08 +02:00
Stephane Nicoll ad1214c972 Upgrade copyright year of changed files
See gh-31197
2022-05-30 15:13:12 +02:00
heqiang 3a0ab01066 Polish "Remove boxing"
See gh-31197
2022-05-30 15:02:58 +02:00
Andy Wilkinson 4bb5ba2bd0 Merge branch '2.7.x' 2022-05-26 18:26:52 +01:00
Andy Wilkinson 935d1264e0 Merge branch '2.6.x' into 2.7.x 2022-05-26 18:13:08 +01:00
Andy Wilkinson 3d203d0215 Polish 2022-05-26 17:30:39 +01:00
Andy Wilkinson 26b89bfc80 Remove redundant throws declarations from public APIs
Closes gh-31179
2022-05-26 16:00:47 +01:00
Andy Wilkinson 5dfa5adb75 Merge branch '2.7.x'
Closes gh-31178
2022-05-26 15:54:58 +01:00
Andy Wilkinson 455ee0ce22 Merge branch '2.6.x' into 2.7.x
Closes gh-31177
2022-05-26 15:53:38 +01:00
Andy Wilkinson ee45fd2fc8 Remove redundant throws declarations from internal APIs
Closes gh-31176
2022-05-26 15:47:35 +01:00
Andy Wilkinson b3a4982f31 Merge branch '2.6.x' into 2.7.x
Closes gh-31174
2022-05-26 14:01:23 +01:00
Andy Wilkinson cbf42dea14 Update deprecation messages to change removal version from 2.8 to 3.0
Closes gh-30903
2022-05-26 13:59:03 +01:00
Andy Wilkinson 842cea2fc1 Merge branch '2.7.x' 2022-05-18 13:18:20 +01:00
Guirong Hu 1d7f7c2d28 Restore Spring Security dependency check for SpringSecurityDialect
See gh-31033
2022-05-18 13:16:24 +01:00
Andy Wilkinson 646d582393 Merge branch '2.6.x' into 2.7.x
Closes gh-31099
2022-05-18 13:14:46 +01:00
Andy Wilkinson e407bae8c8 Merge branch '2.5.x' into 2.6.x
Closes gh-31098
2022-05-18 13:14:15 +01:00
Andy Wilkinson 5e78bef9f8 Test security dialect auto-config without Spring Security
Closes gh-31097
2022-05-18 13:06:09 +01:00
Andy Wilkinson 96c2d08fc4 Remove support for Solr as it is not compatible with Jetty 11
Closes gh-31054
2022-05-18 11:33:55 +01:00
Phillip Webb f8a41d34aa Merge branch '2.7.x' 2022-05-17 22:22:08 -07:00
Phillip Webb 23eceb0d8a Merge branch '2.6.x' into 2.7.x 2022-05-17 22:21:41 -07:00
Phillip Webb ea41e89c6c Merge branch '2.5.x' into 2.6.x 2022-05-17 22:21:10 -07:00
Phillip Webb 7d2f1bafc0 Update copyright year of changed files 2022-05-17 22:20:05 -07:00
Madhura Bhave f3cacbe6ec Fix formatting 2022-05-17 14:42:11 -07:00
Madhura Bhave c730ab7d0c Merge branch '2.7.x' into main 2022-05-17 14:29:36 -07:00
Scott Frederick 7d459a13c2 Add properties for SAML relying party single logout
Closes gh-30128

Co-authored-by: Madhura Bhave <bhavem@vmware.com>
2022-05-17 14:07:48 -07:00
Andy Wilkinson 5ffe4598f5 Revert "Upgrade to Solr 9.0.0"
It requires Jetty 9.4.x but we're using Jetty 11.

This reverts commit b2bd3dee5e.

See gh-31054
2022-05-16 13:00:51 +01:00
Andy Wilkinson b2bd3dee5e Upgrade to Solr 9.0.0
Closes gh-31054
2022-05-16 12:20:34 +01:00
Andy Wilkinson 48c948973d Polish 2022-05-12 12:12:22 +01:00
Andy Wilkinson d0e55643b1 Polish
Closes gh-30993
2022-05-12 12:11:51 +01:00
Andy Wilkinson 1fd9c4d82c Polish
Closes gh-30992
2022-05-12 12:10:52 +01:00
izeye 624c41c80e Polish
See gh-30862
2022-05-12 12:07:12 +01:00
Andy Wilkinson 4c17b4c865 Switch BackgroundPreinitializer to implementing Ordered
Closes gh-30905
2022-05-10 15:22:38 +01:00
Andy Wilkinson 770cb840c3 Use more flexible SpringFactoriesLoader
Closes gh-30235

Co-authored-by: Madhura Bhave <bhavem@vmware.com>
Co-authored-by: Stephane Nicoll <snicoll@vmware.com>
2022-05-09 14:13:04 +01:00
Andy Wilkinson 0fbfb8ef09 Remove remnants of support for Embedded Mongo
See gh-30863 and 7e089a6b
2022-05-09 09:55:42 +01:00
Scott Frederick 7e089a6b81 Remove support for embedded MongoDB
This commit removes auto-configuration and dependency management
for Flapdoodle embedded MongoDB in favor of the Spring Boot support
provided by Flapdoodle.

Closes gh-30863
2022-05-06 17:05:36 -05:00
Scott Frederick 88250f92bd Adapt to changes in Spring Kafka snapshots
See gh-30645
2022-05-05 17:17:23 -05:00
Andy Wilkinson 573fc34e29 Merge branch '2.7.x' 2022-05-05 10:19:32 +01:00
Andy Wilkinson 2b4f042325 Merge branch '2.6.x' into 2.7.x
Closes gh-30874
2022-05-05 10:19:19 +01:00
Andy Wilkinson c9571a04ab Merge branch '2.5.x' into 2.6.x
Closes gh-30873
2022-05-05 10:19:01 +01:00
Andy Wilkinson 6d4f0232ca Polish "Fix ConditionalOnProperty when used in an aliased composed annotation"
See gh-30505
2022-05-05 10:02:27 +01:00
Guirong Hu dc57ad54d5 Fix ConditionalOnProperty when used in an aliased composed annotation
See gh-30505
2022-05-05 10:02:15 +01:00
Andy Wilkinson 1ee079c265 Reinstate support for pooled-jms as it is now JMS 3.0 compatible
Closes gh-30865
2022-05-04 18:04:02 +01:00
Brian Clozel 5352c441e1 Do not use application/graphql as default MIME type
As seen in spring-projects/spring-graphql#375, Spring Boot should also
use "application/json" as the default MIME type but remain compatible
with "application/graphql+json" still if clients POST content with this
type or explicitly accept it.

Closes gh-30860
2022-05-04 13:05:45 +02:00
Andy Wilkinson 0e00fafe38 Polish "Provide callback mechanism for customizing validation configuration"
See gh-29429
2022-05-04 11:45:39 +01:00
当智才让 76a1c6bcaa Provide callback mechanism for customizing validation configuration
See gh-29429
2022-05-04 11:36:59 +01:00
Andy Wilkinson d36b63dae6 Polish "Add a configuration property for Kafka's async acks"
See gh-30776
2022-05-04 10:44:38 +01:00
TheCK 52c3f1c7ef Add a configuration property for Kafka's async acks
See gh-30776
2022-05-04 10:37:22 +01:00
Andy Wilkinson 541ab69aff Merge branch '2.7.x' 2022-05-03 15:18:20 +01:00
Andy Wilkinson 4cd850cfc0 Merge branch '2.6.x' into 2.7.x
Closes gh-30851
2022-05-03 15:17:13 +01:00
Andy Wilkinson fa327a783d Merge branch '2.5.x' into 2.6.x
Closes gh-30850
2022-05-03 15:14:00 +01:00
Andy Wilkinson 4fd2e0c916 Polish "Fix typos"
See gh-30773
2022-05-03 14:09:53 +01:00
Andy Wilkinson f6d24dc1a8 Fix typos
See gh-30773
2022-05-03 14:09:37 +01:00
Andy Wilkinson 138e165d5f Merge branch '2.7.x' 2022-05-03 13:52:01 +01:00
Andy Wilkinson 8044df277b Merge branch '2.6.x' into 2.7.x
Closes gh-30846
2022-05-03 13:51:49 +01:00
Andy Wilkinson a8b5a1c688 Merge branch '2.5.x' into 2.6.x
Closes gh-30845
2022-05-03 13:51:38 +01:00
Andy Wilkinson 026b9e2efe Polish "Make event handling in JobExecutionExitCodeGenerator thread-safe"
See gh-30705
2022-05-03 13:49:12 +01:00
dugenkui03 c8d1dfebab Make event handling in JobExecutionExitCodeGenerator thread-safe
See gh-30705
2022-05-03 13:48:15 +01:00
Andy Wilkinson 7a98627127 Polish "Fix property in defaultDatabaseIsSet test"
See gh-30778
2022-05-03 11:36:12 +01:00
izeye d50b0e4602 Fix property in defaultDatabaseIsSet test
See gh-30778
2022-05-03 11:35:44 +01:00
Andy Wilkinson fb16907c0e Fix resolution Batch's Oracle schema location
Closes gh-30564
2022-04-25 19:38:37 +01:00
Andy Wilkinson 60e389ea38 Merge branch '2.7.x' 2022-04-25 19:37:48 +01:00
Andy Wilkinson facbc7b47b Merge branch '2.6.x' into 2.7.x
Closes gh-30795
2022-04-25 19:31:47 +01:00
Andy Wilkinson bf94ea24d3 Improve testing of Batch schema resolution
Closes gh-30794
2022-04-25 19:30:59 +01:00
Moritz Halbritter 85a4c94dea Merge branch '2.7.x' 2022-04-25 15:32:08 +02:00
Moritz Halbritter b406971094 Remove hyphen from asserting-party
spring.security.saml2.relyingparty.registration.*.asserting-party.* is
now named spring.security.saml2.relyingparty.registration.*.assertingparty.*

Closes gh-30785
2022-04-25 15:26:38 +02:00
Stephane Nicoll f76371be76 Merge branch '2.7.x' 2022-04-21 09:29:02 +02:00
Stephane Nicoll b3e3581271 Polish "Add auto-configuration to Kafka Retry Topics"
See gh-29812
2022-04-21 09:26:42 +02:00
tomazfernandes bf46d7244a Add auto-configuration to Kafka Retry Topics
See gh-29812
2022-04-21 08:32:04 +02:00
Stephane Nicoll 020e3617af Merge branch '2.7.x' 2022-04-21 08:30:13 +02:00
Madhura Bhave 7a659e4e12 Polish "Add support for aud claim in resource server"
See gh-29084
2022-04-21 08:09:08 +02:00
Mushtaq Ahmed ee65627f4c Add support for aud claim in resource server
See gh-29084
2022-04-21 08:09:08 +02:00
Stephane Nicoll 58b069a994 Merge branch '2.7.x' 2022-04-21 08:08:34 +02:00
Stephane Nicoll 9025d1d250 Fix deprecation warning
See gh-28851
2022-04-21 08:08:20 +02:00
Phillip Webb c7374fd415 Update copyright year of changed files 2022-04-20 15:30:20 -07:00
Phillip Webb 7a6ca8ce25 Merge branch '2.7.x' 2022-04-20 15:30:01 -07:00
Phillip Webb dd5696b59b Update copyright year of changed files 2022-04-20 15:26:30 -07:00
Phillip Webb 36f1249fc6 Polish 2022-04-20 15:26:15 -07:00
Madhura Bhave dfd0e7b948 Merge branch '2.7.x' into main 2022-04-20 12:57:21 -07:00
Madhura Bhave 71acc90da8 Simplify SecurityAutoConfiguration
Closes gh-28851
2022-04-20 12:50:10 -07:00
Moritz Halbritter bb4bccde6c Remove deprecated 'identityprovider' property
Closes gh-30751
2022-04-20 09:11:56 +02:00
Moritz Halbritter 1950d06585 Merge branch '2.7.x' 2022-04-20 08:26:35 +02:00
Moritz Halbritter 6c400daa48 Rename 'identityprovider' property to 'asserting-party'
Rename spring.security.saml2.relyingparty.registration.*.identity-provider.*
to spring.security.saml2.relyingparty.registration.*.asserting-party.*

The old property names are still supported, but will lead to a warning
in the logs.

Closes gh-30642
2022-04-20 08:25:58 +02:00
Stephane Nicoll 2d663f2e94 Upgrade to Spring Data 2021.2.0-RC1
Closes gh-30610
2022-04-20 08:05:15 +02:00
Brian Clozel 6bf6bde6bb Add new auto-configurations to imports
See gh-30453
2022-04-19 20:52:35 +02:00
Brian Clozel d137f92f66 Adapt to latest Spring for GraphQL changes
This commit adapts to changes done in spring-projects/spring-graphql#312
2022-04-19 16:58:06 +02:00
Brian Clozel 2dc2e5ab11 Auto-configure RSocketGraphQlClient
This commit contributes a `RSocketGraphQlClient.Builder` component to
the context, pre-configured with the `RSocketStrategies`, a customized
`RSocketConnector` and the expected data MIME type.

See gh-30453
2022-04-19 10:53:15 +02:00
Stephane Nicoll a4cccc98c6 Merge branch '2.7.x' 2022-04-19 09:37:08 +02:00
Stephane Nicoll 61915aa4d5 Update copyright year of changed files
See gh-30695
2022-04-19 09:36:38 +02:00
izeye ed412af138 Polish
See gh-30695
2022-04-19 09:34:28 +02:00
Stephane Nicoll 3175fb8302 Merge branch '2.7.x' 2022-04-19 08:44:43 +02:00
Stephane Nicoll a0707124f2 Remove unused method
See gh-30655
2022-04-19 08:42:00 +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
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
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 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
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 77b7f2f1ce Switch to Spring Framework SNAPSHOTs
See gh-30624
2022-04-12 17:02:03 +02: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
Stephane Nicoll 2ded2bf71a Adapt to latest change in Spring Framework snapshots 2022-04-09 17:10:48 +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
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
Scott Frederick 0dd9493dc1 Merge branch '2.7.x' 2022-04-07 17:12:14 -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
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
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
Stephane Nicoll ac93dc3252 Remove reference to spring.datasource.initialization-mode in tests
Closes gh-30511
2022-04-03 10:17:28 +02:00
Stephane Nicoll 535a9b7be0 Remove outdated reference to spring.datasource.initialization-mode
Closes gh-30435
2022-04-03 10:10:21 +02:00
Stephane Nicoll 6d7b14a5a2 Revert test assertion until we switch to framework snapshots 2022-04-01 12:14:17 +02:00
Stephane Nicoll 25d8888aff Merge branch '2.7.x' 2022-03-31 12:45:13 +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
Andy Wilkinson ad95aded7e Merge branch '2.7.x' 2022-03-30 10:57:28 +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
Andy Wilkinson eabf6cd1d8 Merge branch '2.7.x' 2022-03-25 15:15:26 +00: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 e431842668 Merge branch '2.7.x' 2022-03-25 14:56:49 +01: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 5702f9ebc3 Merge branch '2.7.x' 2022-03-23 20:16:51 +00: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 77e6279d03 Merge branch '2.7.x' 2022-03-23 12:11:24 +00: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 3410dd67d0 Merge branch '2.7.x' 2022-03-23 09:58:56 +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 c4425598cf Merge branch '2.7.x' 2022-03-22 20:13:16 +00: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
Brian Clozel bae62c39a9 Adapt to latest Spring GraphQL changes
This commit adapts to the latest Spring GraphQL changes, renaming
`GraphQlService` to `ExecutionGraphQlService` as well as the
`WebInterceptor` contract to `WebGraphQlHandlerInterceptor`.

See spring-projects/spring-graphql#332
2022-03-21 11:12:59 +01:00
Stephane Nicoll 2088381d4b Merge branch '2.7.x' 2022-03-21 10:06:56 +01:00
Stephane Nicoll a2959bbcf2 Polish "Add support for cache2k in memory caching"
See gh-28498
2022-03-21 09:59:24 +01:00
Jens Wilke 774f61fcb5 Add support for cache2k in memory caching
See gh-28498
2022-03-21 08:22:19 +01:00
Chris Dennis 3ed3d3eb36 Restore Ehcache 3 Support
See gh-30002
2022-03-19 09:33:47 +01:00
Scott Frederick cabfb98a89 Merge branch '2.7.x' 2022-03-18 16:52:47 -05:00
Scott Frederick a14f3ed200 Use a ConfigurationProperties class for JMX properties
Closes gh-30327
2022-03-18 16:32:13 -05:00
Scott Frederick e5a09b3b31 Apply unique-names consistently in JmxAutoConfiguration
Ensure that the `spring.jmx.unique-names` property is applied to the
auto-configured `MBeanExporter` as well as the `ObjectNamingStrategy`.

Fixes gh-29968
2022-03-18 16:32:13 -05:00
Stephane Nicoll 1169c6df16 Upgrade to Neo4j Java Driver 4.4.5
Closes gh-30326
2022-03-18 18:34:09 +01:00
Andy Wilkinson 12d9127d3b Merge branch '2.7.x' 2022-03-18 15:56:29 +00:00
Andy Wilkinson c2d7e21312 Merge branch '2.6.x' into 2.7.x
Closes gh-30322
2022-03-18 15:56:13 +00:00
Andy Wilkinson 26719a211b Merge branch '2.5.x' into 2.6.x
Closes gh-30321
2022-03-18 15:55:39 +00:00
Andy Wilkinson 1669062231 Apply server.tomcat.keep-alive-timeout to HTTP/2
Closes gh-30267
2022-03-18 15:38:27 +00:00
Stephane Nicoll 39b6f2bd7d Merge branch '2.7.x' 2022-03-18 15:08:28 +01:00
Stephane Nicoll 2ab0ce3ea7 Upgrade to Neo4j Java Driver 4.4.5
Closes gh-30303
2022-03-18 14:52:46 +01:00
Andy Wilkinson dd812a3f76 Upgrade to Groovy 4.0.1
Closes gh-30279
2022-03-18 12:38:41 +00:00
Andy Wilkinson e60001fb16 Adapt to deprecations in Spring Data Redis
See gh-30200
2022-03-18 11:16:55 +00:00
Stephane Nicoll 2fbb36bd04 fixup! Upgrade to Flyway 8.5.4 2022-03-18 10:57:07 +01:00
Andy Wilkinson f693d7dfad Merge branch '2.7.x' 2022-03-17 20:12:12 +00:00
Andy Wilkinson b787ea4802 Add property for media types of reactive Mustache views
Closes gh-28858
2022-03-17 20:10:37 +00:00
Andy Wilkinson 36f24cf6bb Merge branch '2.7.x' 2022-03-17 19:31:59 +00:00
Andy Wilkinson 3a5a748ec0 Rework Mustache properties to show which are Servlet-specific
Closes gh-30273
2022-03-17 19:25:07 +00:00
Andy Wilkinson 6625a77f64 Merge branch '2.7.x' 2022-03-17 17:51:43 +00:00
Andy Wilkinson 2ba064c855 Merge branch '2.6.x' into 2.7.x
Closes gh-30277
2022-03-17 17:51:28 +00:00
Andy Wilkinson 3c117ca2d4 Merge branch '2.5.x' into 2.6.x
Closes gh-30276
2022-03-17 17:50:58 +00:00
Andy Wilkinson 2b75ea5fb8 Improve testing of spring.mustache.* properties
Closes gh-30274
2022-03-17 17:40:22 +00:00
Stephane Nicoll 1784fc19bb Adapt mock to API change 2022-03-17 10:34:22 +01:00
Andy Wilkinson f3f5a87af4 Merge branch '2.7.x' 2022-03-16 19:42:36 +00:00
Andy Wilkinson fee3b89b1b Merge branch '2.6.x' into 2.7.x
Closes gh-30257
2022-03-16 19:42:14 +00:00
Andy Wilkinson cdaafce614 Merge branch '2.5.x' into 2.6.x
Closes gh-30256
2022-03-16 19:41:14 +00:00
Andy Wilkinson 7f036e35fd Make MustacheViewResolvers conditional onspring.mustache.enabled
Closes gh-30250
2022-03-16 19:09:13 +00:00
Andy Wilkinson 09510db630 Merge branch '2.7.x' 2022-03-16 17:07:29 +00:00
Andy Wilkinson 81383e552a Merge branch '2.6.x' into 2.7.x
Closes gh-30254
2022-03-16 17:06:43 +00:00
Andy Wilkinson 6bc000565d Merge branch '2.5.x' into 2.6.x
Closes gh-30253
2022-03-16 17:06:17 +00:00
Andy Wilkinson 0accc3d67d Convert MustacheAutoConfigurationTests to application context runner
Closes gh-30252
2022-03-16 15:28:48 +00:00
Andy Wilkinson 23b5a3f70e Merge branch '2.7.x' 2022-03-16 14:14:35 +00:00
Andy Wilkinson 2282f9cc88 Upgrade to Embedded Mongo 3.4.2
As part of the upgrade, the property for configuring features has
been removed as support for feature-aware versions has been removed
from Embedded Mongo. For advanced configuration where features were
specified, users should provide a MongodConfig bean instead.

Closes gh-29985
Closes gh-30219
2022-03-16 14:13:10 +00:00
Stephane Nicoll 0e07eb2393 Remove deprecated Spring Kafka's only-log-record-metadata property
See gh-30089
2022-03-15 17:57:45 +01:00
Stephane Nicoll 7c8b4b6914 Restore Kafka tests 2022-03-13 18:53:05 +01:00
Stephane Nicoll 695685996a Start building against Spring Kafka 2.8.4 snapshots
See gh-30190
2022-03-12 18:26:03 +01:00
Stephane Nicoll 3717c4c883 Start building against Spring Kafka 2.8.4 snapshots
See gh-30181
2022-03-12 12:50:26 +01:00
Andy Wilkinson a2ecd600f8 Merge branch '2.7.x' 2022-03-11 11:03:46 +00:00
Andy Wilkinson 1c19995db7 Merge branch '2.6.x' into 2.7.x
Closes gh-30165
2022-03-11 11:03:20 +00:00
Andy Wilkinson 6bbf3aff0e Merge branch '2.5.x' into 2.6.x
Closes gh-30164
2022-03-11 11:03:01 +00:00
Andy Wilkinson eef89c6c35 Increase tests' Cassandra timeouts to 60s
Closes gh-30163
2022-03-11 11:02:18 +00:00
Andy Wilkinson faf7a35425 Merge branch '2.7.x' 2022-03-10 16:51:56 +00:00
Andy Wilkinson 6494a9f08a Merge branch '2.6.x' into 2.7.x
Closes gh-30165
2022-03-10 16:51:43 +00:00
Andy Wilkinson 7c3c5d3d3e Merge branch '2.5.x' into 2.6.x
Closes gh-30164
2022-03-10 16:51:33 +00:00
Andy Wilkinson bbdef2b026 Increase timeouts in tests that use Cassandra
Closes gh-30163
2022-03-10 16:50:39 +00:00
Andy Wilkinson e9d2ec507e Merge branch '2.7.x' 2022-03-09 15:17:25 +00:00
Andy Wilkinson f5ca568014 Remove versions less than 17 from JavaVersion enum
Closes gh-29503
2022-03-09 15:16:59 +00:00
Andy Wilkinson 813c2a5b1e Merge branch '2.6.x' into 2.7.x
Closes gh-30135
2022-03-09 14:45:55 +00:00
Andy Wilkinson 3cb1629f45 Merge branch '2.5.x' into 2.6.x
Closes gh-30134
2022-03-09 14:44:51 +00:00
Andy Wilkinson da1eb25e4b Remove redundant JRE-based enabled and disabled annotations from tests
Closes gh-29693
2022-03-09 14:41:13 +00:00
Brian Clozel 087e853c5d Refine GraphQL server auto-configuration
Prior to this commit, launching a GraphQL application without any schema
file or customizer bean would result in an exception caught by a
FailureAnalyzer telling the developer about configured locations.

Since then, a new client has been introduced in Spring GraphQL and the
mere presence of the GraphQL starter does not mean anymore that the
intent is to create a GraphQL API in the app: we could instead just
consume an existing, remote API.

This commit refines the GraphQL server auto-configuration so that it is
enabled only if:

* there is at least one schema file in the configured locations
* or a `GraphQlSourceCustomizer` bean has been defined in the app

These changes make the custom FailureAnalyzer useless and is also
removed as part of this commit.

Closes gh-30035
2022-03-08 17:54:55 +01:00
Brian Clozel bf79d6baef Auto-configure ConversionService for GraphQL
Prior to this commit, we would configure a default conversion service
for GraphQL annotated controllers, without registering any additional
formatters.

This commit aligns the GraphQL auto-configuration with MVC and WebFlux,
since we now use the `ApplicationConversionService` to register all
application formatters for the GraphQL infrastructure.

Closes gh-29638
2022-03-08 17:54:55 +01:00
rstoyanchev ef4add27f0 Do not set ConversionService on AnnotatedControllerConfigurer
After 0b449d89e1,
the ConversionService on AnnotatedControllerConfigurer is an internally
managed instance that is customized with FormatterRegistrar rather than
set.

Closes gh-29636
2022-03-08 17:54:54 +01:00
Brian Clozel 81754c8bc4 Upgrade to Spring GraphQL 1.0.0-SNAPSHOT
This commit switches to 1.0.0-SNAPSHOT for Spring GraphQL, before its
upcoming 1.0.0-M6 version.

This commit adapts to the changes introduced in
spring-projects/spring-graphql#317 : now that `GraphQlClient` has been
introduced, `GraphQlTester` has been aligned with the new
infrastructure. The `@GraphQlTest` and `@SpringBootTest` testing support
is now using different variants for each.

All samples have been updated to use the proper GraphQL terminology, see
and spring-projects/spring-graphql#310 .

See gh-29637
2022-03-08 17:54:54 +01:00
Andy Wilkinson d92dcf9452 Merge branch '2.7.x' 2022-03-08 13:53:11 +00:00
Andy Wilkinson dcaca38154 Merge branch '2.6.x' into 2.7.x
Closes gh-30099
2022-03-08 13:52:46 +00:00
Andy Wilkinson 119a713f09 Merge branch '2.5.x' into 2.6.x
Closes gh-30098
2022-03-08 13:52:25 +00:00
Andy Wilkinson e7705f4f71 Improve condition message produced by @ConditionalOnSingleCandidate
Closes gh-30073
2022-03-08 13:51:38 +00:00
Stephane Nicoll e6f6b2068b Start building against Spring Kafka 3.0.0-M3 snapshots
See gh-30089
2022-03-07 21:09:41 +01:00
Moritz Halbritter a1b1377733 Merge branch '2.7.x' 2022-03-07 13:23:06 +01:00
Moritz Halbritter 50d766020c Merge branch '2.6.x' into 2.7.x
Closes gh-30084
2022-03-07 13:22:53 +01:00
Moritz Halbritter 564555347f Merge branch '2.5.x' into 2.6.x
Closes gh-30083
2022-03-07 13:22:34 +01:00
Moritz Halbritter be38311c5d Disable incompatible tests on Linux AArch64
- Adds a new @DisableOnOs annotation, which is inspired from JUnit5s
  @DisableOnOs annotation. This new annotation supports the architecture
  and is repeatable

Closes gh-30082
2022-03-07 13:22:17 +01:00
Stephane Nicoll f869c490f4 Merge branch '2.7.x' 2022-03-07 09:49:21 +01:00
Stephane Nicoll ce4f7ded8a Merge branch '2.6.x' into 2.7.x
Closes gh-30081
2022-03-07 09:49:10 +01:00
Stephane Nicoll c6a9e138e5 Merge branch '2.5.x' into 2.6.x
Closes gh-30080
2022-03-07 09:49:00 +01:00
Stephane Nicoll cf9cc82025 Update copyright year of change file
See gh-30074
2022-03-07 09:47:12 +01:00
hak7a3 0a035c7fa6 Fix references to spring.data.cassandra.connection.connect-timeout
See gh-30074
2022-03-07 09:42:43 +01:00
Andy Wilkinson c755e0d1f8 Merge branch '2.7.x' 2022-03-04 17:56:40 +00:00
Andy Wilkinson f44e7d9391 Merge branch '2.6.x' into 2.7.x
Closes gh-30071
2022-03-04 17:56:29 +00:00
Andy Wilkinson 2ef055a823 Merge branch '2.5.x' into 2.6.x
Closes gh-30070
2022-03-04 17:56:14 +00:00
Andy Wilkinson 1872af056e Make it clearer that the generated password is not for production use
Closes gh-30061
2022-03-04 17:55:54 +00:00
Andy Wilkinson f95e5b9b8a Merge branch '2.7.x' 2022-03-02 12:21:39 +00:00
Andy Wilkinson 324c4310a4 Merge branch '2.6.x' into 2.7.x
Closes gh-30034
2022-03-02 12:21:29 +00:00
Andy Wilkinson 8a4a639734 Merge branch '2.5.x' into 2.6.x
Closes gh-30033
2022-03-02 12:21:20 +00:00
izeye 140d24d567 Remove redundant ConditionalOnMissingFilterBean
See gh-29983
2022-03-02 11:40:44 +00:00
Andy Wilkinson 19b5431ba4 Polish "Remove redundant ResourceLoaders from GraphQL auto-configuration"
See gh-29976
2022-02-28 11:16:04 +00:00
dugenkui03 5a52b36ec7 Remove redundant ResourceLoaders from GraphQL auto-configuration
See gh-29976
2022-02-28 11:16:04 +00:00
Andy Wilkinson cce48a75fc Merge branch '2.7.x' 2022-02-28 11:15:38 +00:00
Andy Wilkinson 73d0d5bccf Merge branch '2.6.x' into 2.7.x
Closes gh-30009
2022-02-28 11:15:24 +00:00
Andy Wilkinson b379eea885 Merge branch '2.5.x' into 2.6.x
Closes gh-30008
2022-02-28 11:15:02 +00:00
Andy Wilkinson 7bc336cdc6 Use an ephemeral port to avoid potential port clash
Closes gh-30007
2022-02-28 10:54:31 +00:00
Madhura Bhave 7a4960d4ca Merge branch '2.7.x' into main 2022-02-24 11:01:23 -08:00
Madhura Bhave e24f5b7efd Revert "Upgrade to Embedded Mongo 3.4.1"
This reverts to Embedded Mongo 3.3.1 due to some breaking
changes in 3.4.1 and 3.4.2
2022-02-24 11:00:00 -08:00
Phillip Webb 5454e2e26a Merge branch '2.7.x' 2022-02-23 23:02:59 -08:00
Phillip Webb 9f00c3acf5 Polish 2022-02-23 21:44:43 -08:00
Phillip Webb adfaa8f778 Merge branch '2.6.x' into 2.7.x 2022-02-23 21:44:37 -08:00
Phillip Webb 9411fc264d Merge branch '2.5.x' into 2.6.x 2022-02-23 21:44:08 -08:00
Phillip Webb 57009d5623 Polish 2022-02-23 21:43:42 -08:00
Moritz Halbritter 54f1058d63 Merge branch '2.7.x' 2022-02-23 16:10:49 +01:00
Moritz Halbritter fd36215d72 Omit empty values for AutoConfigureAfter and AutoConfigureBefore
As @AutoConfiguration is now meta-annotated with @AutoConfigureAfter
and @AutoConfigureBefore, the generated property files have a lot of
superfluous lines in the format <class>.AutoConfigureAfter= and
<class>.AutoConfigureBefore=.

One can now configure in the annotation processor for each property key
if empty values should be omitted. This is currently only activated for
AutoConfigureAfter and AutoConfigureBefore

See gh-29907
2022-02-23 15:39:46 +01:00
Moritz Halbritter 7872f61bfc Add @AutoConfiguration annotation support to the autoconfigure-processor
See gh-29907
2022-02-23 15:39:46 +01:00
Moritz Halbritter 9149ae50da Use @AutoConfiguration for relative ordering on auto-configurations 2022-02-23 15:39:46 +01:00
Moritz Halbritter 9e9049ca7f Add relative ordering to @AutoConfiguration
The relative ordering is implemented with @AliasFor annotations on the
@AutoConfiguration annotation. The production code already works without
changes, only the test code had to be modified. It now uses
AnnotationMetadata which already knows how to deal with @AliasFor
instead of using the reflection API directly.

See gh-29907
2022-02-23 15:39:41 +01:00
Andy Wilkinson d427fa4b5d Merge branch '2.7.x' 2022-02-23 11:53:31 +00:00
Andy Wilkinson 57cd34be88 Merge branch '2.6.x' into 2.7.x
Closes gh-29971
2022-02-23 11:53:09 +00:00
Andy Wilkinson a979925e63 Merge branch '2.5.x' into 2.6.x
Closes gh-29970
2022-02-23 11:52:57 +00:00
Andy Wilkinson 7aca75c58c Preserve ObjectName property order when name is unchanged
Closes gh-29953
2022-02-23 11:30:21 +00:00
Stephane Nicoll c8b7a17545 Upgrade to Spring Kafka 2.8.3
Closes gh-29722
2022-02-23 08:27:24 +01:00
Scott Frederick b64a6e6229 Merge branch '2.7.x' into main 2022-02-22 14:42:52 -06:00
Scott Frederick c1fec6967e Support constructor injection for FailureAnalyzers
This commit adds support for instantiating FailureAnalyzer
implementations with BeanFactory and/or an Environment constructor
arguments and deprecates support for setter injection of these values
using BeanFactoryAware and EnvironmentAware.

Closes gh-29811
2022-02-22 14:24:59 -06:00
Stephane Nicoll fcca4920d3 Merge branch '2.7.x' 2022-02-22 14:57:04 +01:00
Stephane Nicoll dda3bae02a Upgrade to Embedded Mongo 3.4.1
Closes gh-29944
2022-02-22 14:56:50 +01:00
Andy Wilkinson 5e56757d4c Merge branch '2.7.x' 2022-02-21 19:00:20 +00:00
Andy Wilkinson da96eeab21 Remove redundant requestMappingHandlerMapping override
The bean no longer needs to be primary so the override is not needed
any more.

Closes gh-29682
2022-02-21 18:59:29 +00:00
Stephane Nicoll 935d37b2ca Polish "Reuse BatchLoaderRegistry in GraphQlService"
See gh-29929
2022-02-21 18:16:07 +01:00
dugenkui03 043e5ff0f5 Reuse BatchLoaderRegistry in GraphQlService
See gh-29929
2022-02-21 18:00:52 +01:00
Moritz Halbritter 03e5dcdb3a Merge branch '2.7.x' 2022-02-21 13:34:11 +01:00
Moritz Halbritter 1325153ee9 Move ManagementContextConfiguration from spring.factories
The import selector will now, in addition to spring.factories, look for
ManagementContextConfiguration classes in a file called
META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports

The existing ManagementContextConfigurations have been moved from
spring.factories to the new file.

Closes gh-29730
2022-02-21 13:16:12 +01:00
Moritz Halbritter d42f675959 Merge branch '2.7.x' 2022-02-21 10:36:05 +01:00
Moritz Halbritter d7b229d3c7 Rename AutoConfigurationLoader to ImportCandidates
Move the class to a more suitable package, and load the files from
META-INF/spring/<fqn>.imports

See gh-29872
2022-02-21 10:34:38 +01:00
Stephane Nicoll 3b2288899b Merge branch '2.7.x' 2022-02-21 09:55:21 +01:00
Stephane Nicoll 3ffd88158e Polish "Add support for Redis sentinel username"
See gh-29661
2022-02-21 09:52:29 +01:00
mourezwell 202a426bd6 Add support for Redis sentinel username
See gh-29661
2022-02-21 09:52:15 +01:00
Stephane Nicoll 414b7539de Merge branch '2.7.x' 2022-02-21 09:34:05 +01:00
Gary Russell d56403b64f Add support for Kafka immediateStop property
See gh-29884
2022-02-21 09:29:41 +01:00
Moritz Halbritter f5f6a1fe83 Merge branch '2.7.x' 2022-02-18 13:15:11 +01:00
Moritz Halbritter 4f49e8c990 Polish JavaDoc 2022-02-18 13:14:42 +01:00
Andy Wilkinson 1e1b2a062e Merge branch '2.7.x' 2022-02-18 11:42:32 +00:00
Andy Wilkinson 0e5a82522c Merge branch '2.6.x' into 2.7.x
Closes gh-29904
2022-02-18 11:42:21 +00:00
Andy Wilkinson 9da6fb4a5a Merge branch '2.5.x' into 2.6.x
Closes gh-29903
2022-02-18 11:42:10 +00:00
Andy Wilkinson c676b8b84d Remove KafkaPropertiesKafka24Tests
We now use Kafka 2.7 by default so tests against 2.4 are no longer
required.

Closes gh-29882
2022-02-18 11:41:24 +00:00
Andy Wilkinson 41d516cb4f Merge branch '2.7.x' 2022-02-18 11:23:54 +00:00
Andy Wilkinson b6fea07001 Merge branch '2.6.x' into 2.7.x
Closes gh-29902
2022-02-18 11:23:28 +00:00
Andy Wilkinson 0cebb332d1 Merge branch '2.5.x' into 2.6.x
Closes gh-29901
2022-02-18 11:08:21 +00:00
Andy Wilkinson ac38a5a3e9 Update javadoc to reflect move to SecurityFilterChain
Closes gh-29900
2022-02-18 11:05:48 +00:00
Scott Frederick cb69d01e04 Merge branch '2.7.x' into main 2022-02-17 19:07:24 -06:00
Scott Frederick 42328771ad Suppress deprecation warnings for WebSecurityConfigurerAdapter
Fixes gh-29897
2022-02-17 19:06:13 -06:00
Moritz Halbritter 896345df23 Fix test 2022-02-17 11:56:38 +01:00
Moritz Halbritter 42808ff13c Merge branch '2.7.x'
# Conflicts:
#	spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories
#	spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
#	spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories
2022-02-17 10:56:23 +01:00
Moritz Halbritter 7c96294641 Move our auto-configurations from spring.factories to new file
Closes gh-29873
2022-02-17 10:18:46 +01:00
Moritz Halbritter 303979fb65 Merge branch '2.7.x' 2022-02-17 09:17:35 +01:00
Moritz Halbritter 7d68b58c8f Load auto-configurations from META-INF/spring-boot
Implements a new AutoConfigurationLoader, which loads
auto-configurations from a file in META-INF/spring-boot.

Adapts the AutoConfigurationImportSelector to use the new loader.

Adapts the ImportAutoConfigurationImportSelector to use the new loader.

Adapts the metadata plugin in the build to additionally load the
auto-configurations from the new file.

Updates the documentation for auto-configurations and test slices.

Closes gh-29872
2022-02-17 09:17:23 +01:00
Phillip Webb ff4b92a3ba Update copyright year of changed files 2022-02-16 20:44:54 -08:00
Phillip Webb 37263ea7dd Merge branch '2.7.x' 2022-02-16 20:43:21 -08:00
Phillip Webb c0ffb35668 Update copyright year of changed files 2022-02-16 20:43:10 -08:00
Phillip Webb 4092afc98f Polish 2022-02-16 20:42:58 -08:00
Madhura Bhave bf1ed5f2f8 Update copyright header on changed files 2022-02-16 14:24:22 -08:00
Madhura Bhave 44b88cc88c Allow @ConstructorBinding to be optional
This commit makes @ConstructorBinding optional for a type
that has a single parameterized constructor. An @Autowired annotation
on any of the constructors indicates that the type should not be constructor
bound.

Since @ConstructorBinding is now deduced for a single parameterized constructor,
the annotation is no longer needed at the type level.

Closes gh-23216
2022-02-16 13:47:26 -08:00
Moritz Halbritter fdb1010cbc Migrate auto-configurations to @AutoConfiguration
Closes gh-29871
2022-02-16 15:48:27 +01:00
Moritz Halbritter 8e99788fc8 Migrate auto-configurations to @AutoConfiguration
Closes gh-29871
2022-02-16 13:55:16 +01:00
Moritz Halbritter cb08065ece Merge branch '2.7.x' 2022-02-16 11:55:46 +01:00
Moritz Halbritter 100f80d073 Add @AutoConfiguration annotation
This annotation can be used to mark auto-configurations with a dedicated
annotation. Under the hood, it's a standard @Configuration with
proxyBeanMethods set to false.

Closes gh-29870
2022-02-16 11:53:46 +01:00
Henning Poettker 7d83dfc0c7 Reinstate support for H2 Console
See gh-29755

Closes gh-29755
2022-02-14 13:24:57 +00:00
Stephane Nicoll 15e14e23c9 Start building against Spring Kafka 2.8.3 snapshots
See gh-29759
2022-02-14 08:22:13 +01:00
Andy Wilkinson d9acde2961 Merge branch '2.7.x' 2022-02-11 12:28:22 +00:00
Andy Wilkinson 0c15fab881 Merge branch '2.6.x' into 2.7.x
Closes gh-29744
2022-02-11 12:26:15 +00:00
Andy Wilkinson b74f668254 Only auto-configure WebSessionIdResolver in reactive web app
Closes gh-29669
2022-02-11 12:09:45 +00:00
Andy Wilkinson d14450dc88 Merge branch '2.7.x' 2022-02-10 17:13:39 +00:00
Andy Wilkinson fc5ede7b94 Polish "Auto-configure Spring rather than Nimbus opaque token introspectors"
See gh-29572
2022-02-10 17:11:04 +00:00
Lukas Kuster 131ea706c7 Auto-configure Spring rather than Nimbus opaque token introspectors
See gh-29572
2022-02-10 16:50:06 +00:00
Andy Wilkinson 4c3289395a Merge branch '2.7.x' 2022-02-10 15:05:51 +00:00
Andy Wilkinson c761dc517b Merge branch '2.6.x' into 2.7.x
Closes gh-29732
2022-02-10 15:05:15 +00:00
Andy Wilkinson 197ba9ebc9 Merge branch '2.5.x' into 2.6.x
Closes gh-29731
2022-02-10 15:04:58 +00:00
Andy Wilkinson 64ee54423a Polish "Configure ForwardedHeaderFilter with Tomcat's use relative redirects"
See gh-29333
2022-02-10 15:01:57 +00:00
Guirong Hu cec69feb95 Configure ForwardedHeaderFilter with Tomcat's use relative redirects
Previously, when Tomcat was configured to use relative redirects
and the ForwardedHeaderFilter is in use, the filter would ignore
the use of the relative redirects.

This commit corrects this misalignment by applying Tomcat's use
relative redirects setting to the filter, but only when Tomcat is
being used as the servlet container.

See gh-29333
2022-02-10 15:01:56 +00:00
Stephane Nicoll 3b4832445b Merge branch '2.7.x' 2022-02-05 14:02:00 +01:00
Stephane Nicoll 098a57affb Upgrade to R2DBC Borca-RELEASE
See gh-28524
2022-02-05 13:37:20 +01:00
Stephane Nicoll 8c8c9c5f28 Upgrade to H2 2.1.210
H2 2.x contains several important changes such as moving the primary key
generation mechanism to a sequence-based identifier. This commit fixes
a number of tests that were failing.

Closes gh-29651

Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>
2022-02-05 13:36:53 +01:00
Phillip Webb 6c74e24147 Update copyright year of changed files 2022-02-04 16:09:35 -08:00
Stephane Nicoll b22e3d51dc Merge branch '2.7.x' 2022-02-04 10:10:29 +01:00
Henning Poettker e3d0f1feee Adjust IDENTITY in DDLs for H2 2.x compatibility
See gh-29200
2022-02-04 09:57:59 +01:00
Stephane Nicoll 8885964a56 Merge branch '2.7.x' 2022-02-04 09:54:11 +01:00
Stephane Nicoll 37c1f47902 Merge branch '2.6.x' into 2.7.x
Closes gh-29650
2022-02-04 09:53:42 +01:00
Stephane Nicoll 03d393bc4c Merge branch '2.5.x' into 2.6.x
Closes gh-29649
2022-02-04 09:50:47 +01:00
Stephane Nicoll 48649192cb Fix schema file name for Batch auto-configuration tests
Closes gh-29648
2022-02-04 09:49:15 +01:00
Phillip Webb a282f912e6 Organize imports
Organize imports according to updated checkstyle rules.
2022-02-02 19:16:13 -08:00
Phillip Webb a05903b9d1 Polish GraphQL auto-configuration 2022-02-02 12:57:17 -08:00
Phillip Webb 501d174db0 Merge branch '2.7.x' 2022-02-02 10:38:46 -08:00
Stephane Nicoll e749f30642 Merge branch '2.7.x' 2022-02-01 16:35:39 +01:00
Stephane Nicoll 9028ab33f2 Merge branch '2.6.x' into 2.7.x
Closes gh-29617
2022-02-01 16:35:28 +01:00
Stephane Nicoll d130819fb4 Merge branch '2.5.x' into 2.6.x
Closes gh-29616
2022-02-01 16:35:19 +01:00
Stephane Nicoll 5fe6176966 Polish "Add a note on early init with @ConditionalOnExpression"
See gh-29276
2022-02-01 16:32:27 +01:00
Mihail Cornescu fce3cd1684 Add a note on early init with @ConditionalOnExpression
See gh-29276
2022-02-01 16:24:13 +01:00
Stephane Nicoll 41fb9cf562 Merge branch '2.7.x' 2022-02-01 11:15:49 +01:00
Stephane Nicoll f812b33cbd Merge branch '2.6.x' into 2.7.x
Closes gh-29613
2022-02-01 11:07:31 +01:00
Stephane Nicoll 136b5959c3 Merge branch '2.5.x' into 2.6.x
Closes gh-29612
2022-02-01 10:59:08 +01:00
Stephane Nicoll 7f17f819a6 Polish "Enforce use of BDDMockito"
See gh-29178
2022-02-01 10:03:18 +01:00
Yanming Zhou b49418aaaf Enforce use of BDDMockito
1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule

See gh-29178
2022-02-01 09:37:15 +01:00
Andy Wilkinson 7b35fabf07 Upgrade to Derby 10.15.2.0
Closes gh-29509
2022-01-20 17:37:01 +00:00
Phillip Webb 5b1486cc26 Merge branch '2.5.x' into 2.6.x 2022-01-19 15:54:19 -08:00
Phillip Webb d211b0f3b3 Disable test is Docker is not available
See gh-28843
2022-01-19 15:53:07 -08:00
Andy Wilkinson a3bfc67249 Merge branch '2.7.x' 2022-01-19 19:09:25 +00:00
Andy Wilkinson 1e4b786ff9 Merge branch '2.6.x' into 2.7.x
Closes gh-29489
2022-01-19 19:09:09 +00:00
Andy Wilkinson 6bea2172cb Switch tests to properties that are not deprecated
Closes gh-29488
2022-01-19 19:08:31 +00:00
Andy Wilkinson 0829dcd572 Merge branch '2.6.x' into 2.7.x
Closes gh-29486
2022-01-19 17:27:51 +00:00
Andy Wilkinson ee9c399eba Merge branch '2.5.x' into 2.6.x
Closes gh-29485
2022-01-19 17:27:36 +00:00
Andy Wilkinson 1b3d088056 Move JdbcSessionDataSourceInitializerTests into src/test/java
Closes gh-29484
2022-01-19 17:26:55 +00:00
Andy Wilkinson de3b9a4910 Remove code deprecated for removal in 2.x
Closes gh-29482
2022-01-19 17:25:14 +00:00
Stephane Nicoll 4d03f89a55 Harmonize dependency upgrades with Spring Boot 2.7.0-M1
Closes gh-29476
2022-01-19 10:39:18 +01:00
Andy Wilkinson 26fecbe230 Upgrade to Thymeleaf and Security Extras 3.1.0-M1
Closes gh-49452
Closes gh-49453
2022-01-18 16:01:29 +00:00
Andy Wilkinson 12cd97a20c Reinstate support for Thymeleaf 2022-01-18 16:01:29 +00:00
rstoyanchev 68f4938367 Update GraphQL QBE auto-config
This change is the same as 68806bfef8
for Querydsl, but applied also to the Query By Example auto config.

Closes gh-29445
2022-01-18 09:50:31 +01:00
Andy Wilkinson db6e9a7a5f Start building against Spring Batch 5.0 snapshots
This commit adapts to some changes in Spring Batch 5.0:

- A DataSource bean is now required by Batch
- A PlatformTransactionManager bean is no longer defined by Batch

See gh-29278
2022-01-17 16:17:49 +00:00
Brian Clozel fe82098d7d Merge branch '2.7.x' 2022-01-14 21:07:45 +01:00
Brian Clozel cdee953252 Polish 2022-01-14 21:07:29 +01:00
Brian Clozel 68806bfef8 Fix build after Spring for GraphQL changes
See spring-projects/spring-graphql#244
2022-01-14 21:05:15 +01:00
Andy Wilkinson 16447e1bce Merge branch '2.7.x' 2022-01-14 15:50:12 +00:00
Andy Wilkinson ece4c8ad93 Merge branch '2.6.x' into 2.7.x
Closes gh-29400
2022-01-14 15:49:39 +00:00
Andy Wilkinson 8868d34c24 Merge branch '2.5.x' into 2.6.x
Closes gh-29399
2022-01-14 15:48:57 +00:00
Andy Wilkinson d051146eb4 Use Testcontainers instead on Embedded Mongo
We've seen some problems, particularly on CI, where Embedded Mongo
hangs while trying to start the Mongo process. To limit the problem,
this commit replaces the use of Embedded Mongo with Testcontainers
where we can, leaving Embedded Mongo in use only where we're
specifically testing our Embedded Mongo support.

Closes gh-28843
2022-01-14 15:48:31 +00:00
Phillip Webb 13f257a706 Merge branch '2.7.x' 2022-01-12 15:44:47 -08:00
Phillip Webb 8147eb6d6d Merge branch '2.6.x' into 2.7.x 2022-01-12 15:43:44 -08:00
Stephane Nicoll 90b8d2190f Adapt to latest change in Spring Data Elasticsearch 2022-01-12 10:04:44 +01:00
Stephane Nicoll 88049ff11a Merge branch '2.7.x' 2022-01-11 11:09:11 +01:00
Stephane Nicoll ca432309aa Polish "Add option to allow Spring Batch custom isolation levels"
See gh-28859
2022-01-11 11:07:08 +01:00
stibi a8d1d3104e Add option to allow Spring Batch custom isolation levels
See gh-28859
2022-01-11 10:39:01 +01:00
Brian Clozel fc794f17e1 Update GraphiQlHandler configuration
This commit updates the `GraphiQlHandler` auto-configuration after a
constructor change was done in Spring GraphQL for WebSocket support in
GraphiQL.
2022-01-10 18:27:50 +01:00
Stephane Nicoll 2078a7f3e1 Merge branch '2.7.x' 2022-01-10 16:28:36 +01:00
Stephane Nicoll e92e35d56f Polish "Stop configuring a default user with SAML 2.0 Login"
See gh-29263
2022-01-10 16:25:43 +01:00
Guirong Hu ab49acc782 Stop configuring a default user with SAML 2.0 Login
See gh-29263
2022-01-10 16:22:00 +01:00
Brian Clozel b7de02d908 Fix build after Spring GraphQL changes
See pring-projects/spring-graphql#229
2022-01-10 14:17:31 +01:00
Stephane Nicoll 0af6761993 Merge branch '2.7.x' 2022-01-10 10:29:58 +01:00
Stephane Nicoll 270e162479 Stop aliasing MariaDB to MySQL
Closes gh-28728
2022-01-10 10:29:49 +01:00
Stephane Nicoll 5f67546534 Adapt to latest API change in SD Elasticsearch
See gh-29292
2022-01-09 22:24:05 +01:00
Stephane Nicoll 9e27bddfc7 Start building against Spring Data 2021.2.0-M1 snapshots
This commit also upgrades to Elasticsearch 7.16.2

See gh-29223
See gh-29292
2022-01-08 19:57:50 +01:00
Andy Wilkinson 894f83fb13 Upgrade to Artemis 2.20.0 and switch to Jakarta EE 9 JMS API
Closes gh-29203
2022-01-07 15:26:39 +00:00
Andy Wilkinson 89e79e826e Reinstate support for Apache Artemis
See gh-29203
2022-01-07 15:26:29 +00:00
Stephane Nicoll 9392ff59f7 Merge branch '2.7.x' 2022-01-07 15:40:59 +01:00
Stephane Nicoll a9d8befe72 Fix build failures
See gh-29290
2022-01-07 15:39:33 +01:00
Andy Wilkinson eba2c8c8fe Merge branch '2.7.x' 2022-01-07 14:04:07 +00:00
Andy Wilkinson 94fa50af1c Polish 2022-01-07 14:03:07 +00:00
Stephane Nicoll 11e604af41 Merge branch '2.7.x' 2022-01-07 14:43:19 +01:00
Stephane Nicoll 9821cdfd8b Remove deprecated code
Closes gh-29290
2022-01-07 14:42:14 +01:00
Stephane Nicoll aec6c1ed92 Merge branch '2.7.x' 2022-01-07 10:23:07 +01:00
Stephane Nicoll c62aa0deab Remove support for Hazelcast 3
Closes gh-29287
2022-01-07 10:22:27 +01:00
Stephane Nicoll 164c2f7164 Polish
See gh-29265
2022-01-07 10:20:11 +01:00
Stephane Nicoll 025fe4fd43 Merge branch '2.7.x' 2022-01-06 17:50:15 +01:00
Stephane Nicoll 69d1c3674a Upgrade to latest Hazelcast 3.x in integration tests 2022-01-06 17:41:26 +01:00
Stephane Nicoll a780e87e9c Upgrade to Hazelcast 5.0.2
See gh-29265
2022-01-06 17:38:06 +01:00
Andy Wilkinson c2e86096cd Reinstate support for jOOQ as it now supports Jakarta EE 9
Closes gh-29271
2022-01-05 15:46:54 +00:00
Stephane Nicoll fed89f98aa Merge branch '2.7.x' 2022-01-05 09:36:07 +01:00
Stephane Nicoll ce7a3d0ef2 Upgrade to Flyway 8.3.0
Closes gh-29249
2022-01-05 09:18:23 +01:00
Phillip Webb 06398eabed Merge branch '2.7.x' 2022-01-04 12:26:24 -08:00
Phillip Webb b25e92f3e2 Merge branch '2.6.x' into 2.7.x 2022-01-04 12:24:34 -08:00
Phillip Webb 760dcffd8b Merge branch '2.7.x' 2022-01-04 12:22:54 -08:00
Andy Wilkinson 1dbfcf8b57 Reinstate support for Spring Data Couchbase
Closes gh-28976
2022-01-04 16:38:16 +00:00
Stephane Nicoll 9bfe3c21e5 Merge branch '2.7.x' 2022-01-04 15:57:21 +01:00
Stephane Nicoll 4799d2a71a Polish "Add transactionIdPrefix Property to KafkaTemplate"
See gh-29089
2022-01-04 15:54:23 +01:00
Gary Russell 33814a4a42 Add transactionIdPrefix Property to KafkaTemplate
See gh-29089
2022-01-04 15:39:31 +01:00
Stephane Nicoll e87b4cfb5b Merge branch '2.7.x' 2022-01-04 15:04:33 +01:00
Stephane Nicoll c943ef18ca Polish "Add principal resolution in RSocket handler methods"
See gh-28444
2022-01-04 15:02:56 +01:00
Guirong Hu cf05964499 Add principal resolution in RSocket handler methods
See gh-28444
2022-01-04 14:35:12 +01:00
Stephane Nicoll 4442f91f63 Merge branch '2.7.x' 2022-01-04 12:46:33 +01:00
Stephane Nicoll 076ddc8579 Polish "Add server.netty.max-keep-alive-requests"
See gh-28875
2022-01-04 10:42:34 +01:00
Leo Li 0e94b2ce6e Add server.netty.max-keep-alive-requests
See gh-28875
2022-01-04 10:42:34 +01:00
Stephane Nicoll 8cb6a79e60 Merge branch '2.7.x' 2022-01-04 10:41:59 +01:00
Stephane Nicoll 578855f512 Restore support for Hazelcast 3
See gh-28801
2022-01-04 10:39:20 +01:00
Stephane Nicoll 64062adf0d Merge branch '2.7.x' 2022-01-04 09:58:24 +01:00
Stephane Nicoll e1a5be83d2 Polish "Inject SpringManagedContext into Hazelcast configuration"
See gh-28801
2022-01-04 09:57:48 +01:00
Jaromir Hamala b875b55711 Inject SpringManagedContext into Hazelcast configuration
This commit makes it possible to inject Spring managed beans into
objects instantiated by Hazelcast.

See gh-28801
2022-01-04 09:04:49 +01:00
Stephane Nicoll e378705383 Merge branch '2.7.x' 2022-01-04 08:40:15 +01:00
Stephane Nicoll f26bee1196 Polish "Upgrade to Embedded Mongo 3.2.5"
See gh-28543
2022-01-04 08:39:11 +01:00
Julien Herr 679231c120 Upgrade to Embedded Mongo 3.2.5
See gh-28543
2022-01-03 17:59:26 +01:00