Commit Graph

3374 Commits (85887b54114d48c5bcb5da987a1ad6a752648d43)

Author SHA1 Message Date
Stephane Nicoll 1169c6df16 Upgrade to Neo4j Java Driver 4.4.5
Closes gh-30326
3 years ago
Andy Wilkinson c2d7e21312 Merge branch '2.6.x' into 2.7.x
Closes gh-30322
3 years ago
Andy Wilkinson 26719a211b Merge branch '2.5.x' into 2.6.x
Closes gh-30321
3 years ago
Andy Wilkinson 1669062231 Apply server.tomcat.keep-alive-timeout to HTTP/2
Closes gh-30267
3 years ago
Stephane Nicoll 2ab0ce3ea7 Upgrade to Neo4j Java Driver 4.4.5
Closes gh-30303
3 years ago
Stephane Nicoll 2fbb36bd04 fixup! Upgrade to Flyway 8.5.4 3 years ago
Andy Wilkinson b787ea4802 Add property for media types of reactive Mustache views
Closes gh-28858
3 years ago
Andy Wilkinson 3a5a748ec0 Rework Mustache properties to show which are Servlet-specific
Closes gh-30273
3 years ago
Andy Wilkinson 2ba064c855 Merge branch '2.6.x' into 2.7.x
Closes gh-30277
3 years ago
Andy Wilkinson 3c117ca2d4 Merge branch '2.5.x' into 2.6.x
Closes gh-30276
3 years ago
Andy Wilkinson 2b75ea5fb8 Improve testing of spring.mustache.* properties
Closes gh-30274
3 years ago
Andy Wilkinson fee3b89b1b Merge branch '2.6.x' into 2.7.x
Closes gh-30257
3 years ago
Andy Wilkinson cdaafce614 Merge branch '2.5.x' into 2.6.x
Closes gh-30256
3 years ago
Andy Wilkinson 7f036e35fd Make MustacheViewResolvers conditional onspring.mustache.enabled
Closes gh-30250
3 years ago
Andy Wilkinson 81383e552a Merge branch '2.6.x' into 2.7.x
Closes gh-30254
3 years ago
Andy Wilkinson 6bc000565d Merge branch '2.5.x' into 2.6.x
Closes gh-30253
3 years ago
Andy Wilkinson 0accc3d67d Convert MustacheAutoConfigurationTests to application context runner
Closes gh-30252
3 years ago
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
3 years ago
Stephane Nicoll 695685996a Start building against Spring Kafka 2.8.4 snapshots
See gh-30190
3 years ago
Stephane Nicoll 3717c4c883 Start building against Spring Kafka 2.8.4 snapshots
See gh-30181
3 years ago
Andy Wilkinson 1c19995db7 Merge branch '2.6.x' into 2.7.x
Closes gh-30165
3 years ago
Andy Wilkinson 6bbf3aff0e Merge branch '2.5.x' into 2.6.x
Closes gh-30164
3 years ago
Andy Wilkinson eef89c6c35 Increase tests' Cassandra timeouts to 60s
Closes gh-30163
3 years ago
Andy Wilkinson 6494a9f08a Merge branch '2.6.x' into 2.7.x
Closes gh-30165
3 years ago
Andy Wilkinson 7c3c5d3d3e Merge branch '2.5.x' into 2.6.x
Closes gh-30164
3 years ago
Andy Wilkinson bbdef2b026 Increase timeouts in tests that use Cassandra
Closes gh-30163
3 years ago
Andy Wilkinson 813c2a5b1e Merge branch '2.6.x' into 2.7.x
Closes gh-30135
3 years ago
Andy Wilkinson 3cb1629f45 Merge branch '2.5.x' into 2.6.x
Closes gh-30134
3 years ago
Andy Wilkinson da1eb25e4b Remove redundant JRE-based enabled and disabled annotations from tests
Closes gh-29693
3 years ago
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
3 years ago
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
3 years ago
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
3 years ago
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
3 years ago
Andy Wilkinson dcaca38154 Merge branch '2.6.x' into 2.7.x
Closes gh-30099
3 years ago
Andy Wilkinson 119a713f09 Merge branch '2.5.x' into 2.6.x
Closes gh-30098
3 years ago
Andy Wilkinson e7705f4f71 Improve condition message produced by @ConditionalOnSingleCandidate
Closes gh-30073
3 years ago
Moritz Halbritter 50d766020c Merge branch '2.6.x' into 2.7.x
Closes gh-30084
3 years ago
Moritz Halbritter 564555347f Merge branch '2.5.x' into 2.6.x
Closes gh-30083
3 years ago
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
3 years ago
Stephane Nicoll ce4f7ded8a Merge branch '2.6.x' into 2.7.x
Closes gh-30081
3 years ago
Stephane Nicoll c6a9e138e5 Merge branch '2.5.x' into 2.6.x
Closes gh-30080
3 years ago
Stephane Nicoll cf9cc82025 Update copyright year of change file
See gh-30074
3 years ago
hak7a3 0a035c7fa6 Fix references to spring.data.cassandra.connection.connect-timeout
See gh-30074
3 years ago
Andy Wilkinson f44e7d9391 Merge branch '2.6.x' into 2.7.x
Closes gh-30071
3 years ago
Andy Wilkinson 2ef055a823 Merge branch '2.5.x' into 2.6.x
Closes gh-30070
3 years ago
Andy Wilkinson 1872af056e Make it clearer that the generated password is not for production use
Closes gh-30061
3 years ago
Andy Wilkinson 324c4310a4 Merge branch '2.6.x' into 2.7.x
Closes gh-30034
3 years ago
Andy Wilkinson 8a4a639734 Merge branch '2.5.x' into 2.6.x
Closes gh-30033
3 years ago
izeye 140d24d567 Remove redundant ConditionalOnMissingFilterBean
See gh-29983
3 years ago
Andy Wilkinson 19b5431ba4 Polish "Remove redundant ResourceLoaders from GraphQL auto-configuration"
See gh-29976
3 years ago
dugenkui03 5a52b36ec7 Remove redundant ResourceLoaders from GraphQL auto-configuration
See gh-29976
3 years ago
Andy Wilkinson 73d0d5bccf Merge branch '2.6.x' into 2.7.x
Closes gh-30009
3 years ago
Andy Wilkinson b379eea885 Merge branch '2.5.x' into 2.6.x
Closes gh-30008
3 years ago
Andy Wilkinson 7bc336cdc6 Use an ephemeral port to avoid potential port clash
Closes gh-30007
3 years ago
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
3 years ago
Phillip Webb 9f00c3acf5 Polish 3 years ago
Phillip Webb adfaa8f778 Merge branch '2.6.x' into 2.7.x 3 years ago
Phillip Webb 9411fc264d Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb 57009d5623 Polish 3 years ago
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
3 years ago
Moritz Halbritter 7872f61bfc Add @AutoConfiguration annotation support to the autoconfigure-processor
See gh-29907
3 years ago
Moritz Halbritter 9149ae50da Use @AutoConfiguration for relative ordering on auto-configurations 3 years ago
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
3 years ago
Andy Wilkinson 57cd34be88 Merge branch '2.6.x' into 2.7.x
Closes gh-29971
3 years ago
Andy Wilkinson a979925e63 Merge branch '2.5.x' into 2.6.x
Closes gh-29970
3 years ago
Andy Wilkinson 7aca75c58c Preserve ObjectName property order when name is unchanged
Closes gh-29953
3 years ago
Stephane Nicoll c8b7a17545 Upgrade to Spring Kafka 2.8.3
Closes gh-29722
3 years ago
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
3 years ago
Stephane Nicoll dda3bae02a Upgrade to Embedded Mongo 3.4.1
Closes gh-29944
3 years ago
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
3 years ago
Stephane Nicoll 935d37b2ca Polish "Reuse BatchLoaderRegistry in GraphQlService"
See gh-29929
3 years ago
dugenkui03 043e5ff0f5 Reuse BatchLoaderRegistry in GraphQlService
See gh-29929
3 years ago
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
3 years ago
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
3 years ago
Stephane Nicoll 3ffd88158e Polish "Add support for Redis sentinel username"
See gh-29661
3 years ago
mourezwell 202a426bd6 Add support for Redis sentinel username
See gh-29661
3 years ago
Gary Russell d56403b64f Add support for Kafka immediateStop property
See gh-29884
3 years ago
Moritz Halbritter 4f49e8c990 Polish JavaDoc 3 years ago
Andy Wilkinson 0e5a82522c Merge branch '2.6.x' into 2.7.x
Closes gh-29904
3 years ago
Andy Wilkinson 9da6fb4a5a Merge branch '2.5.x' into 2.6.x
Closes gh-29903
3 years ago
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
3 years ago
Andy Wilkinson b6fea07001 Merge branch '2.6.x' into 2.7.x
Closes gh-29902
3 years ago
Andy Wilkinson 0cebb332d1 Merge branch '2.5.x' into 2.6.x
Closes gh-29901
3 years ago
Andy Wilkinson ac38a5a3e9 Update javadoc to reflect move to SecurityFilterChain
Closes gh-29900
3 years ago
Scott Frederick 42328771ad Suppress deprecation warnings for WebSecurityConfigurerAdapter
Fixes gh-29897
3 years ago
Moritz Halbritter 896345df23 Fix test 3 years ago
Moritz Halbritter 7c96294641 Move our auto-configurations from spring.factories to new file
Closes gh-29873
3 years ago
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
3 years ago
Phillip Webb c0ffb35668 Update copyright year of changed files 3 years ago
Phillip Webb 4092afc98f Polish 3 years ago
Moritz Halbritter 8e99788fc8 Migrate auto-configurations to @AutoConfiguration
Closes gh-29871
3 years ago
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
3 years ago
Stephane Nicoll 15e14e23c9 Start building against Spring Kafka 2.8.3 snapshots
See gh-29759
3 years ago
Andy Wilkinson 0c15fab881 Merge branch '2.6.x' into 2.7.x
Closes gh-29744
3 years ago
Andy Wilkinson b74f668254 Only auto-configure WebSessionIdResolver in reactive web app
Closes gh-29669
3 years ago
Andy Wilkinson fc5ede7b94 Polish "Auto-configure Spring rather than Nimbus opaque token introspectors"
See gh-29572
3 years ago
Lukas Kuster 131ea706c7 Auto-configure Spring rather than Nimbus opaque token introspectors
See gh-29572
3 years ago
Andy Wilkinson c761dc517b Merge branch '2.6.x' into 2.7.x
Closes gh-29732
3 years ago
Andy Wilkinson 197ba9ebc9 Merge branch '2.5.x' into 2.6.x
Closes gh-29731
3 years ago
Andy Wilkinson 64ee54423a Polish "Configure ForwardedHeaderFilter with Tomcat's use relative redirects"
See gh-29333
3 years ago
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
3 years ago
Stephane Nicoll 098a57affb Upgrade to R2DBC Borca-RELEASE
See gh-28524
3 years ago
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>
3 years ago
Phillip Webb 6c74e24147 Update copyright year of changed files 3 years ago
Henning Poettker e3d0f1feee Adjust IDENTITY in DDLs for H2 2.x compatibility
See gh-29200
3 years ago
Stephane Nicoll 37c1f47902 Merge branch '2.6.x' into 2.7.x
Closes gh-29650
3 years ago
Stephane Nicoll 03d393bc4c Merge branch '2.5.x' into 2.6.x
Closes gh-29649
3 years ago
Stephane Nicoll 48649192cb Fix schema file name for Batch auto-configuration tests
Closes gh-29648
3 years ago
Phillip Webb a05903b9d1 Polish GraphQL auto-configuration 3 years ago
Stephane Nicoll 9028ab33f2 Merge branch '2.6.x' into 2.7.x
Closes gh-29617
3 years ago
Stephane Nicoll d130819fb4 Merge branch '2.5.x' into 2.6.x
Closes gh-29616
3 years ago
Stephane Nicoll 5fe6176966 Polish "Add a note on early init with @ConditionalOnExpression"
See gh-29276
3 years ago
Mihail Cornescu fce3cd1684 Add a note on early init with @ConditionalOnExpression
See gh-29276
3 years ago
Stephane Nicoll f812b33cbd Merge branch '2.6.x' into 2.7.x
Closes gh-29613
3 years ago
Stephane Nicoll 136b5959c3 Merge branch '2.5.x' into 2.6.x
Closes gh-29612
3 years ago
Stephane Nicoll 7f17f819a6 Polish "Enforce use of BDDMockito"
See gh-29178
3 years ago
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
3 years ago
Phillip Webb 5b1486cc26 Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb d211b0f3b3 Disable test is Docker is not available
See gh-28843
3 years ago
Andy Wilkinson 1e4b786ff9 Merge branch '2.6.x' into 2.7.x
Closes gh-29489
3 years ago
Andy Wilkinson 6bea2172cb Switch tests to properties that are not deprecated
Closes gh-29488
3 years ago
Andy Wilkinson 0829dcd572 Merge branch '2.6.x' into 2.7.x
Closes gh-29486
3 years ago
Andy Wilkinson ee9c399eba Merge branch '2.5.x' into 2.6.x
Closes gh-29485
3 years ago
Andy Wilkinson 1b3d088056 Move JdbcSessionDataSourceInitializerTests into src/test/java
Closes gh-29484
3 years ago
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
3 years ago
Brian Clozel cdee953252 Polish 3 years ago
Brian Clozel 68806bfef8 Fix build after Spring for GraphQL changes
See spring-projects/spring-graphql#244
3 years ago
Andy Wilkinson ece4c8ad93 Merge branch '2.6.x' into 2.7.x
Closes gh-29400
3 years ago
Andy Wilkinson 8868d34c24 Merge branch '2.5.x' into 2.6.x
Closes gh-29399
3 years ago
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
3 years ago
Phillip Webb 8147eb6d6d Merge branch '2.6.x' into 2.7.x 3 years ago
Stephane Nicoll ca432309aa Polish "Add option to allow Spring Batch custom isolation levels"
See gh-28859
3 years ago
stibi a8d1d3104e Add option to allow Spring Batch custom isolation levels
See gh-28859
3 years ago
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.
3 years ago
Stephane Nicoll e92e35d56f Polish "Stop configuring a default user with SAML 2.0 Login"
See gh-29263
3 years ago
Guirong Hu ab49acc782 Stop configuring a default user with SAML 2.0 Login
See gh-29263
3 years ago
Brian Clozel b7de02d908 Fix build after Spring GraphQL changes
See pring-projects/spring-graphql#229
3 years ago
Stephane Nicoll 270e162479 Stop aliasing MariaDB to MySQL
Closes gh-28728
3 years ago
Stephane Nicoll 5f67546534 Adapt to latest API change in SD Elasticsearch
See gh-29292
3 years ago
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
3 years ago
Stephane Nicoll a9d8befe72 Fix build failures
See gh-29290
3 years ago
Andy Wilkinson 94fa50af1c Polish 3 years ago
Stephane Nicoll 9821cdfd8b Remove deprecated code
Closes gh-29290
3 years ago
Stephane Nicoll 164c2f7164 Polish
See gh-29265
3 years ago
Stephane Nicoll 69d1c3674a Upgrade to latest Hazelcast 3.x in integration tests 3 years ago
Stephane Nicoll a780e87e9c Upgrade to Hazelcast 5.0.2
See gh-29265
3 years ago
Stephane Nicoll ce7a3d0ef2 Upgrade to Flyway 8.3.0
Closes gh-29249
3 years ago
Phillip Webb b25e92f3e2 Merge branch '2.6.x' into 2.7.x 3 years ago
Stephane Nicoll 4799d2a71a Polish "Add transactionIdPrefix Property to KafkaTemplate"
See gh-29089
3 years ago
Gary Russell 33814a4a42 Add transactionIdPrefix Property to KafkaTemplate
See gh-29089
3 years ago