ad95aded7e
Merge branch '2.7.x'
2022-03-30 10:57:28 +01:00
b9029fcf9e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30476
2022-03-30 10:57:10 +01:00
64beaba99f
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30475
2022-03-30 10:56:56 +01:00
8cb11b74cd
Polish "Make MustacheViewResolver bean back off without Spring MVC"
...
See gh-30456
2022-03-30 10:33:35 +01:00
7101b5099f
Make MustacheViewResolver bean back off without Spring MVC
...
See gh-30456
2022-03-30 10:31:44 +01:00
24e6417ddc
Adapt to latest changes in Spring for GraphQL snapshots
...
See gh-30463
2022-03-29 16:50:12 +01:00
93817c708e
Switch to Spring for GraphQL 1.0.0-SNAPSHOT
...
See gh-30463
2022-03-29 16:37:21 +02:00
eabf6cd1d8
Merge branch '2.7.x'
2022-03-25 15:15:26 +00:00
685d2d4391
Polish
...
See gh-30152
2022-03-25 15:15:02 +00:00
df417bf317
Simplify registration of Jackson mixin types
...
See gh-30152
2022-03-25 15:15:02 +00:00
e431842668
Merge branch '2.7.x'
2022-03-25 14:56:49 +01:00
45f393b76b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30437
2022-03-25 14:56:01 +01:00
c003d5b533
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30436
2022-03-25 14:55:31 +01:00
0ff8119a1b
Sort entries in additional-spring-configuration metadata alphabetically
...
Closes gh-30434
2022-03-25 14:54:39 +01:00
5702f9ebc3
Merge branch '2.7.x'
2022-03-23 20:16:51 +00:00
5d55c663ba
Allow spring.data.mongodb.uri to take precedence over separate props
...
Closes gh-30067
2022-03-23 20:15:04 +00:00
77e6279d03
Merge branch '2.7.x'
2022-03-23 12:11:24 +00:00
3255da23a2
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30388
2022-03-23 12:11:13 +00:00
c739831087
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30387
2022-03-23 12:11:02 +00:00
d8cf332c2e
Document default value of spring.thymeleaf.reactive.media-types
...
Closes gh-30280
2022-03-23 12:09:48 +00:00
3ee44ca0b0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30386
2022-03-23 11:47:53 +00:00
f378627f94
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30385
2022-03-23 11:45:31 +00:00
8d882fa09b
Fix possible duplicate templateEngine bean in Thymeleaf auto-config
...
Closes gh-30384
2022-03-23 11:44:59 +00:00
3410dd67d0
Merge branch '2.7.x'
2022-03-23 09:58:56 +00:00
47540eec61
Align default indices options with Spring Data Elasticsearch
...
Closes gh-30378
2022-03-23 09:39:05 +00:00
c4425598cf
Merge branch '2.7.x'
2022-03-22 20:13:16 +00:00
79ee53a587
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30377
2022-03-22 20:13:04 +00:00
f063da30d2
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30376
2022-03-22 20:12:48 +00:00
a8bddeb9cf
Remove redundant setting of refresh policy
...
Closes gh-30375
2022-03-22 20:12:09 +00:00
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
2088381d4b
Merge branch '2.7.x'
2022-03-21 10:06:56 +01:00
a2959bbcf2
Polish "Add support for cache2k in memory caching"
...
See gh-28498
2022-03-21 09:59:24 +01:00
774f61fcb5
Add support for cache2k in memory caching
...
See gh-28498
2022-03-21 08:22:19 +01:00
3ed3d3eb36
Restore Ehcache 3 Support
...
See gh-30002
2022-03-19 09:33:47 +01:00
cabfb98a89
Merge branch '2.7.x'
2022-03-18 16:52:47 -05:00
a14f3ed200
Use a ConfigurationProperties class for JMX properties
...
Closes gh-30327
2022-03-18 16:32:13 -05:00
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
1169c6df16
Upgrade to Neo4j Java Driver 4.4.5
...
Closes gh-30326
2022-03-18 18:34:09 +01:00
12d9127d3b
Merge branch '2.7.x'
2022-03-18 15:56:29 +00:00
c2d7e21312
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30322
2022-03-18 15:56:13 +00:00
26719a211b
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30321
2022-03-18 15:55:39 +00:00
1669062231
Apply server.tomcat.keep-alive-timeout to HTTP/2
...
Closes gh-30267
2022-03-18 15:38:27 +00:00
39b6f2bd7d
Merge branch '2.7.x'
2022-03-18 15:08:28 +01:00
2ab0ce3ea7
Upgrade to Neo4j Java Driver 4.4.5
...
Closes gh-30303
2022-03-18 14:52:46 +01:00
dd812a3f76
Upgrade to Groovy 4.0.1
...
Closes gh-30279
2022-03-18 12:38:41 +00:00
e60001fb16
Adapt to deprecations in Spring Data Redis
...
See gh-30200
2022-03-18 11:16:55 +00:00
2fbb36bd04
fixup! Upgrade to Flyway 8.5.4
2022-03-18 10:57:07 +01:00
f693d7dfad
Merge branch '2.7.x'
2022-03-17 20:12:12 +00:00
b787ea4802
Add property for media types of reactive Mustache views
...
Closes gh-28858
2022-03-17 20:10:37 +00:00
36f24cf6bb
Merge branch '2.7.x'
2022-03-17 19:31:59 +00:00
3a5a748ec0
Rework Mustache properties to show which are Servlet-specific
...
Closes gh-30273
2022-03-17 19:25:07 +00:00
6625a77f64
Merge branch '2.7.x'
2022-03-17 17:51:43 +00:00
2ba064c855
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30277
2022-03-17 17:51:28 +00:00
3c117ca2d4
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30276
2022-03-17 17:50:58 +00:00
2b75ea5fb8
Improve testing of spring.mustache.* properties
...
Closes gh-30274
2022-03-17 17:40:22 +00:00
1784fc19bb
Adapt mock to API change
2022-03-17 10:34:22 +01:00
f3f5a87af4
Merge branch '2.7.x'
2022-03-16 19:42:36 +00:00
fee3b89b1b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30257
2022-03-16 19:42:14 +00:00
cdaafce614
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30256
2022-03-16 19:41:14 +00:00
7f036e35fd
Make MustacheViewResolvers conditional onspring.mustache.enabled
...
Closes gh-30250
2022-03-16 19:09:13 +00:00
09510db630
Merge branch '2.7.x'
2022-03-16 17:07:29 +00:00
81383e552a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30254
2022-03-16 17:06:43 +00:00
6bc000565d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30253
2022-03-16 17:06:17 +00:00
0accc3d67d
Convert MustacheAutoConfigurationTests to application context runner
...
Closes gh-30252
2022-03-16 15:28:48 +00:00
23b5a3f70e
Merge branch '2.7.x'
2022-03-16 14:14:35 +00:00
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
0e07eb2393
Remove deprecated Spring Kafka's only-log-record-metadata property
...
See gh-30089
2022-03-15 17:57:45 +01:00
7c8b4b6914
Restore Kafka tests
2022-03-13 18:53:05 +01:00
695685996a
Start building against Spring Kafka 2.8.4 snapshots
...
See gh-30190
2022-03-12 18:26:03 +01:00
3717c4c883
Start building against Spring Kafka 2.8.4 snapshots
...
See gh-30181
2022-03-12 12:50:26 +01:00
a2ecd600f8
Merge branch '2.7.x'
2022-03-11 11:03:46 +00:00
1c19995db7
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30165
2022-03-11 11:03:20 +00:00
6bbf3aff0e
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30164
2022-03-11 11:03:01 +00:00
eef89c6c35
Increase tests' Cassandra timeouts to 60s
...
Closes gh-30163
2022-03-11 11:02:18 +00:00
faf7a35425
Merge branch '2.7.x'
2022-03-10 16:51:56 +00:00
6494a9f08a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30165
2022-03-10 16:51:43 +00:00
7c3c5d3d3e
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30164
2022-03-10 16:51:33 +00:00
bbdef2b026
Increase timeouts in tests that use Cassandra
...
Closes gh-30163
2022-03-10 16:50:39 +00:00
e9d2ec507e
Merge branch '2.7.x'
2022-03-09 15:17:25 +00:00
f5ca568014
Remove versions less than 17 from JavaVersion enum
...
Closes gh-29503
2022-03-09 15:16:59 +00:00
813c2a5b1e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30135
2022-03-09 14:45:55 +00:00
3cb1629f45
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30134
2022-03-09 14:44:51 +00:00
da1eb25e4b
Remove redundant JRE-based enabled and disabled annotations from tests
...
Closes gh-29693
2022-03-09 14:41:13 +00:00
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
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
ef4add27f0
Do not set ConversionService on AnnotatedControllerConfigurer
...
After 0b449d89e1
2022-03-08 17:54:54 +01:00
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
d92dcf9452
Merge branch '2.7.x'
2022-03-08 13:53:11 +00:00
dcaca38154
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30099
2022-03-08 13:52:46 +00:00
119a713f09
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30098
2022-03-08 13:52:25 +00:00
e7705f4f71
Improve condition message produced by @ConditionalOnSingleCandidate
...
Closes gh-30073
2022-03-08 13:51:38 +00:00
e6f6b2068b
Start building against Spring Kafka 3.0.0-M3 snapshots
...
See gh-30089
2022-03-07 21:09:41 +01:00
a1b1377733
Merge branch '2.7.x'
2022-03-07 13:23:06 +01:00
50d766020c
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30084
2022-03-07 13:22:53 +01:00
564555347f
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30083
2022-03-07 13:22:34 +01:00
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
f869c490f4
Merge branch '2.7.x'
2022-03-07 09:49:21 +01:00
ce4f7ded8a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30081
2022-03-07 09:49:10 +01:00
c6a9e138e5
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30080
2022-03-07 09:49:00 +01:00
cf9cc82025
Update copyright year of change file
...
See gh-30074
2022-03-07 09:47:12 +01:00
0a035c7fa6
Fix references to spring.data.cassandra.connection.connect-timeout
...
See gh-30074
2022-03-07 09:42:43 +01:00
c755e0d1f8
Merge branch '2.7.x'
2022-03-04 17:56:40 +00:00
f44e7d9391
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30071
2022-03-04 17:56:29 +00:00
2ef055a823
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30070
2022-03-04 17:56:14 +00:00
1872af056e
Make it clearer that the generated password is not for production use
...
Closes gh-30061
2022-03-04 17:55:54 +00:00
f95e5b9b8a
Merge branch '2.7.x'
2022-03-02 12:21:39 +00:00
324c4310a4
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30034
2022-03-02 12:21:29 +00:00
8a4a639734
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30033
2022-03-02 12:21:20 +00:00
140d24d567
Remove redundant ConditionalOnMissingFilterBean
...
See gh-29983
2022-03-02 11:40:44 +00:00
19b5431ba4
Polish "Remove redundant ResourceLoaders from GraphQL auto-configuration"
...
See gh-29976
2022-02-28 11:16:04 +00:00
5a52b36ec7
Remove redundant ResourceLoaders from GraphQL auto-configuration
...
See gh-29976
2022-02-28 11:16:04 +00:00
cce48a75fc
Merge branch '2.7.x'
2022-02-28 11:15:38 +00:00
73d0d5bccf
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30009
2022-02-28 11:15:24 +00:00
b379eea885
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30008
2022-02-28 11:15:02 +00:00
7bc336cdc6
Use an ephemeral port to avoid potential port clash
...
Closes gh-30007
2022-02-28 10:54:31 +00:00
7a4960d4ca
Merge branch '2.7.x' into main
2022-02-24 11:01:23 -08:00
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
5454e2e26a
Merge branch '2.7.x'
2022-02-23 23:02:59 -08:00
9f00c3acf5
Polish
2022-02-23 21:44:43 -08:00
adfaa8f778
Merge branch '2.6.x' into 2.7.x
2022-02-23 21:44:37 -08:00
9411fc264d
Merge branch '2.5.x' into 2.6.x
2022-02-23 21:44:08 -08:00
57009d5623
Polish
2022-02-23 21:43:42 -08:00
54f1058d63
Merge branch '2.7.x'
2022-02-23 16:10:49 +01:00
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
7872f61bfc
Add @AutoConfiguration annotation support to the autoconfigure-processor
...
See gh-29907
2022-02-23 15:39:46 +01:00
9149ae50da
Use @AutoConfiguration for relative ordering on auto-configurations
2022-02-23 15:39:46 +01:00
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
d427fa4b5d
Merge branch '2.7.x'
2022-02-23 11:53:31 +00:00
57cd34be88
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29971
2022-02-23 11:53:09 +00:00
a979925e63
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29970
2022-02-23 11:52:57 +00:00
7aca75c58c
Preserve ObjectName property order when name is unchanged
...
Closes gh-29953
2022-02-23 11:30:21 +00:00
c8b7a17545
Upgrade to Spring Kafka 2.8.3
...
Closes gh-29722
2022-02-23 08:27:24 +01:00
b64a6e6229
Merge branch '2.7.x' into main
2022-02-22 14:42:52 -06:00
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
fcca4920d3
Merge branch '2.7.x'
2022-02-22 14:57:04 +01:00
dda3bae02a
Upgrade to Embedded Mongo 3.4.1
...
Closes gh-29944
2022-02-22 14:56:50 +01:00
5e56757d4c
Merge branch '2.7.x'
2022-02-21 19:00:20 +00:00
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
935d37b2ca
Polish "Reuse BatchLoaderRegistry in GraphQlService"
...
See gh-29929
2022-02-21 18:16:07 +01:00
043e5ff0f5
Reuse BatchLoaderRegistry in GraphQlService
...
See gh-29929
2022-02-21 18:00:52 +01:00
03e5dcdb3a
Merge branch '2.7.x'
2022-02-21 13:34:11 +01:00
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
d42f675959
Merge branch '2.7.x'
2022-02-21 10:36:05 +01:00
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
3b2288899b
Merge branch '2.7.x'
2022-02-21 09:55:21 +01:00
3ffd88158e
Polish "Add support for Redis sentinel username"
...
See gh-29661
2022-02-21 09:52:29 +01:00
202a426bd6
Add support for Redis sentinel username
...
See gh-29661
2022-02-21 09:52:15 +01:00
414b7539de
Merge branch '2.7.x'
2022-02-21 09:34:05 +01:00
d56403b64f
Add support for Kafka immediateStop property
...
See gh-29884
2022-02-21 09:29:41 +01:00
f5f6a1fe83
Merge branch '2.7.x'
2022-02-18 13:15:11 +01:00
Andy Wilkinson
Craig Andrews
Brian Clozel
Guirong Hu
Moritz Halbritter
Stephane Nicoll
Jens Wilke
Chris Dennis
Scott Frederick
rstoyanchev
hak7a3
izeye
dugenkui03
Madhura Bhave
Phillip Webb
mourezwell
Gary Russell