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

3316 Commits

Author SHA1 Message Date
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
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
Moritz Halbritter
7872f61bfc Add @AutoConfiguration annotation support to the autoconfigure-processor 
See gh-29907
 2022-02-23 15:39:46 +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
1e1b2a062e Merge branch '2.7.x' 2022-02-18 11:42:32 +00:00
Andy Wilkinson
0e5a82522c Merge branch '2.6.x' into 2.7.x 
Closes gh-29904
 2022-02-18 11:42:21 +00:00
Andy Wilkinson
9da6fb4a5a Merge branch '2.5.x' into 2.6.x 
Closes gh-29903
 2022-02-18 11:42:10 +00:00
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
 2022-02-18 11:41:24 +00: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
896345df23 Fix test 2022-02-17 11:56:38 +01: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