fcd52c02a7
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29921
2022-02-21 14:01:47 +00:00
55f68989d8
Remove redundant action to make plugins dat file reproducible
...
Closes gh-29917
2022-02-21 14:01:04 +00:00
d42f675959
Merge branch '2.7.x'
2022-02-21 10:36:05 +01:00
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
8209980ca0
Merge branch '2.7.x'
2022-02-18 19:02:54 +00:00
027093d852
Use a templated source file for SpringBootVersion
...
Closes gh-29670
2022-02-18 18:08:09 +00:00
829ff4d03f
Merge branch '2.7.x'
2022-02-18 14:49:24 +01:00
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
303979fb65
Merge branch '2.7.x'
2022-02-17 09:17:35 +01:00
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
f4b849ec95
Merge branch '2.7.x'
2022-02-16 20:27:18 -08:00
26512f8ac6
Merge branch '2.6.x' into 2.7.x
2022-02-16 20:24:59 -08:00
5b4ec32645
Merge branch '2.5.x' into 2.6.x
2022-02-16 18:56:12 -08:00
c86b1330cf
Update copyright year of changed files
2022-02-16 17:56:19 -08:00
79e5d3a2d0
Merge branch '2.7.x' into main
2022-02-11 14:45:00 -06:00
f80490bafb
Precompute Spring Boot version at build time
...
Closes gh-29670
2022-02-11 14:44:28 -06:00
3b5e7ee0a8
Merge branch '2.7.x'
2022-02-09 12:19:21 +00:00
7e8d499333
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29690
2022-02-09 12:18:57 +00:00
093e8a524d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29689
2022-02-09 12:18:35 +00:00
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
977a0a8356
Merge branch '2.7.x'
2022-02-05 10:07:41 +00:00
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
a6b7ae2110
Merge branch '2.7.x'
2022-02-04 19:45:01 -08:00
71695d2162
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29658
2022-02-04 19:44:31 -08:00
05c58a18df
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29657
2022-02-04 19:44:05 -08:00
12a33a2eaf
Upgrade to spring-asciidoctor-backends 0.0.3
...
Closes gh-29656
2022-02-04 19:43:47 -08:00
50047e6d8c
Merge branch '2.7.x'
2022-02-04 16:10:50 -08:00
6c74e24147
Update copyright year of changed files
2022-02-04 16:09:35 -08:00
8ed5d15cd3
Merge branch '2.7.x'
2022-02-04 16:08:29 -08:00
d33d92dfce
Polish KotlinConventions
2022-02-04 16:08:08 -08:00
f8c2bff825
Use Kotlin 1.6 for API and language version
...
Closes gh-29654
2022-02-04 16:07:37 -08:00
a726210afc
Merge branch '2.7.x'
2022-02-02 19:05:39 -08:00
546cad06db
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29635
2022-02-02 19:01:29 -08:00
c01cee18b5
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29634
2022-02-02 19:01:09 -08:00
79fc77fade
Upgrade to spring-javaformat 0.0.31
...
Closes gh-29633
2022-02-02 19:00:28 -08:00
f2ac7d10ef
Merge branch '2.7.x'
2022-01-25 12:19:51 +00:00
8480abca20
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29561
2022-01-25 12:19:37 +00:00
fe43d527b5
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29560
2022-01-25 12:19:16 +00:00
3ed65f2383
Avoid running Maven plugin ITs for each s-b-dependencies change
...
Closes gh-28781
2022-01-25 12:11:19 +00:00
b8983cef59
Merge branch '2.7.x'
2022-01-24 15:11:51 +00:00
cd426fd21e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29547
2022-01-24 15:10:28 +00:00
75c3bff765
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29546
2022-01-24 15:10:08 +00:00
761bed6c48
Upgrade buildSrc to Spring Framework 5.3.15
...
Closes gh-29545
2022-01-24 14:19:47 +00:00
fb83e6930d
Merge branch '2.7.x'
2022-01-19 13:35:20 -08:00
b31e9d6b4a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29492
2022-01-19 13:35:07 -08:00
1f61c36f7a
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29491
2022-01-19 13:33:36 -08:00
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
12cd97a20c
Reinstate support for Thymeleaf
2022-01-18 16:01:29 +00:00
119b920969
Merge branch '2.7.x'
2022-01-02 11:30:28 +01:00
f3d99f9ccc
Merge branch '2.6.x' into 2.7.x
2022-01-02 11:30:22 +01:00
01c19ef444
Merge branch '2.5.x' into 2.6.x
2022-01-02 11:30:11 +01:00
a0537888f5
Upgrade build to Log4j 2.17.1
2022-01-02 11:29:56 +01:00
3ef03cddb9
Merge branch '2.7.x'
2022-01-02 11:26:04 +01:00
9c868751d6
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29199
2022-01-02 11:25:56 +01:00
f54ea67ed6
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29198
2022-01-02 11:25:46 +01:00
7a87d18b12
Update copyrights to 2022
...
See gh-29195
2022-01-02 11:24:58 +01:00
f61c87c3a7
Revert "Merge branch '2.7.x'"
...
This reverts commit f0677a119c938d58f32c
2021-12-21 09:05:06 +01:00
f0677a119c
Merge branch '2.7.x'
2021-12-21 09:04:10 +01:00
de808834f5
Auto-configure Spring GraphQL base infrastructure
...
This commit adds the auto-configuration for setting up the base Spring
GraphQL infrastructure. Because GraphQL doesn't depend on any particular
transport, we must have a separate configuration for creating:
* the `GraphQlSource`, which holds the schema and the `GraphQL` instance
* the `GraphQlService` for executing incoming requests
* the `BatchLoaderRegistry` for batch loading support
* the `AnnotatedControllerConfigurer` for supporting the annotated
controllers programming model
This comes with a starting point for the `"spring.graphql.*"`
configuration properties; we can now configure the locations and file
extensions of GraphQL schema files we should load and configure at
startup.
See gh-29140
2021-12-21 08:32:37 +01:00
34f96514ad
Fix link to source code in snapshot documentation
...
Fixes gh-28856
2021-12-20 10:49:07 -08:00
e994ee3be5
Merge branch '2.7.x'
...
See gh-28986
2021-12-18 17:54:06 +01:00
821f7086d9
Merge branch '2.6.x' into 2.7.x
...
See gh-28985
2021-12-18 17:53:59 +01:00
e048562c34
Merge branch '2.5.x' into 2.6.x
...
See gh-28984
2021-12-18 17:53:39 +01:00
21e54a595e
Upgrade Build to Log4j 2.17.0
...
See gh-28983
2021-12-18 17:53:30 +01:00
003fb229fd
Merge branch '2.7.x'
2021-12-16 13:07:22 -08:00
f3bcbca841
Update copyright year of changed files
2021-12-16 13:05:17 -08:00
07243539bd
Remove unused import
...
See gh-29029
2021-12-15 14:30:12 -06:00
caf49783d4
Merge branch '2.7.x'
2021-12-15 14:06:55 -06:00
a773af0387
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29073
2021-12-15 14:05:31 -06:00
9e6709eda0
Enable caching for system tests in CI
...
Setting the `systemTest` Gradle task output as never up-to-date ensures
that all system tests are executed each time they are run in CI. The
`--rerun-tasks` Gradle option that was used previously had the same
effect but also disabled build caching.
Closes gh-29029
2021-12-15 14:04:17 -06:00
1c72330bd9
Upgrade to Log4j2 2.16.0
...
Closes gh-28986
2021-12-15 09:31:43 +01:00
894eb83e66
Upgrade to Log4j2 2.16.0
...
Closes gh-28985
2021-12-15 09:31:04 +01:00
15ade0b5d3
Upgrade to Log4j2 2.16.0
...
Closes gh-28984
2021-12-15 09:30:10 +01:00
4c57d1717d
Upgrade to Log4j2 2.16.0
...
Closes gh-28983
2021-12-15 09:28:44 +01:00
9f07bb50b2
Merge branch '2.7.x'
2021-12-14 09:50:51 +01:00
0c1a8c2c5e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29009
2021-12-14 09:50:41 +01:00
91593eeea3
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29008
2021-12-14 09:50:30 +01:00
43f3d0dea0
Upgrade Build to Log4j 2.15.0
...
See gh-29006
2021-12-14 09:42:46 +01:00
91faec3917
Merge branch '2.7.x'
2021-12-01 12:17:34 +00:00
51e0fc4b6b
Merge branch '2.6.x' into 2.7.x
...
See gh-28879
2021-12-01 12:17:10 +00:00
f0f0aa5c46
Merge branch '2.5.x' into 2.6.x
...
See gh-28878
2021-12-01 12:16:37 +00:00
8322dda8cc
Fix variant selection in spring-boot-maven-plugin
...
See gh-28877
2021-12-01 12:16:14 +00:00
95025d442f
Merge branch '2.7.x'
2021-12-01 11:21:54 +00:00
bad05a7860
Merge branch '2.6.x' into 2.7.x
...
Closes gh-28879
2021-12-01 11:21:24 +00:00
c7c7592899
Merge branch '2.5.x' into 2.6.x
...
Closes gh-28878
2021-12-01 11:21:04 +00:00
25bdc097a0
Make poms of all dependencies available in int test repo
...
Closes gh-28877
2021-12-01 11:20:21 +00:00
87a5b72aa5
Merge branch '2.7.x'
2021-11-30 19:27:53 +00:00
f3957b7639
Merge branch '2.6.x' into 2.7.x
...
Closes gh-28865
2021-11-30 19:27:11 +00:00
9d4375bc12
Merge branch '2.5.x' into 2.6.x
...
Closes gh-28864
2021-11-30 19:26:22 +00:00
572bd6ca5c
Upgrade to test-retry-gradle-plugin 1.3.1
...
Closes gh-28863
2021-11-30 19:26:09 +00:00
015dca1956
Remove support for Thymeleaf
...
Closes gh-28611
2021-11-30 15:55:47 +00:00
8bf2ffd93c
Drop support for Jersey until jersey-spring6 is available
...
Closes gh-28808
2021-11-30 15:39:39 +00:00
900085628a
Raise the minimum supported version of Java to 17
...
Closes gh-28101
2021-11-30 15:37:40 +00:00
814c86c5e8
Raise the minimum supported version of Gradle to 7.3
...
Closes gh-28100
2021-11-30 15:36:54 +00:00
75c117a33f
Prepare 2.7.x branch
2021-11-30 15:02:11 +00:00
354a18c9a6
Prepare 2.6.x branch
2021-11-30 10:36:19 +00:00
beb68671bb
Update copyright year of changed files
2021-11-24 10:23:32 -08:00
381c094c41
Merge branch '2.5.x'
2021-11-19 13:39:37 +00:00
8f0e12dc34
Revert accidentally committed changes
...
This partially reverts commit c083e0b049
2021-11-19 13:39:22 +00:00
c0d90dfa8f
Merge branch '2.5.x'
...
Closes gh-28749
2021-11-19 13:36:01 +00:00
c083e0b049
Avoid using temp before @TempDir has initialized it
...
Closes gh-28748
2021-11-19 13:35:30 +00:00
00fa0fb769
Merge branch '2.5.x'
...
Closes gh-28746
2021-11-19 10:19:14 +00:00
f2b959b0a5
Add <type>zip</type> to Elasticsearch dist in dependencies bom
...
Fixes gh-28725
2021-11-19 10:13:14 +00:00
2a342ef416
Merge branch '2.5.x'
...
Closes gh-28662
2021-11-12 23:40:35 +00:00
5e4a502b2d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28661
2021-11-12 20:31:25 +00:00
2cec3971d7
Prohibit unwanted dependencies in all modules not just starters
...
Closes gh-28658
2021-11-12 20:04:35 +00:00
51dc02e37b
Merge branch '2.5.x'
...
See gh-28485
2021-10-29 17:18:52 +01:00
28d323ee3a
Merge branch '2.4.x' into 2.5.x
...
See gh-28484
2021-10-29 17:18:30 +01:00
b9e3660833
Revert running tests in parallel
...
See gh-19876
2021-10-29 17:18:13 +01:00
c7a2d61aee
Merge branch '2.4.x'
...
Closes gh-28485
2021-10-29 13:48:36 +01:00
7fe6f4887c
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28484
2021-10-29 13:48:23 +01:00
22d85e6d7b
Allow tests to be run in parallel across multiple workers
...
Closes gh-19876
2021-10-29 12:48:45 +01:00
66aa713b85
Merge branch '2.5.x'
2021-10-14 17:41:06 -07:00
467e063d4b
Merge branch '2.4.x' into 2.5.x
2021-10-14 17:40:47 -07:00
8e704aab48
Restore 'javax.xml.bind:jaxb-api' exclusion
...
Restore the 'javax.xml.bind:jaxb-api' exclusion from `xmlunit-core`
which is actually required when using Maven on Java 9+.
The `CheckClasspathForUnnecessaryExclusions` cannot deal with profile
specific dependencies so an exception has been hard coded.
See gh-28332
2021-10-14 17:38:05 -07:00
e95b0b5257
Polish
2021-10-14 17:37:48 -07:00
37a7144426
Merge branch '2.5.x'
...
Closes gh-28343
2021-10-14 14:26:57 +01:00
1a30c660f3
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28342
2021-10-14 14:22:25 +01:00
adb9226dec
Prohibit org.apache.geronimo.specs dependencies in our starters
...
Closes gh-28338
2021-10-14 14:19:21 +01:00
2d837a6eae
Merge branch '2.5.x'
...
Closes gh-28337
2021-10-14 13:48:08 +01:00
3800f060b5
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28336
2021-10-14 13:42:54 +01:00
2fb8c8d27e
Check starters for unnecessary exclusions
...
Closes gh-28332
2021-10-14 13:37:53 +01:00
191b50241d
Merge branch '2.5.x'
...
Closes gh-28331
2021-10-14 10:13:37 +01:00
d3037103fe
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28330
2021-10-14 10:13:24 +01:00
9f13941c2f
Prohibit org.jboss.spec.* dependencies
...
Closes gh-28329
2021-10-14 10:09:30 +01:00
2034ad4827
Merge branch '2.5.x'
2021-10-13 18:48:18 -07:00
02b577390f
Merge branch '2.4.x' into 2.5.x
2021-10-13 18:47:51 -07:00
0561992c2a
Update copyright year of changed files
2021-10-13 18:45:38 -07:00
1a505964ee
Merge branch '2.5.x'
...
Closes gh-28207
2021-10-06 10:03:24 +01:00
1931104d13
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28206
2021-10-06 09:57:19 +01:00
9c9fbf400e
Upgrade to Spring Java Format 0.0.29
...
Closes gh-28205
2021-10-06 09:52:45 +01:00
0b58d4858d
Merge branch '2.5.x'
...
Closes gh-28200
2021-10-05 11:13:20 +01:00
322615d9c5
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28199
2021-10-05 11:12:48 +01:00
8c3820f87e
Fix up-to-date checking of syncAppSource tasks
...
Previously, the project version was used while filtering the apps
source during syncing but it was not considered as an input to
the task. This could result in the syncing being skipped even though
the project's version had changed.
This commit introduces a new custom task to make the configuration
more declarative and to allow the necessary input configuration to be
done in a single place.
Closes gh-28197
2021-10-05 11:08:22 +01:00
ea68672594
Merge branch '2.5.x'
...
Closes gh-28153
2021-09-30 17:06:09 +01:00
9e484e2cdc
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28152
2021-09-30 17:05:39 +01:00
3824512357
Tighten up build's task interdependencies
...
Closes gh-28103
2021-09-30 15:35:39 +01:00
cf0fcafd13
Polish
...
See gh-27940
2021-09-21 08:08:29 +02:00
7c034c33e2
Merge branch '2.5.x'
...
Closes gh-27967
2021-09-13 10:48:19 +01:00
f530819d68
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27966
2021-09-13 10:47:47 +01:00
273600bcdd
Retain distinction between compile and runtime deps of optional deps
...
Previously, the optional configuration was added to the compile and
runtime classpaths of each source set and the the javadoc classpath
as well. This had a few disadvantages, the most notable of which is
that it meant that the configuration was ifrst resolved and then
the outcome of the resolution was added to the compile and runtime
classpaths. As a result, none of the attributes on the compile and
runtime classpaths were considered to influence variant selection.
This commit reworks the optional dependencies plugin so that the
compile and runtime classpaths of each source set are now configured
to extend from the optional configuration. This allows each
classpath configuration's attributes to influence the dependencies
that are selected from the optional configuration during resolution.
For example, when resolving the compile classpath, compile
dependencies (Usage.JAVA_API) will be selected and when resolving the
runtime classpath, runtime dependencies (Usage.JAVA_RUNTIME) will be
selected.
The above-described change means that runtime dependencies of an
optional dependencies will no longer leak into the compile classpath.
As a result of this, our Gradle plugin's test infrastructure has
been updated so that it no longer references runtime dependencies of
the Kotlin Gradle plugin at compile time.
Closes gh-27965
2021-09-13 10:47:14 +01:00
69d4e273d3
Merge branch '2.5.x'
...
Closes gh-27787
2021-08-20 13:56:09 +01:00
3566e5881b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27786
2021-08-20 13:54:02 +01:00
9f402f0428
Use snapshot rather than libs-snapshot when generating effective bom
...
Closes gh-27785
2021-08-20 13:53:34 +01:00
fd2fbcb3c6
Merge branch '2.5.x'
...
Closes gh-27758
2021-08-18 18:28:34 +01:00
6d8ba3e8b1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27757
2021-08-18 17:56:32 +01:00
ffbd28b60a
Polish "Polish access modifiers for test classes"
...
See gh-27736
2021-08-18 17:52:42 +01:00
8a425dedfd
Polish access modifiers for test classes
...
See gh-27736
2021-08-18 17:38:40 +01:00
2dfdcf5e88
Merge branch '2.5.x'
...
Closes gh-27754
2021-08-18 13:52:23 +01:00
0d904b8868
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27753
2021-08-18 13:51:49 +01:00
Andy Wilkinson
Moritz Halbritter
Phillip Webb
Scott Frederick
Moritz Halbritter
Stephane Nicoll
dreis2211
Brian Clozel
Madhura Bhave
Arun Suresh
izeye