Commit Graph

493 Commits

Author SHA1 Message Date
Andy Wilkinson
1e8d29f7aa Configure Kotlin compilation JVM target by convention
Closes gh-29952
2022-02-22 18:11:51 +00:00
Andy Wilkinson
834f07083d Merge branch '2.7.x' 2022-02-21 14:24:34 +00:00
Andy Wilkinson
43c339824c Merge branch '2.6.x' into 2.7.x
Closes gh-29924
2022-02-21 14:24:23 +00:00
Andy Wilkinson
30fcc195b4 Merge branch '2.5.x' into 2.6.x
Closes gh-29923
2022-02-21 14:24:00 +00:00
Andy Wilkinson
4cb8ae6c8a Try to avoid hitting secondary rate limit when opening issues
GitHub employs a secondary rate limit for actions that can trigger
notifications, such as opening a new issue. To avoid hitting this
limit, they recommend [1] waiting at least one second between each
request.

This commit attempts to comply with this guidance by adding a
one-second sleep prior to each POST request that opens an issue.

Closes gh-29879

[1] https://docs.github.com/en/rest/guides/best-practices-for-integrators#dealing-with-secondary-rate-limits
2022-02-21 14:19:08 +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
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
Stephane Nicoll
119b920969 Merge branch '2.7.x' 2022-01-02 11:30:28 +01:00
Stephane Nicoll
f3d99f9ccc Merge branch '2.6.x' into 2.7.x 2022-01-02 11:30:22 +01:00
Stephane Nicoll
01c19ef444 Merge branch '2.5.x' into 2.6.x 2022-01-02 11:30:11 +01:00
Stephane Nicoll
a0537888f5 Upgrade build to Log4j 2.17.1 2022-01-02 11:29:56 +01:00
Stephane Nicoll
3ef03cddb9 Merge branch '2.7.x' 2022-01-02 11:26:04 +01:00
Stephane Nicoll
9c868751d6 Merge branch '2.6.x' into 2.7.x
Closes gh-29199
2022-01-02 11:25:56 +01:00
Stephane Nicoll
f54ea67ed6 Merge branch '2.5.x' into 2.6.x
Closes gh-29198
2022-01-02 11:25:46 +01:00
dreis2211
7a87d18b12 Update copyrights to 2022
See gh-29195
2022-01-02 11:24:58 +01:00
Brian Clozel
f61c87c3a7 Revert "Merge branch '2.7.x'"
This reverts commit f0677a119c, reversing
changes made to 938d58f32c.
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
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
Madhura Bhave
34f96514ad Fix link to source code in snapshot documentation
Fixes gh-28856
2021-12-20 10:49:07 -08:00
Stephane Nicoll
e994ee3be5 Merge branch '2.7.x'
See gh-28986
2021-12-18 17:54:06 +01:00
Stephane Nicoll
821f7086d9 Merge branch '2.6.x' into 2.7.x
See gh-28985
2021-12-18 17:53:59 +01:00
Stephane Nicoll
e048562c34 Merge branch '2.5.x' into 2.6.x
See gh-28984
2021-12-18 17:53:39 +01:00
Stephane Nicoll
21e54a595e Upgrade Build to Log4j 2.17.0
See gh-28983
2021-12-18 17:53:30 +01:00
Phillip Webb
003fb229fd Merge branch '2.7.x' 2021-12-16 13:07:22 -08:00
Phillip Webb
f3bcbca841 Update copyright year of changed files 2021-12-16 13:05:17 -08:00
Scott Frederick
07243539bd Remove unused import
See gh-29029
2021-12-15 14:30:12 -06:00
Scott Frederick
caf49783d4 Merge branch '2.7.x' 2021-12-15 14:06:55 -06:00
Scott Frederick
a773af0387 Merge branch '2.6.x' into 2.7.x
Closes gh-29073
2021-12-15 14:05:31 -06:00
Scott Frederick
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
Stephane Nicoll
1c72330bd9 Upgrade to Log4j2 2.16.0
Closes gh-28986
2021-12-15 09:31:43 +01:00
Stephane Nicoll
894eb83e66 Upgrade to Log4j2 2.16.0
Closes gh-28985
2021-12-15 09:31:04 +01:00
Stephane Nicoll
15ade0b5d3 Upgrade to Log4j2 2.16.0
Closes gh-28984
2021-12-15 09:30:10 +01:00
Stephane Nicoll
4c57d1717d Upgrade to Log4j2 2.16.0
Closes gh-28983
2021-12-15 09:28:44 +01:00
Stephane Nicoll
9f07bb50b2 Merge branch '2.7.x' 2021-12-14 09:50:51 +01:00
Stephane Nicoll
0c1a8c2c5e Merge branch '2.6.x' into 2.7.x
Closes gh-29009
2021-12-14 09:50:41 +01:00
Stephane Nicoll
91593eeea3 Merge branch '2.5.x' into 2.6.x
Closes gh-29008
2021-12-14 09:50:30 +01:00
Arun Suresh
43f3d0dea0 Upgrade Build to Log4j 2.15.0
See gh-29006
2021-12-14 09:42:46 +01:00
Andy Wilkinson
91faec3917 Merge branch '2.7.x' 2021-12-01 12:17:34 +00:00
Andy Wilkinson
51e0fc4b6b Merge branch '2.6.x' into 2.7.x
See gh-28879
2021-12-01 12:17:10 +00:00
Andy Wilkinson
f0f0aa5c46 Merge branch '2.5.x' into 2.6.x
See gh-28878
2021-12-01 12:16:37 +00:00
Andy Wilkinson
8322dda8cc Fix variant selection in spring-boot-maven-plugin
See gh-28877
2021-12-01 12:16:14 +00:00
Andy Wilkinson
95025d442f Merge branch '2.7.x' 2021-12-01 11:21:54 +00:00
Andy Wilkinson
bad05a7860 Merge branch '2.6.x' into 2.7.x
Closes gh-28879
2021-12-01 11:21:24 +00:00
Andy Wilkinson
c7c7592899 Merge branch '2.5.x' into 2.6.x
Closes gh-28878
2021-12-01 11:21:04 +00:00
Andy Wilkinson
25bdc097a0 Make poms of all dependencies available in int test repo
Closes gh-28877
2021-12-01 11:20:21 +00:00
Andy Wilkinson
87a5b72aa5 Merge branch '2.7.x' 2021-11-30 19:27:53 +00:00
Andy Wilkinson
f3957b7639 Merge branch '2.6.x' into 2.7.x
Closes gh-28865
2021-11-30 19:27:11 +00:00
Andy Wilkinson
9d4375bc12 Merge branch '2.5.x' into 2.6.x
Closes gh-28864
2021-11-30 19:26:22 +00:00
Andy Wilkinson
572bd6ca5c Upgrade to test-retry-gradle-plugin 1.3.1
Closes gh-28863
2021-11-30 19:26:09 +00:00
Scott Frederick
015dca1956 Remove support for Thymeleaf
Closes gh-28611
2021-11-30 15:55:47 +00:00
Andy Wilkinson
8bf2ffd93c Drop support for Jersey until jersey-spring6 is available
Closes gh-28808
2021-11-30 15:39:39 +00:00
Andy Wilkinson
900085628a Raise the minimum supported version of Java to 17
Closes gh-28101
2021-11-30 15:37:40 +00:00