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
4f49e8c990
Polish JavaDoc
2022-02-18 13:14:42 +01:00
1e1b2a062e
Merge branch '2.7.x'
2022-02-18 11:42:32 +00:00
0e5a82522c
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29904
2022-02-18 11:42:21 +00:00
9da6fb4a5a
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29903
2022-02-18 11:42:10 +00:00
c676b8b84d
Remove KafkaPropertiesKafka24Tests
...
We now use Kafka 2.7 by default so tests against 2.4 are no longer
required.
Closes gh-29882
2022-02-18 11:41:24 +00:00
41d516cb4f
Merge branch '2.7.x'
2022-02-18 11:23:54 +00:00
b6fea07001
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29902
2022-02-18 11:23:28 +00:00
0cebb332d1
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29901
2022-02-18 11:08:21 +00:00
ac38a5a3e9
Update javadoc to reflect move to SecurityFilterChain
...
Closes gh-29900
2022-02-18 11:05:48 +00:00
cb69d01e04
Merge branch '2.7.x' into main
2022-02-17 19:07:24 -06:00
42328771ad
Suppress deprecation warnings for WebSecurityConfigurerAdapter
...
Fixes gh-29897
2022-02-17 19:06:13 -06:00
896345df23
Fix test
2022-02-17 11:56:38 +01:00
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
7c96294641
Move our auto-configurations from spring.factories to new file
...
Closes gh-29873
2022-02-17 10:18:46 +01:00
303979fb65
Merge branch '2.7.x'
2022-02-17 09:17:35 +01:00
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
ff4b92a3ba
Update copyright year of changed files
2022-02-16 20:44:54 -08:00
37263ea7dd
Merge branch '2.7.x'
2022-02-16 20:43:21 -08:00
c0ffb35668
Update copyright year of changed files
2022-02-16 20:43:10 -08:00
4092afc98f
Polish
2022-02-16 20:42:58 -08:00
bf1ed5f2f8
Update copyright header on changed files
2022-02-16 14:24:22 -08:00
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
fdb1010cbc
Migrate auto-configurations to @AutoConfiguration
...
Closes gh-29871
2022-02-16 15:48:27 +01:00
8e99788fc8
Migrate auto-configurations to @AutoConfiguration
...
Closes gh-29871
2022-02-16 13:55:16 +01:00
cb08065ece
Merge branch '2.7.x'
2022-02-16 11:55:46 +01:00
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
7d83dfc0c7
Reinstate support for H2 Console
...
See gh-29755
Closes gh-29755
2022-02-14 13:24:57 +00:00
15e14e23c9
Start building against Spring Kafka 2.8.3 snapshots
...
See gh-29759
2022-02-14 08:22:13 +01:00
d9acde2961
Merge branch '2.7.x'
2022-02-11 12:28:22 +00:00
0c15fab881
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29744
2022-02-11 12:26:15 +00:00
b74f668254
Only auto-configure WebSessionIdResolver in reactive web app
...
Closes gh-29669
2022-02-11 12:09:45 +00:00
d14450dc88
Merge branch '2.7.x'
2022-02-10 17:13:39 +00:00
fc5ede7b94
Polish "Auto-configure Spring rather than Nimbus opaque token introspectors"
...
See gh-29572
2022-02-10 17:11:04 +00:00
131ea706c7
Auto-configure Spring rather than Nimbus opaque token introspectors
...
See gh-29572
2022-02-10 16:50:06 +00:00
4c3289395a
Merge branch '2.7.x'
2022-02-10 15:05:51 +00:00
c761dc517b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29732
2022-02-10 15:05:15 +00:00
197ba9ebc9
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29731
2022-02-10 15:04:58 +00:00
64ee54423a
Polish "Configure ForwardedHeaderFilter with Tomcat's use relative redirects"
...
See gh-29333
2022-02-10 15:01:57 +00:00
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
3b4832445b
Merge branch '2.7.x'
2022-02-05 14:02:00 +01:00
098a57affb
Upgrade to R2DBC Borca-RELEASE
...
See gh-28524
2022-02-05 13:37:20 +01:00
8c8c9c5f28
Upgrade to H2 2.1.210
...
H2 2.x contains several important changes such as moving the primary key
generation mechanism to a sequence-based identifier. This commit fixes
a number of tests that were failing.
Closes gh-29651
Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>
2022-02-05 13:36:53 +01:00
6c74e24147
Update copyright year of changed files
2022-02-04 16:09:35 -08:00
b22e3d51dc
Merge branch '2.7.x'
2022-02-04 10:10:29 +01:00
e3d0f1feee
Adjust IDENTITY in DDLs for H2 2.x compatibility
...
See gh-29200
2022-02-04 09:57:59 +01:00
8885964a56
Merge branch '2.7.x'
2022-02-04 09:54:11 +01:00
37c1f47902
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29650
2022-02-04 09:53:42 +01:00
03d393bc4c
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29649
2022-02-04 09:50:47 +01:00
48649192cb
Fix schema file name for Batch auto-configuration tests
...
Closes gh-29648
2022-02-04 09:49:15 +01:00
a282f912e6
Organize imports
...
Organize imports according to updated checkstyle rules.
2022-02-02 19:16:13 -08:00
a05903b9d1
Polish GraphQL auto-configuration
2022-02-02 12:57:17 -08:00
501d174db0
Merge branch '2.7.x'
2022-02-02 10:38:46 -08:00
e749f30642
Merge branch '2.7.x'
2022-02-01 16:35:39 +01:00
9028ab33f2
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29617
2022-02-01 16:35:28 +01:00
d130819fb4
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29616
2022-02-01 16:35:19 +01:00
5fe6176966
Polish "Add a note on early init with @ConditionalOnExpression"
...
See gh-29276
2022-02-01 16:32:27 +01:00
fce3cd1684
Add a note on early init with @ConditionalOnExpression
...
See gh-29276
2022-02-01 16:24:13 +01:00
41fb9cf562
Merge branch '2.7.x'
2022-02-01 11:15:49 +01:00
f812b33cbd
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29613
2022-02-01 11:07:31 +01:00
136b5959c3
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29612
2022-02-01 10:59:08 +01:00
7f17f819a6
Polish "Enforce use of BDDMockito"
...
See gh-29178
2022-02-01 10:03:18 +01:00
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
7b35fabf07
Upgrade to Derby 10.15.2.0
...
Closes gh-29509
2022-01-20 17:37:01 +00:00
5b1486cc26
Merge branch '2.5.x' into 2.6.x
2022-01-19 15:54:19 -08:00
d211b0f3b3
Disable test is Docker is not available
...
See gh-28843
2022-01-19 15:53:07 -08:00
a3bfc67249
Merge branch '2.7.x'
2022-01-19 19:09:25 +00:00
1e4b786ff9
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29489
2022-01-19 19:09:09 +00:00
6bea2172cb
Switch tests to properties that are not deprecated
...
Closes gh-29488
2022-01-19 19:08:31 +00:00
0829dcd572
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29486
2022-01-19 17:27:51 +00:00
Phillip Webb
Moritz Halbritter
Andy Wilkinson
Stephane Nicoll
Scott Frederick
dugenkui03
mourezwell
Gary Russell
Madhura Bhave
Henning Poettker
Lukas Kuster
Guirong Hu
Mihail Cornescu
Yanming Zhou