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
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
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
f4b849ec95
Merge branch '2.7.x'
2022-02-16 20:27:18 -08:00
Phillip Webb
26512f8ac6
Merge branch '2.6.x' into 2.7.x
2022-02-16 20:24:59 -08:00
Phillip Webb
5b4ec32645
Merge branch '2.5.x' into 2.6.x
2022-02-16 18:56:12 -08:00
Phillip Webb
c86b1330cf
Update copyright year of changed files
2022-02-16 17:56:19 -08:00
Scott Frederick
79e5d3a2d0
Merge branch '2.7.x' into main
2022-02-11 14:45:00 -06:00
Scott Frederick
f80490bafb
Precompute Spring Boot version at build time
...
Closes gh-29670
2022-02-11 14:44:28 -06: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
Andy Wilkinson
977a0a8356
Merge branch '2.7.x'
2022-02-05 10:07:41 +00:00
Andy Wilkinson
2fec7b8562
Only use Kotlin 1.6 API and language versions in docs project
...
To preserve our existing Kotlin 1.3 baseline, we should compile our
Kotlin code with Kotlin 1.3 API and language versions. At the same
time, we want our documentation to use modern Kotlin. This commit
restores the 1.3 convention and overrides it to 1.6 in the docs
project. This maintains our Kotlin 1.3 baseline while also allowing
the Kotlin code examples to use 1.6 API and language features.
Closes gh-29654
2022-02-05 09:54:00 +00:00
Phillip Webb
a6b7ae2110
Merge branch '2.7.x'
2022-02-04 19:45:01 -08:00
Phillip Webb
71695d2162
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29658
2022-02-04 19:44:31 -08:00
Phillip Webb
05c58a18df
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29657
2022-02-04 19:44:05 -08:00
Phillip Webb
12a33a2eaf
Upgrade to spring-asciidoctor-backends 0.0.3
...
Closes gh-29656
2022-02-04 19:43:47 -08:00
Phillip Webb
50047e6d8c
Merge branch '2.7.x'
2022-02-04 16:10:50 -08:00
Phillip Webb
6c74e24147
Update copyright year of changed files
2022-02-04 16:09:35 -08:00
Phillip Webb
8ed5d15cd3
Merge branch '2.7.x'
2022-02-04 16:08:29 -08:00
Phillip Webb
d33d92dfce
Polish KotlinConventions
2022-02-04 16:08:08 -08:00
Phillip Webb
f8c2bff825
Use Kotlin 1.6 for API and language version
...
Closes gh-29654
2022-02-04 16:07:37 -08:00
Phillip Webb
a726210afc
Merge branch '2.7.x'
2022-02-02 19:05:39 -08:00
Phillip Webb
546cad06db
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29635
2022-02-02 19:01:29 -08:00
Phillip Webb
c01cee18b5
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29634
2022-02-02 19:01:09 -08:00
Phillip Webb
79fc77fade
Upgrade to spring-javaformat 0.0.31
...
Closes gh-29633
2022-02-02 19:00:28 -08:00
Andy Wilkinson
f2ac7d10ef
Merge branch '2.7.x'
2022-01-25 12:19:51 +00:00
Andy Wilkinson
8480abca20
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29561
2022-01-25 12:19:37 +00:00
Andy Wilkinson
fe43d527b5
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29560
2022-01-25 12:19:16 +00:00
Andy Wilkinson
3ed65f2383
Avoid running Maven plugin ITs for each s-b-dependencies change
...
Closes gh-28781
2022-01-25 12:11:19 +00:00
Andy Wilkinson
b8983cef59
Merge branch '2.7.x'
2022-01-24 15:11:51 +00:00
Andy Wilkinson
cd426fd21e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29547
2022-01-24 15:10:28 +00:00
Andy Wilkinson
75c3bff765
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29546
2022-01-24 15:10:08 +00:00
Andy Wilkinson
761bed6c48
Upgrade buildSrc to Spring Framework 5.3.15
...
Closes gh-29545
2022-01-24 14:19:47 +00:00
Phillip Webb
fb83e6930d
Merge branch '2.7.x'
2022-01-19 13:35:20 -08:00
Phillip Webb
b31e9d6b4a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29492
2022-01-19 13:35:07 -08:00
Phillip Webb
1f61c36f7a
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29491
2022-01-19 13:33:36 -08:00
Andy Wilkinson
66428527e0
Minimize tasks run in ConventionsPluginTests
...
Update `ConventionsPluginTests` so that dependency resolution is
not required. This provides a work-around for our currently failing
Windows build.
Closes gh-29490
2022-01-19 13:31:40 -08:00
Andy Wilkinson
12cd97a20c
Reinstate support for Thymeleaf
2022-01-18 16:01:29 +00:00