Commit Graph

2796 Commits

Author SHA1 Message Date
Andy Wilkinson
bfe9dede5b Merge branch '2.7.x' 2022-03-02 20:30:30 +00:00
Andy Wilkinson
936998647e Work around Gradle changing line endings during property expansion
There's a known issue [1] where property expansion changes the input
files line endings to the operating system's default. This causes
problems for us on Windows as the line endings become \r\n which
breaks our formatting checks.

This commit tunes the checkFormatMain task to exclude the generated
source files from checking. In their place, the original templates
are added. This ensures that the inputs are correctly formatted and,
therefore, that the output should be too (other than the line endings
on Windows).

Closes gh-30039

[1] https://github.com/gradle/gradle/issues/1151
2022-03-02 20:26:15 +00:00
Stephane Nicoll
525d5fd6e5 Merge branch '2.6.x' into 2.7.x
Closes gh-29994
2022-02-24 15:12:36 +01:00
Stephane Nicoll
0941cfd5fe Merge branch '2.5.x' into 2.6.x
Closes gh-29993
2022-02-24 15:12:26 +01:00
Stephane Nicoll
b60b5feefe Add explicit dependency on inject-api
This commit clarifies the build as a test needs inject-api and it works
only by side effect as another library has repackaged this API.

Closes gh-29990
2022-02-24 15:12:09 +01:00
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
Madhura Bhave
a7c7a8ef2f Merge branch '2.7.x' into main 2022-02-23 15:30:51 -08:00
Madhura Bhave
729c6993e1 Merge branch '2.6.x' into 2.7.x
Closes gh-29981
2022-02-23 15:29:36 -08:00
Madhura Bhave
acd1ba0eca Merge branch '2.5.x' into 2.6.x
Closes gh-29980
2022-02-23 15:28:17 -08:00
Madhura Bhave
67b13ee4c7 Document that placeholders in @DefaultValue annotations are not resolved
Closes gh-23164
2022-02-23 15:27:43 -08: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
Andy Wilkinson
132bf686f8 Merge branch '2.7.x' 2022-02-22 20:13:28 +00:00
Andy Wilkinson
2d9177dd9d Merge branch '2.6.x' into 2.7.x
Closes gh-29955
2022-02-22 20:11:47 +00:00
Andy Wilkinson
3614c8d1f8 Merge branch '2.5.x' into 2.6.x
Closes gh-29954
2022-02-22 20:08:31 +00:00
Andy Wilkinson
1e8d29f7aa Configure Kotlin compilation JVM target by convention
Closes gh-29952
2022-02-22 18:11:51 +00:00
Andy Wilkinson
1940f7a5d9 Merge branch '2.7.x' 2022-02-21 14:04:54 +00:00
Andy Wilkinson
6493c7c561 Merge branch '2.6.x' into 2.7.x
Closes gh-29922
2022-02-21 14:01:58 +00:00
Andy Wilkinson
fcd52c02a7 Merge branch '2.5.x' into 2.6.x
Closes gh-29921
2022-02-21 14:01:47 +00:00
Andy Wilkinson
55f68989d8 Remove redundant action to make plugins dat file reproducible
Closes gh-29917
2022-02-21 14:01:04 +00: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
d59b89cd82 Merge branch '2.7.x' 2022-02-21 09:25:57 +01:00
Stephane Nicoll
c5307a8bfe Merge branch '2.6.x' into 2.7.x
Closes gh-29916
2022-02-21 09:25:21 +01:00
Stephane Nicoll
c52f6f09ad Merge branch '2.5.x' into 2.6.x
Closes gh-29915
2022-02-21 09:25:08 +01:00
Stephane Nicoll
92cd51e6b0 Polish "Clarify log message with a profile containing a comma"
See gh-29896
2022-02-21 09:00:27 +01:00
gcoppex
c8466a14e9 Clarify log message with a profile containing a comma
See gh-29896
2022-02-21 08:28:10 +01:00
Andy Wilkinson
8209980ca0 Merge branch '2.7.x' 2022-02-18 19:02:54 +00:00
Andy Wilkinson
027093d852 Use a templated source file for SpringBootVersion
Closes gh-29670
2022-02-18 18:08:09 +00:00
Brian Clozel
78dde15da4 Merge branch '2.7.x' 2022-02-18 13:56:11 +01:00
Brian Clozel
940558c2a6 Merge branch '2.6.x' into 2.7.x
Closes gh-29906
2022-02-18 13:55:53 +01:00
Brian Clozel
16c47595e7 Merge branch '2.5.x' into 2.6.x
Closes gh-29905
2022-02-18 13:55:27 +01:00
Brian Clozel
00114f9d61 Deregister failed contexts from SpringApplicationShutdownHook
Prior to this change, SpringApplication would register contexts to
SpringApplicationShutdownHook and only deregister them when they're
properly closed. A failed refresh attempt does not deregister the
context from the shutdown hook.
When a test suite runs lots of tests failing because of failed contexts,
this can build up and consume lots of resources.

This commit fixes this leak and deregisters failed contexts.

Fixes gh-29874
2022-02-18 13:54:14 +01:00
Andy Wilkinson
2145396841 Merge branch '2.7.x' 2022-02-18 10:18:17 +00:00
Andy Wilkinson
fc8f55fbf4 Upgrade to OkHTTP 4.9.3
Closes gh-18506
2022-02-18 10:05:54 +00: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
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
Andy Wilkinson
2305b583f1 Merge branch '2.7.x' 2022-02-16 11:56:03 +00:00
Andy Wilkinson
18e49b0269 Fix H2 R2DBC URL on Windows
Closes gh-29875
2022-02-16 11:55:11 +00:00
Stephane Nicoll
7e1f17e5a6 Merge branch '2.7.x' 2022-02-15 16:21:08 +01:00
Stephane Nicoll
197203968a Merge branch '2.6.x' into 2.7.x
Closes gh-29823
2022-02-15 16:20:45 +01:00
Stephane Nicoll
f59e442978 Merge branch '2.5.x' into 2.6.x
Closes gh-29822
2022-02-15 16:19:59 +01:00
Stephane Nicoll
f3af035941 Remove usage of SocketUtils in tests
Closes gh-29821
2022-02-15 16:17:21 +01:00