fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,265 Commits 22 Branches 339 Tags
Commit Graph

3271 Commits

Author SHA1 Message Date
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
c0ffb35668 Update copyright year of changed files 2022-02-16 20:43:10 -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
Stephane Nicoll
3b4832445b Merge branch '2.7.x' 2022-02-05 14:02:00 +01:00
Stephane Nicoll
098a57affb Upgrade to R2DBC Borca-RELEASE 
See gh-28524
 2022-02-05 13:37:20 +01:00
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>
 2022-02-05 13:36:53 +01:00
Phillip Webb
6c74e24147 Update copyright year of changed files 2022-02-04 16:09:35 -08:00
Stephane Nicoll
b22e3d51dc Merge branch '2.7.x' 2022-02-04 10:10:29 +01:00
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
8885964a56 Merge branch '2.7.x' 2022-02-04 09:54:11 +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
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
Stephane Nicoll
41fb9cf562 Merge branch '2.7.x' 2022-02-01 11:15:49 +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