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

3320 Commits

Author SHA1 Message Date
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 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 a05903b9d1 Polish GraphQL auto-configuration 2022-02-02 12:57:17 -08: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 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
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 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
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
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 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 8147eb6d6d Merge branch '2.6.x' into 2.7.x 2022-01-12 15:43:44 -08: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 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 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
Stephane Nicoll a9d8befe72 Fix build failures 
See gh-29290
 2022-01-07 15:39:33 +01:00
Andy Wilkinson 94fa50af1c Polish 2022-01-07 14:03:07 +00:00
Stephane Nicoll 9821cdfd8b Remove deprecated code 
Closes gh-29290
 2022-01-07 14:42:14 +01:00
Stephane Nicoll 164c2f7164 Polish 
See gh-29265
 2022-01-07 10:20:11 +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
Stephane Nicoll ce7a3d0ef2 Upgrade to Flyway 8.3.0 
Closes gh-29249
 2022-01-05 09:18:23 +01:00
Phillip Webb b25e92f3e2 Merge branch '2.6.x' into 2.7.x 2022-01-04 12:24:34 -08: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 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 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 578855f512 Restore support for Hazelcast 3 
See gh-28801
 2022-01-04 10:39:20 +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 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
Brian Clozel c5817f21eb Add property for disabling GraphQL schema introspection 
Prior to this commit, the GraphQL schema assembled by the
auto-configuration would provide no option for disabling the field
introspection.

While this feature is essential for many tools (including GraphiQL),
some prefer disabling it because this allows clients to gather
information about types and schema easily. This commit introduces a new
`spring.graphql.schema.introspection.enabled` configuration property.

Because potential attackers can still gather this information and this
feature is a core concern in the GraphQL spec, introspection is enabled
by default for Spring Boot applications.

Closes gh-29248
 2022-01-03 17:36:58 +01:00
izeye 728206dba0 Polish GraphQL changes 
See gh-29140
Closes gh-29194
 2022-01-03 17:36:57 +01:00
Stephane Nicoll 91d7295c62 Polish "Add support for IdlePartitionEventInterval" 
See gh-28290
 2022-01-03 14:20:56 +01:00
Pascal Ayotte 9274baeb68 Add support for IdlePartitionEventInterval 
See gh-28290
 2022-01-03 14:16:19 +01:00
Stephane Nicoll 6b6da22f2c Polish "Add support for RabbitStreamTemplate" 
See gh-28060
 2022-01-03 14:02:27 +01:00
Eddú Meléndez 3952046132 Add support for RabbitStreamTemplate 
See gh-28060
 2022-01-03 13:30:10 +01:00
Stephane Nicoll 2b140950e3 Merge branch '2.6.x' into 2.7.x 
Closes gh-29176
 2021-12-27 12:02:57 +01:00
izeye 7fbb5749d1 Polish 
See gh-29157
 2021-12-27 12:01:50 +01:00
Brian Clozel 88ee4fab36 Polish 
See gh-29140
 2021-12-21 10:33:51 +01:00
Brian Clozel 6dbcd0e95e Auto-configure security for Spring GraphQL 
This commit configures security features for Spring GraphQL.
In the case of both MVC and WebFlux, this contributes
`DataFetcherExceptionResolver` instances to resolve security exceptions
and expose them as proper errors in the GraphQL response.

For MVC only, this also configures a
`SecurityContextThreadLocalAccessor`. This component ensures that the
security context is propagated between `ThreadLocal` and the Reactor
asynchronous execution.

See gh-29140
 2021-12-21 08:33:50 +01:00
Brian Clozel 9954b4c63e Auto-configure Query* support for GraphQL 
This commit auto-configures Spring Data Querydsl and QueryByExample
support for Spring GraphQL.

See gh-29140
 2021-12-21 08:33:43 +01:00
Brian Clozel 6ef1ed0dd0 Auto-configure GraphQL WebSocket endpoint 
This commit auto-configures a GraphQL WebSocket endpoint for both Spring
MVC and Spring WebFlux. This is only enabled if the required libraries
are on the classpath and if the `"spring.graphql.websocket.path"`
property is defined.

See gh-29140
 2021-12-21 08:33:25 +01:00
Brian Clozel 4ef9b9e3e5 Auto-configure CORS options for GraphQL web endpoints 
This commit adds `"spring.graphql.cors.*"` configuration properties to
customize the CORS configuration for GraphQL web endpoints.

See gh-29140
 2021-12-21 08:33:19 +01:00
Brian Clozel 0099460155 Auto-configure graphiql endpoint 
Spring GraphQL ships with a static version of the graphiql IDE for
exploring and querying GraphQL endpoints.
See https://github.com/graphql/graphiql for more information.

This commit auto-configures the GraphiQL handler for both MVC and
WebFlux and points GraphiQL to the GraphQL HTTP endpoint exposed by the
application. This feature is disabled by default and can be switched on
with "spring.graphql.graphiql.enabled=true".

See gh-29140
 2021-12-21 08:33:11 +01:00
Brian Clozel ff9a421786 Auto-configure schema printer endpoint 
This commit configuresa new endpoint for printing in text format the
resolved GraphQL schema.
This endpoint is exposed by default under "/graphql/schema" and must be
enabled with "spring.graphql.schema.printer=true".

See gh-29140
 2021-12-21 08:33:05 +01:00
Brian Clozel b38d04556e Auto-configure HTTP transport for MVC and WebFlux 
This commit adds two new auto-configuration classes for Spring GraphQL
support. Once the base GraphQL infrastructure is in place, we can now
expose the `GraphQlService` over an HTTP transport.

Spring GraphQL supports both MVC and WebFlux, so this commit ships with
one auto-configuration for each.
Developers can configure the HTTP path where the GraphQL resource is
exposed using the `spring.graphql.path` configuration property (this
defaults to `"/graphql"`).

See gh-29140
 2021-12-21 08:32:56 +01:00
Brian Clozel 5cf0a4db94 Add FailureAnalyzer for InvalidSchemaLocationsException 
This commit adds a new `FailureAnalyzer` for exceptions thrown when no
GraphQL schema file could be found.
This lists configured locations (with `"classpath:..."` notation) and
also resolved locations - this helps developers figure out how the
pattern are resolved and why schema files cannot be found.

See gh-29140
 2021-12-21 08:32:48 +01:00
Brian Clozel de808834f5 Auto-configure Spring GraphQL base infrastructure 
This commit adds the auto-configuration for setting up the base Spring
GraphQL infrastructure. Because GraphQL doesn't depend on any particular
transport, we must have a separate configuration for creating:

* the `GraphQlSource`, which holds the schema and the `GraphQL` instance
* the `GraphQlService` for executing incoming requests
* the `BatchLoaderRegistry` for batch loading support
* the `AnnotatedControllerConfigurer` for supporting the annotated
  controllers programming model

This comes with a starting point for the `"spring.graphql.*"`
configuration properties; we can now configure the locations and file
extensions of GraphQL schema files we should load and configure at
startup.

See gh-29140
 2021-12-21 08:32:37 +01:00
Stephane Nicoll 83d732823d Merge branch '2.6.x' into 2.7.x 
Closes gh-29136
 2021-12-20 18:08:00 +01:00
Stephane Nicoll 653fdbd0a4 Configure comment prefixes 
Closes gh-29095
 2021-12-20 17:47:50 +01:00
Phillip Webb f3bcbca841 Update copyright year of changed files 2021-12-16 13:05:17 -08:00
Stephane Nicoll 63427b77d1 Merge branch '2.6.x' into 2.7.x 
Closes gh-29086
 2021-12-16 17:30:36 +01:00
Stephane Nicoll 55859ea64c Stop accessing the datasource if initialization mode is set to never 
Closes gh-28931
 2021-12-16 16:50:22 +01:00
Stephane Nicoll 38aeeee381 Merge branch '2.6.x' into 2.7.x 2021-12-15 16:41:19 +01:00
Stephane Nicoll 3b4d27e4d3 Merge branch '2.5.x' into 2.6.x 2021-12-15 16:41:09 +01:00
Stephane Nicoll 30ebb17b2b Polish 2021-12-15 16:38:27 +01:00
Stephane Nicoll 9ca1cffab7 Merge branch '2.6.x' into 2.7.x 
Closes gh-29016
 2021-12-14 15:32:13 +01:00
Stephane Nicoll ba60e3d358 Merge branch '2.5.x' 
Closes gh-29002
 2021-12-14 15:31:45 +01:00
Stephane Nicoll 157b3aa25f Allow platform to be configured in DataSourceInitializers 
Closes gh-28932
 2021-12-14 15:07:32 +01:00
Stephane Nicoll b961b14d0f Merge branch '2.6.x' into 2.7.x 
Closes gh-28980
 2021-12-10 11:02:02 +01:00
Stephane Nicoll dfab6ee307 Merge branch '2.5.x' into 2.6.x 
Closes gh-28979
 2021-12-10 11:01:48 +01:00
Stephane Nicoll f6f5aec183 Polish "Check for the presence of Spring Security" 
See gh-28967
 2021-12-10 10:59:00 +01:00
Guirong Hu 4462f9157e Check for the presence of Spring Security 
See gh-28967
 2021-12-10 10:58:30 +01:00
Stephane Nicoll a2eeb77e21 Merge branch '2.6.x' into 2.7.x 
Closes gh-28951
 2021-12-09 16:00:09 +01:00
Vedran Pavic 0af4431db8 Apply SameSite session cookie property to Spring Session 
This commit maps the `server.servlet.session.cookie.same-site`
configuration property to the `DefaultCookieSerializer` bean configured
in the Spring Session auto-configuration.

See gh-28784
 2021-12-09 15:53:50 +01:00
Stephane Nicoll 89635eafa3 Update copyright year of changed files 
See gh-28862
 2021-12-09 15:48:47 +01:00
Stefano Cordio a5c56043b9 Simplify AssertJ usage 
See gh-28862
 2021-12-09 15:39:02 +01:00
Stephane Nicoll 25a2888be5 Fix default value of spring.mvc.pathmatch.matching-strategy property 
Closes gh-28936
 2021-12-09 10:45:21 +01:00
Željko Tomić 1c1c85c3f8 Fix MariaDB mapping for Quartz DataSource initialization 
See gh-28779
 2021-11-25 09:38:44 +01:00
Phillip Webb beb68671bb Update copyright year of changed files 2021-11-24 10:23:32 -08:00
Madhura Bhave e7ff2cf358 Guard ErrorPageSecurityFilter configuration with ConditionalOnClass 
Update `ErrorPageSecurityFilterConfiguration` to guard against the case
where `spring-security-core` is on the classpath but
`spring-security-web` is not.

Fixes gh-28774
 2021-11-24 10:20:29 -08:00
Andy Wilkinson 03e283a2e6 Mention WebProperties in deprecation of ResourceProperties 
Closes gh-28762
 2021-11-22 10:03:21 +00:00
Madhura Bhave dd1d1482dc Deny unauthorized access to the error page 
Fixes gh-26356

Co-authored-by Andy Wilkinson <wilkinsona@vmware.com>
 2021-11-18 15:41:38 -08:00
Stephane Nicoll 7fbb9d471b Polish "Upgrade to Neo4j Java Driver 4.2.8" 
See gh-28717
 2021-11-17 16:14:25 +01:00
Stephane Nicoll f1991d8d80 Avoid bean override with CachingMetadataReaderFactoryPostProcessor 
Closes gh-28705
 2021-11-16 16:24:32 +01:00
Stephane Nicoll 8356204430 Upgrade to Flyway 8.0.4 
Closes gh-28697
 2021-11-16 11:02:02 +01:00
Filip Hrisafov d6bead1a2a Expose RestClientBuilder when RestHighLevelClient is not available 
This commits exposes the RestClientBuilder as a bean even when the
RestHighLevelClient is not available. It allows users to create their
own RestClient beans using the Spring Boot configured RestClientBuilder
when they are not using the RestHighLevelClient.

Fixes gh-28655
 2021-11-15 09:59:20 +01:00
Stephane Nicoll 6e06e69bba Merge branch '2.5.x' 
Closes gh-28673
 2021-11-14 08:25:01 +01:00
Stephane Nicoll 4c193a1511 Merge branch '2.4.x' into 2.5.x 
Closes gh-28672
 2021-11-14 08:24:48 +01:00
Stephane Nicoll d21c48e474 Update copyright year of changed file 
See gh-28532
 2021-11-14 08:23:32 +01:00
Josh Cummings d817029575 Harmonize @ConditionalOnMissingBean definition 
See gh-28532
 2021-11-14 08:19:43 +01:00
Andy Wilkinson 2a342ef416 Merge branch '2.5.x' 
Closes gh-28662
 2021-11-12 23:40:35 +00:00
Andy Wilkinson 5e4a502b2d Merge branch '2.4.x' into 2.5.x 
Closes gh-28661
 2021-11-12 20:31:25 +00:00
Andy Wilkinson 2cec3971d7 Prohibit unwanted dependencies in all modules not just starters 
Closes gh-28658
 2021-11-12 20:04:35 +00:00
Andy Wilkinson 925ddd6b09 Merge branch '2.5.x' 2021-11-11 10:34:13 +00:00
Andy Wilkinson 3b180f42b7 Polish 2021-11-11 10:34:04 +00:00
Andy Wilkinson 7a24ee88ae Merge branch '2.5.x' 
Closes gh-28607
 2021-11-11 09:55:42 +00:00
Andy Wilkinson 23197c34c7 Merge branch '2.4.x' into 2.5.x 
Closes gh-28606
 2021-11-11 09:55:21 +00:00
Andy Wilkinson c018788846 Test JTA auto-configured from JNDI 
Closes gh-28594
 2021-11-11 09:54:50 +00:00
Andy Wilkinson ceacb1533a Merge branch '2.5.x' 2021-11-10 20:18:09 +00:00
Andy Wilkinson b5653ad551 Merge branch '2.4.x' into 2.5.x 2021-11-10 20:17:36 +00:00
Andy Wilkinson f3b5e6bb3e Adapt to removal of static resource location filtering 
See gh-28506
 2021-11-10 20:15:56 +00:00
Stephane Nicoll 629e1d3ac5 Upgrade to Flyway 8.0.3 
Closes gh-28572
 2021-11-09 08:51:38 +01:00
Stephane Nicoll bf88405121 Flag BeanDefinitionRegistryPostProcessor beans with role infrastructure 
Closes gh-28540
 2021-11-05 14:20:37 +01:00
Stephane Nicoll 11a5055b8f Merge branch '2.5.x' 2021-11-05 13:45:01 +01:00
Stephane Nicoll cd5508a679 Polish 2021-11-05 13:43:38 +01:00
Stephane Nicoll 98b9e1ab21 Start building against Spring Framework 5.3.13 snapshots 
See gh-28515
 2021-11-05 13:37:29 +01:00
izeye 5d8dce70dc Polish 
See gh-28494
 2021-11-01 08:58:40 +01:00
Andy Wilkinson ef2bcdd3ed Merge branch '2.5.x' 
Closes gh-28483
 2021-10-29 11:37:43 +01:00
Andy Wilkinson 07ed7ab944 Merge branch '2.4.x' into 2.5.x 
Closes gh-28482
 2021-10-29 11:37:33 +01:00
Andy Wilkinson 2462f67be4 Align test for spring.data.mongodb.autoIndexCreation with new default 
Closes gh-28481
 2021-10-29 11:23:35 +01:00
Andy Wilkinson c9dd6b7e86 Merge branch '2.5.x' 
Closes gh-28480
 2021-10-29 11:12:18 +01:00
Andy Wilkinson ae93bb3a11 Merge branch '2.4.x' into 2.5.x 
Closes gh-28479
 2021-10-29 11:12:04 +01:00
Andy Wilkinson 10f0017d69 Fix method validation in child contexts 
Bean post-processors only apply to the context in which they're
registered. ValidationAutoConfiguration will only auto-configure the
MethodValidationPostProcessor if the post-processor is missing from
the current context and any of its ancestors. If an ancestor context
contains the post-processor it will not be auto-configured and the
descendant context will not have method validation configured.

This commit updates the auto-configuration to limit the search for
an existing MethodValidationPostProcessor bean to the current
context.

Fixes gh-27890
 2021-10-29 10:08:57 +01:00
Stephane Nicoll 9241f228d5 Add .gitattributes 
Closes gh-28474
 2021-10-28 15:31:40 +02:00
Stephane Nicoll 66553ac8c7 Add .gitattributes 
Closes gh-28473
 2021-10-28 15:27:49 +02:00
Stephane Nicoll 1b3f52d609 Harmonize line endings 
See gh-27615
 2021-10-28 15:22:57 +02:00
Stephane Nicoll 837e2ac277 Fix bean type visibility 
Closes gh-28437
 2021-10-23 07:31:27 +02:00
Andy Wilkinson 3605388787 Merge branch '2.5.x' 
Closes gh-28440
 2021-10-22 15:24:13 +01:00
Andy Wilkinson 50d4eaad63 Merge branch '2.4.x' into 2.5.x 
Closes gh-28439
 2021-10-22 15:23:07 +01:00
Andy Wilkinson a545b6e0b4 Polish "Polish" 
See gh-28367
 2021-10-22 15:19:13 +01:00
Leo Li 1586232761 Polish 
See gh-28367
 2021-10-22 15:11:57 +01:00
Andy Wilkinson 47da70632f Merge branch '2.5.x' 
Closes gh-28430
Closes gh-28431
 2021-10-22 10:12:53 +01:00
Andy Wilkinson 585b8880c7 Merge branch '2.4.x' into 2.5.x 
Closes gh-28424
 2021-10-22 10:10:50 +01:00
Andy Wilkinson 7f976dab9e Polish "Don't use markdown syntax in javadoc or error messages" 
See 2f6651c3cb.

Closes gh-28408
 2021-10-22 10:08:27 +01:00
Phillip Webb e25f216eab Merge branch '2.5.x' 
Closes gh-28425
 2021-10-21 11:28:33 -07:00
Phillip Webb daf36dff55 Merge branch '2.4.x' into 2.5.x 
Closes gh-28424
 2021-10-21 11:27:29 -07:00
Phillip Webb 2f6651c3cb Don't use markdown syntax in javadoc or error messages 
Closes gh-28408
 2021-10-21 11:24:54 -07:00
Andy Wilkinson 2541c0cbdc Disable on Windows tests that use embedded Kafka 
Closes gh-28406
 2021-10-21 10:46:50 +01:00
Phillip Webb 1ad39b5fce Fix ReactiveSessionAutoConfigurationRedisTests 
See gh-26714
 2021-10-21 00:10:40 -07:00
Phillip Webb cf9156e497 Add SameSite cookie support for servlet web servers 
Update Tomcat, Jetty and Undertow `ServletWebServerFactory`
implementations so that they can write SameSite cookie attributes.

The session cookie will be customized whenever the
`server.servlet.session.cookie.same-site` property is set.

Other cookies can be customized with the new `CookieSameSiteSupplier`
interface which can be registered using `@Bean` methods.

Closes gh-20971

Co-authored-by Andy Wilkinson <wilkinsona@vmware.com>
 2021-10-20 22:58:31 -07:00
Phillip Webb b72ff25220 Relocate and unify reactive cookie properties 
Relocate the recently introduced `spring.webflux.session` properties
to `server.reactive.session` and create a unified `Cookie` properties
class.

Reactive session properties now mirror the existing
`server.servlet.session` properties and better reflect the fact that
they are related to the server and not just for WebFlux.

See gh-26714
 2021-10-20 22:09:33 -07:00
Phillip Webb 3c71637fa2 Polish 'Add more session properties for reactive web servers' 
See gh-26714
 2021-10-20 22:09:30 -07:00
weixsun a2a802a14a Add more session properties for reactive web servers 
Expand the session properties supported by reactive web servers to
include `timeout` support and additional `cookie` properties.

See gh-26714
 2021-10-20 22:09:21 -07:00
Madhura Bhave ea65c28bfa Polish 2021-10-20 19:45:46 -07:00
Madhura Bhave 07aeb2156d Merge pull request #28123 from timtebeek 
* pr/28123:
  Polish "Support PEM format for Kafka SSL certs and private key"
  Support PEM format for Kafka SSL certs and private key

Closes gh-28123
 2021-10-20 19:38:11 -07:00
Madhura Bhave 0d06a2854d Polish "Support PEM format for Kafka SSL certs and private key" 
See gh-28123
 2021-10-20 17:10:49 -07:00
Tim te Beek 7a98364a23 Support PEM format for Kafka SSL certs and private key 
See gh-28123
 2021-10-20 17:10:13 -07:00
Andy Wilkinson f2b3f1f41f Make URL- and property-based pooling config mutually exclusive 
Closes gh-28144
 2021-10-20 11:22:05 +01:00
Andy Wilkinson 9d6a0cfd24 Starting building against Spring Framework 5.3.12 snapshots 
This reverts commit 3969e63ced, reversing
changes made to f01d086a8d.

Closes gh-28385
See gh-28252
 2021-10-19 18:43:53 +01:00
Andy Wilkinson f2ef8f9245 Start building against Spring Framework 5.3.12 snapshots 
This reverts commit 196013fc39, reversing
changes made to 8b0c563832.

Closes gh-28384
See gh-28241
 2021-10-19 18:41:23 +01:00
Andy Wilkinson 971bdd36fe Start building against Framework 5.3.12 snapshots 
This reverts commit b32a38a814.

See gh-28223
Closes gh-28369
 2021-10-19 17:50:59 +01:00
Andy Wilkinson 9b77151caa Polish "Make UserDetailsService back off with AuthManagerResolver bean" 
See gh-28361
 2021-10-19 16:30:06 +01:00
Bartosz Jaszczak 31cdfd524e Make UserDetailsService back off with AuthManagerResolver bean 
See gh-28361
 2021-10-19 16:19:12 +01:00
Andy Wilkinson a27dfcb9b0 Make R2DBC auto-config back off without a connection provider 
Closes gh-26439
 2021-10-19 14:18:34 +01:00
Andy Wilkinson 2af2a02fbb Merge branch '2.5.x' 
Closes gh-28380
 2021-10-19 14:18:12 +01:00
Andy Wilkinson c8e0791b50 Merge branch '2.4.x' into 2.5.x 
Closes gh-28379
 2021-10-19 14:17:53 +01:00
Andy Wilkinson 5fe75f3d58 Improve diagnostics when no DSLContext due to R2DBC 
Fixes gh-28378
 2021-10-19 13:52:45 +01:00
Andy Wilkinson 657eb86dad Polish "Add a config prop to enable/disable SI's default logging" 
See gh-28355
 2021-10-19 11:04:32 +01:00
Artem Bilan c6891c5184 Add a config prop to enable/disable SI's default logging 
See gh-28355
 2021-10-19 11:04:32 +01:00
Andy Wilkinson 3969e63ced Merge branch '2.5.x' 
See gh-28252
 2021-10-18 10:37:09 +01:00
Andy Wilkinson 196013fc39 Merge branch '2.4.x' into 2.5.x 
See gh-28241
 2021-10-18 10:23:31 +01:00
Andy Wilkinson b32a38a814 Work around unwanted static resource warnings from WebFlux and MVC 
See gh-28223
 2021-10-18 10:15:53 +01:00
Stephane Nicoll 0b32215c13 Polish "Log URLs for all DataSources" 
See gh-28204
 2021-10-14 09:24:07 +02:00
StitzL f31b8ec226 Log URLs for all DataSources 
This commit logs the path of the H2 console, followed by the
comma-separated ordered URLs of each data source that offers a
connection.

See gh-28204
 2021-10-14 09:17:49 +02:00
Phillip Webb 2034ad4827 Merge branch '2.5.x' 2021-10-13 18:48:18 -07:00
Phillip Webb 02b577390f Merge branch '2.4.x' into 2.5.x 2021-10-13 18:47:51 -07:00
Phillip Webb 0561992c2a Update copyright year of changed files 2021-10-13 18:45:38 -07:00
Phillip Webb 9abf9e6731 Modify more tests for static resource location filtering 
Fix `WebFluxAutoConfigurationTests` following upstream Spring Framework
changes. Also refine `WebMvcAutoConfigurationTests` to check the locations
are set even if they are filtered.

See gh-28223
 2021-10-13 18:45:22 -07:00
Andy Wilkinson b0dfca7d92 Configure Flyway with spring.flyway.script-placeholder-suffix 
Fixes gh-28307
 2021-10-13 10:57:21 +01:00
Andy Wilkinson 84b553a8ca Upgrade to Jackson Bom 2.13.0 
Closes gh-28298
 2021-10-13 10:32:17 +01:00
Andy Wilkinson 509427b671 Upgrade to Flyway 8.0.0 
Closes gh-28296
 2021-10-13 10:16:50 +01:00
Stephane Nicoll e978654c88 Polish "Fix Integration `fixedRate` property setting" 
See gh-28237
 2021-10-13 09:03:07 +02:00
Artem Bilan 769b5039b6 Fix Integration `fixedRate` property setting 
The `spring.integration.poller.fixed-rate` property must be set to the
constructor of the `PeriodicTrigger` and its `fixedRate` flag should be
set to `true`. The current code-base has it exactly opposite: the flag
is set to `true` when `fixed-delay` is provided.

* Fix `IntegrationAutoConfiguration.asTrigger()` method for the proper
`fixedRate` setting logic.
* Cover the change with a new test-case
* Add a message handling verification to the `defaultPoller()` test to
be sure that poller auto-configuration works as it is claimed.

See gh-28237
 2021-10-13 09:03:07 +02:00
Scott Frederick 3c9354305a Merge branch '2.5.x' 
Closes gh-28305
 2021-10-12 18:09:32 -05:00
Scott Frederick f427ea5802 Merge branch '2.4.x' into 2.5.x 
Closes gh-28304
 2021-10-12 18:00:15 -05:00
Scott Frederick 3d21ac7a20 Add required id field to Spring Data Neo4j test class 
Fixes gh-28303
 2021-10-12 17:59:19 -05:00
Scott Frederick a74b911870 Merge branch '2.5.x' 2021-10-12 16:46:19 -05:00
Scott Frederick 3755c563df Merge branch '2.4.x' into 2.5.x 2021-10-12 16:45:51 -05:00
Scott Frederick 3c6e061917 Remove unused import 
See gh-28223
 2021-10-12 16:45:43 -05:00
Scott Frederick 604b4a004d Merge branch '2.5.x' 2021-10-12 16:18:21 -05:00
Scott Frederick ec6bfa8062 Merge branch '2.4.x' into 2.5.x 2021-10-12 16:17:48 -05:00
Scott Frederick 207b76c39e Modify tests to expect filtering of static resource locations 
Spring Framework will filter non-existent locations from any configured
static resource handlers starting with 5.3.11. Tests that verify
static resource locations should account for this change.

See gh-28223
 2021-10-12 16:17:16 -05:00
Madhura Bhave e571894903 Merge pull request #28169 from Pooja199 
* pr/28169:
  Auto-configure JwtSupplierDecoder to defer OIDC lookup

Closes gh-28169
 2021-10-06 16:40:05 -07:00
Anjee 4e9f536a8e Auto-configure JwtSupplierDecoder to defer OIDC lookup 
See gh-28169
 2021-10-06 16:39:26 -07:00
Andy Wilkinson 1a505964ee Merge branch '2.5.x' 
Closes gh-28207
 2021-10-06 10:03:24 +01:00
Andy Wilkinson 1931104d13 Merge branch '2.4.x' into 2.5.x 
Closes gh-28206
 2021-10-06 09:57:19 +01:00
Andy Wilkinson 9c9fbf400e Upgrade to Spring Java Format 0.0.29 
Closes gh-28205
 2021-10-06 09:52:45 +01:00
Andy Wilkinson bddfe9ef6e Merge branch '2.5.x' 
See gh-28135
 2021-10-01 11:32:59 +01:00
Andy Wilkinson d238566920 Merge branch '2.4.x' into 2.5.x 
See gh-28134
 2021-10-01 11:32:22 +01:00
Andy Wilkinson a73293350a Fix parsing of portless IPv6 spring.rabbitmq.addresses 
Closes gh-28133
 2021-10-01 11:30:11 +01:00
Stephane Nicoll 14fc0f78b2 Polish "Stop considering persistent when scanning for Couchbase entities" 
See gh-28124
 2021-10-01 08:31:14 +02:00
Dąbrowski 067b349fb1 Stop considering persistent when scanning for Couchbase entities 
See gh-28124
 2021-10-01 08:28:36 +02:00
Phillip Webb ca69c8b98c Merge branch '2.5.x' 
Closes gh-28135
 2021-09-26 13:06:35 -07:00
Phillip Webb fcb6f557f7 Merge branch '2.4.x' into 2.5.x 
Closes gh-28134
 2021-09-26 13:06:14 -07:00