136 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
Madhura Bhave
f9d33ec1e2 Merge branch '2.7.x' into main 2022-02-23 15:10:48 -08:00
Madhura Bhave
0ecf43dbe2 Merge branch '2.6.x' into 2.7.x
Closes gh-29979
2022-02-23 15:10:30 -08:00
Madhura Bhave
894860c177 Merge branch '2.5.x' into 2.6.x
Closes gh-29978
2022-02-23 15:10:12 -08:00
Madhura Bhave
cc95f734d7 Clarify relation of import path to resultant properties in configtree import data
Closes gh-29606
2022-02-23 15:09:42 -08:00
Stephane Nicoll
f85ad61753 Merge branch '2.7.x' 2022-02-22 08:30:57 +01:00
Stephane Nicoll
d4db26dcc1 Merge branch '2.6.x' into 2.7.x
Closes gh-29935
2022-02-22 08:30:47 +01:00
Stephane Nicoll
db26aff792 Merge branch '2.5.x' into 2.6.x
Closes gh-29934
2022-02-22 08:30:38 +01:00
UbaidurRehman1
7b48c51689 Clarify that any property of the environment can be used in a banner
See gh-29931
2022-02-22 08:30:07 +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
Moritz Halbritter
829ff4d03f Merge branch '2.7.x' 2022-02-18 14:49:24 +01:00
Moritz Halbritter
2afa02c856 Fix missing test slice configuration
Test slices are now longer registered in spring.factories, but
TestSliceMetadata still looked there for them to generate documentation.
Fixed this so that TestSliceMetadata now looks in the right places for
test slices.

See gh-29873
2022-02-18 14:49:07 +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
9ab1b669d0 Polish 2022-02-16 17:56:07 -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
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
dreis2211
39394b9c2b Link to Integration section of the appendix for Kafka properties
See gh-29758
2022-02-14 14:25:40 +00:00
Moritz Halbritter
096ba72a39 Add documentation for WebMvc.fn
See gh-29683
2022-02-10 13:14:34 +01:00
Andy Wilkinson
819f40f81e Merge branch '2.7.x' 2022-02-09 13:39:28 +00:00
Andy Wilkinson
e4b074f07b Merge branch '2.6.x' into 2.7.x 2022-02-09 13:37:50 +00:00
Andy Wilkinson
f672a20f90 Polish appendix cross-references
See gh-29689
2022-02-09 13:24:05 +00:00
Andy Wilkinson
3b5e7ee0a8 Merge branch '2.7.x' 2022-02-09 12:19:21 +00:00
Andy Wilkinson
7e8d499333 Merge branch '2.6.x' into 2.7.x
Closes gh-29690
2022-02-09 12:18:57 +00:00
Andy Wilkinson
093e8a524d Merge branch '2.5.x' into 2.6.x
Closes gh-29689
2022-02-09 12:18:35 +00:00
Moritz Halbritter
52d9ba58d8 Move appendix subsections under appendix section
This involved a small code change to the generated configuration
properties snippets. The section id has to start with
'appendix.', otherwise the section-id asciidoctor extension
complains. To ensure that the anchors that are derived from the
section IDs remain backwards compatible, the anchor-rewrite
properties have been updated.

See gh-29667
2022-02-09 12:04:05 +00:00
Phillip Webb
a301d8ed5d Merge branch '2.7.x' 2022-02-04 19:50:54 -08:00
Phillip Webb
0e906dc6e2 Use convention based code imports
Closes gh-29647
2022-02-04 19:46:44 -08:00
Phillip Webb
0083b767e6 Merge branch '2.7.x' 2022-02-03 22:53:15 -08:00
Phillip Webb
4919683354 Use consistent packages for doc samples
Closes gh-29646
2022-02-03 22:50:47 -08:00
Andy Wilkinson
f88b502f7e Remove support for image banners
Closes gh-28883
2022-02-02 14:40:24 +00: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
Andy Wilkinson
191333773f Restore support for REST Assured
Closes gh-29543
2022-01-24 13:46:48 +00:00
Andy Wilkinson
e8cbec0836 Clarify documentation of RestTemplate customization
Closes gh-29394
2022-01-14 15:51:08 +00:00
Brian Clozel
b17412eb38 Fix Auto-configured Spring GraphQL Tests docs
Prior to this change, the reference docs would point to "spring-webflux"
as the required additional testing dependency to get
`WebGraphQlTester` support in Spring Boot tests.

While this is enough for `WebEnvironment.MOCK` tests, we need an actual
HTTP client for `WebEnvironment.RANDOM_PORT` tests. This commit amends
this part of the documentation to recommend the
"spring-boot-starter-webflux" dependency in all cases.

Fixes gh-29250
2022-01-10 10:10:10 +01:00
Andy Wilkinson
c2e86096cd Reinstate support for jOOQ as it now supports Jakarta EE 9
Closes gh-29271
2022-01-05 15:46:54 +00:00
Stephane Nicoll
e2f274f01d Merge branch '2.7.x' 2022-01-04 15:36:12 +01:00
Stephane Nicoll
9b34c31916 Polish "Include AbstractJdbcConfiguration beans in @DataJdbcTest"
See gh-29003
2022-01-04 15:32:23 +01:00
Brian Clozel
f61c87c3a7 Revert "Merge branch '2.7.x'"
This reverts commit f0677a119c54113f87f2d3bca7d5a4e34356234c, reversing
changes made to 938d58f32ce22e0256d63e7df5931ee3d8082050.
2021-12-21 09:05:06 +01:00
Brian Clozel
f0677a119c Merge branch '2.7.x' 2021-12-21 09:04:10 +01:00
Brian Clozel
22706057f0 Document Spring GraphQL support
This commit documents all the features added in the previous commits:
from the main infrastructure support, to testing and metrics.

See gh-29140
2021-12-21 08:34:56 +01:00
Stephane Nicoll
409f4fdbd7 Merge branch '2.7.x' 2021-12-20 12:37:39 +01:00
Stephane Nicoll
53654a0160 Merge branch '2.5.x' into 2.6.x
Closes gh-29133
2021-12-20 12:37:10 +01:00