Commit Graph

2793 Commits

Author SHA1 Message Date
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
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 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 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 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 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
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
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
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
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 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 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 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 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
Phillip Webb 6c74e24147 Update copyright year of changed files 2022-02-04 16:09:35 -08: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
Andy Wilkinson 7b35fabf07 Upgrade to Derby 10.15.2.0
Closes gh-29509
2022-01-20 17:37:01 +00:00
Andy Wilkinson de3b9a4910 Remove code deprecated for removal in 2.x
Closes gh-29482
2022-01-19 17:25:14 +00: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 68806bfef8 Fix build after Spring for GraphQL changes
See spring-projects/spring-graphql#244
2022-01-14 21:05:15 +01: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
Guirong Hu ab49acc782 Stop configuring a default user with SAML 2.0 Login
See gh-29263
2022-01-10 16:22:00 +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
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 c62aa0deab Remove support for Hazelcast 3
Closes gh-29287
2022-01-07 10:22:27 +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
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
Stephane Nicoll 8b21c71fd6 Merge branch '2.7.x' 2022-01-03 14:22:25 +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 5864c300e0 Merge branch '2.7.x' 2022-01-03 14:11:47 +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
Brian Clozel f61c87c3a7 Revert "Merge branch '2.7.x'"
This reverts commit f0677a119c, reversing
changes made to 938d58f32c.
2021-12-21 09:05:06 +01:00
Brian Clozel f0677a119c Merge branch '2.7.x' 2021-12-21 09:04:10 +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 d271e76b48 Merge branch '2.7.x' 2021-12-20 18:08:10 +01:00
Stephane Nicoll 653fdbd0a4 Configure comment prefixes
Closes gh-29095
2021-12-20 17:47:50 +01:00
Phillip Webb 003fb229fd Merge branch '2.7.x' 2021-12-16 13:07:22 -08:00
Phillip Webb f3bcbca841 Update copyright year of changed files 2021-12-16 13:05:17 -08:00
Stephane Nicoll 75d2c36846 Merge branch '2.7.x' 2021-12-16 17:30:45 +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 cd69781457 Merge branch '2.7.x' 2021-12-14 15:32:22 +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
Andy Wilkinson 3c8d4d33e1 Upgrade to Spring Data Elasticsearch 7.16.0
Closes gh-28987
2021-12-10 21:43:29 +00: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 d61d597a96 Merge branch '2.7.x' 2021-12-09 16:00:20 +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 77c8303bd0 Merge branch '2.7.x' 2021-12-09 10:46:18 +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
Scott Frederick 33953823fc Replace usage of deprecated Spring Framework methods
See gh-28642
2021-12-06 16:12:34 -06:00
Andy Wilkinson fe7b13ec46 Upgrade to Spring Framework 6 and Jakarta EE 9
Closes gh-28619
Closes gh-28620
Closes gh-28621
Closes gh-28622
Closes gh-28623
Closes gh-28624
Closes gh-28625
Closes gh-28626
Closes gh-28627
Closes gh-28628
Closes gh-28629
Closes gh-28630
Closes gh-28631
Closes gh-28632
Closes gh-28633
Closes gh-28634
Closes gh-28635
Closes gh-28636
Closes gh-28638
Closes gh-28639
Closes gh-28640
Closes gh-28644
Closes gh-28645
Closes gh-28650
Closes gh-28711
Closes gh-28866
Closes gh-28867
Closes gh-28868
Closes gh-28872

See gh-28641
See gh-28642
See gh-28643
See gh-28646
See gh-28647
See gh-28648
See gh-28649
See gh-28721
See gh-28869
See gh-28871
2021-11-30 20:32:16 +00:00
Andy Wilkinson 4a8904aaa9 Drop support for jOOQ until its dependencies are Jakarta EE 9 compatible
Closes gh-28821
2021-11-30 15:55:48 +00:00
Andy Wilkinson a17d6f9791 Drop support for Infinispan until it is Jakarta EE 9 compatible
Closes gh-28799
2021-11-30 15:55:48 +00:00
Scott Frederick 015dca1956 Remove support for Thymeleaf
Closes gh-28611
2021-11-30 15:55:47 +00:00
Andy Wilkinson 22cc9ca6fa Drop support for CommonsMultipartResolver
Closes gh-28782
2021-11-30 15:55:47 +00:00
Andy Wilkinson 6e7f2766c8 Remove support for pooled-jms as it is not JMS 3.0 compatible
Closes gh-28701
2021-11-30 15:55:09 +00:00
Madhura Bhave c8fd5f0080 Remove support for Artemis
Closes gh-28593
2021-11-30 15:39:56 +00:00
Andy Wilkinson 8bf2ffd93c Drop support for Jersey until jersey-spring6 is available
Closes gh-28808
2021-11-30 15:39:39 +00:00
Scott Frederick 29a21d4621 Remove support for Spring Data Couchbase and Couchbase caching
Fixes gh-28613
2021-11-30 15:39:28 +00:00
Andy Wilkinson 63492507b4 Remove support for Apache ActiveMQ
Closes gh-28591
2021-11-30 15:38:46 +00:00
Andy Wilkinson a3c4059ee8 Remove support for H2's web console
Closes gh-28590
2021-11-30 15:38:35 +00:00
Andy Wilkinson 64bf33038d Remove support for EhCache 2
Closes gh-28588
2021-11-30 15:38:23 +00:00
Andy Wilkinson ef02cc9bff Remove support for Atomikos
Closes gh-28589
2021-11-30 15:38:01 +00:00
Andy Wilkinson 99f33ede14 Remove SecurityManager support
Closes gh-28213
2021-11-30 15:37:15 +00: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
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
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 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 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 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