Commit Graph

1255 Commits

Author SHA1 Message Date
Phillip Webb
39ef5ae2d5 Merge branch '3.4.x' 2025-04-03 18:06:48 -07:00
Phillip Webb
fc9937d05a Merge branch '3.3.x' into 3.4.x 2025-04-03 18:06:33 -07:00
Phillip Webb
88e8c17369 Update copyright year of changed files 2025-04-03 18:06:14 -07:00
Andy Wilkinson
f039c73db7 Move spring.codec properties to spring.http.codecs
Closes gh-44925
2025-04-01 20:22:49 +01:00
Andy Wilkinson
6ad48639c2 Back port 246c4a2 to 3.3.x
The changes do not apply cleanly when cherry-picked so they
have been redone manually.

Closes gh-44941
2025-03-28 16:48:50 +00:00
Andy Wilkinson
c5eb3942f1 Merge branch '3.4.x'
Closes gh-44915
2025-03-26 19:25:56 +00:00
Andy Wilkinson
68041de427 Merge branch '3.3.x' into 3.4.x
Closes gh-44914
2025-03-26 19:25:44 +00:00
Andy Wilkinson
86d11c90e2 Allow dockerTest tasks to be run in parallel through configuration
Closes gh-44913
2025-03-26 19:25:05 +00:00
Andy Wilkinson
49db6dd276 Merge branch '3.4.x'
Closes gh-44904
2025-03-26 10:58:32 +00:00
Andy Wilkinson
056429a65c Merge branch '3.3.x' into 3.4.x
Closes gh-44903
2025-03-26 10:55:53 +00:00
Andy Wilkinson
2f7d598f41 Check imported boms for unwanted dependency management
Closes gh-42523
2025-03-26 10:52:30 +00:00
Andy Wilkinson
14bade645f Merge branch '3.4.x' 2025-03-26 10:49:54 +00:00
Andy Wilkinson
9fa4e0d80c Merge branch '3.3.x' into 3.4.x 2025-03-26 10:48:49 +00:00
Andy Wilkinson
9cd6af9ecf Polish CheckBom task 2025-03-26 09:15:01 +00:00
Andy Wilkinson
e6b871352e Merge branch '3.4.x'
Closes gh-44899
2025-03-25 18:46:43 +00:00
Andy Wilkinson
a6ee681b48 Merge branch '3.3.x' into 3.4.x
Closes gh-44898
2025-03-25 18:40:59 +00:00
Andy Wilkinson
46a30e98bb Use ResolvedBom for bom checks
Closes gh-44897
2025-03-25 18:37:28 +00:00
Andy Wilkinson
0ea2775f23 Merge branch '3.4.x'
Closes gh-44896
2025-03-25 17:54:08 +00:00
Andy Wilkinson
d78a208730 Merge branch '3.3.x' into 3.4.x
Closes gh-44895
2025-03-25 17:53:53 +00:00
Andy Wilkinson
95d89fba94 Remove no-longer-used effective bom artifact
Closes gh-44894
2025-03-25 17:53:23 +00:00
Andy Wilkinson
14060a2116 Merge branch '3.4.x'
Closes gh-44893
2025-03-25 17:31:22 +00:00
Andy Wilkinson
32234545af Merge branch '3.3.x' into 3.4.x
Closes gh-44892
2025-03-25 17:31:10 +00:00
Andy Wilkinson
17be4bdb5f Use ResolvedBom as a source for AntoraAsciidocAttributes
Closes gh-44891
2025-03-25 17:30:28 +00:00
Andy Wilkinson
87dd03962c Merge branch '3.4.x'
Closes gh-44889
2025-03-25 17:06:19 +00:00
Andy Wilkinson
aa6d2f19fd Merge branch '3.3.x' into 3.4.x
Closes gh-44888
2025-03-25 17:06:06 +00:00
Andy Wilkinson
4f91d41666 Source version properties for Maven plugin tests from resolved bom
Closes gh-44886
2025-03-25 17:05:45 +00:00
Andy Wilkinson
a5a7788ebb Merge branch '3.4.x'
Closes gh-44882
2025-03-25 16:28:51 +00:00
Andy Wilkinson
42f5f63c8f Merge branch '3.3.x' into 3.4.x
Closes gh-44881
2025-03-25 16:28:41 +00:00
Andy Wilkinson
1047c2158a Use resolved bom as source of javadoc links
Closes gh-44878
2025-03-25 16:28:27 +00:00
Andy Wilkinson
13bff93a0c Merge branch '3.4.x'
Closes gh-44880
2025-03-25 14:54:25 +00:00
Andy Wilkinson
0a4f6b14ef Merge branch '3.3.x' into 3.4.x
Closes gh-44879
2025-03-25 14:54:00 +00:00
Andy Wilkinson
7b2d90811d Rewrite process for documenting managed dependencies
Previously, managed dependencies were documented using Gradle's
dependency constraints. This has proven to be non-deterministic for
reasons that are not fully understood. The working theory is that
the constraints that are documented vary depending on the tasks
that the build has run at the point at which the constraints are
being examined and documented.

This commit replaces approach with one that builds a model of a
resolved bom by examining the configured bom extension and the
XML of the Maven boms that it imports. This model is written to
disk from where it can then be consumed as a dependency on other
projects. The existing tasks for documenting the constrained
versions and version properties have been rewritten to use the
resolved bom model instead.

Closes gh-44855
2025-03-25 14:44:34 +00:00
Andy Wilkinson
95d5e35ff2 Provide @ConditionalOn… annotations for all concrete conditions
Closes gh-41044
2025-03-20 14:29:59 +00:00
Andy Wilkinson
cabe17bb51 Ensure that system tests have right JUnit Launcher version available
See gh-44780
2025-03-19 11:00:50 +00:00
Andy Wilkinson
be97e79ad6 Rationalize Groovy Template configuration properties
Previously, spring.groovy.template.configuration properties were
bound directly to GroovyMarkupConfigurer. This meant that the
properties had no description or default values in the metadata.
It also resulted in some duplicate where a specific
spring.groovy.template property was also provided.

This commit deprecates the spring.groovy.template.configuration.*
properties in favour of specific spring.groovy.template.* properties
that are mapped to the GroovyMarkupConfigurer.

Closes gh-44722
2025-03-17 16:03:34 +00:00
Phillip Webb
a55a6be4ed Merge branch '3.4.x' 2025-03-14 15:15:33 -07:00
Phillip Webb
6eb7d3411b Merge branch '3.3.x' into 3.4.x 2025-03-14 15:14:30 -07:00
Phillip Webb
896b5767fe Polish 2025-03-14 13:36:04 -07:00
Andy Wilkinson
19c386040b Merge branch '3.4.x'
Closes gh-44698
2025-03-12 15:49:41 +00:00
Andy Wilkinson
59ddba1063 Merge branch '3.3.x' into 3.4.x
Closes gh-44697
2025-03-12 15:48:36 +00:00
Andy Wilkinson
9b15b4bce9 Consolidate mock web server factories
Closes gh-44674
2025-03-12 15:26:47 +00:00
Andy Wilkinson
b61578d183 Merge branch '3.4.x'
Closes gh-44695
2025-03-12 12:54:27 +00:00
Andy Wilkinson
08b358e829 Merge branch '3.3.x' into 3.4.x
Closes gh-44694
2025-03-12 12:50:18 +00:00
Andy Wilkinson
3a6e4e9e58 Add checks for factories files
META-INF/spring.factories and META-INF/spring/aot.factories in the
main source set are now checked. The checks verify that:

- Each class listed in the values exists in the source set's output
- The classes are listed alphabetically
- Nested classes are identified using their binary name

Closes gh-44676
2025-03-12 12:44:18 +00:00
Stéphane Nicoll
ed5ec225a7 Merge branch '3.4.x'
Closes gh-44417
2025-02-24 08:04:36 +01:00
Stéphane Nicoll
f235d7e9ff Merge branch '3.3.x' into 3.4.x
Closes gh-44416
2025-02-24 08:01:46 +01:00
Johnny Lim
332ad7bb70 Polish
See gh-44323

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-24 07:46:25 +01:00
Phillip Webb
651a39b3f6 Merge branch '3.4.x' 2025-02-18 15:12:07 -08:00
Phillip Webb
eeced8c629 Merge branch '3.3.x' into 3.4.x 2025-02-18 15:11:51 -08:00
Phillip Webb
8aea6d575a Update copyright year of changed files 2025-02-18 15:11:35 -08:00