Commit Graph

420 Commits (68bdef2cd073837798ff4f677804086469d3a3b4)

Author SHA1 Message Date
Andy Wilkinson 3b5e7ee0a8 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 7e8d499333 Merge branch '2.6.x' into 2.7.x
Closes gh-29690
3 years ago
Andy Wilkinson 093e8a524d Merge branch '2.5.x' into 2.6.x
Closes gh-29689
3 years ago
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
3 years ago
Andy Wilkinson 977a0a8356 Merge branch '2.7.x' 3 years ago
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
3 years ago
Phillip Webb a6b7ae2110 Merge branch '2.7.x' 3 years ago
Phillip Webb 71695d2162 Merge branch '2.6.x' into 2.7.x
Closes gh-29658
3 years ago
Phillip Webb 05c58a18df Merge branch '2.5.x' into 2.6.x
Closes gh-29657
3 years ago
Phillip Webb 12a33a2eaf Upgrade to spring-asciidoctor-backends 0.0.3
Closes gh-29656
3 years ago
Phillip Webb 50047e6d8c Merge branch '2.7.x' 3 years ago
Phillip Webb 6c74e24147 Update copyright year of changed files 3 years ago
Phillip Webb 8ed5d15cd3 Merge branch '2.7.x' 3 years ago
Phillip Webb d33d92dfce Polish KotlinConventions 3 years ago
Phillip Webb f8c2bff825 Use Kotlin 1.6 for API and language version
Closes gh-29654
3 years ago
Phillip Webb a726210afc Merge branch '2.7.x' 3 years ago
Phillip Webb 546cad06db Merge branch '2.6.x' into 2.7.x
Closes gh-29635
3 years ago
Phillip Webb c01cee18b5 Merge branch '2.5.x' into 2.6.x
Closes gh-29634
3 years ago
Phillip Webb 79fc77fade Upgrade to spring-javaformat 0.0.31
Closes gh-29633
3 years ago
Andy Wilkinson f2ac7d10ef Merge branch '2.7.x' 3 years ago
Andy Wilkinson 8480abca20 Merge branch '2.6.x' into 2.7.x
Closes gh-29561
3 years ago
Andy Wilkinson fe43d527b5 Merge branch '2.5.x' into 2.6.x
Closes gh-29560
3 years ago
Andy Wilkinson 3ed65f2383 Avoid running Maven plugin ITs for each s-b-dependencies change
Closes gh-28781
3 years ago
Andy Wilkinson b8983cef59 Merge branch '2.7.x' 3 years ago
Andy Wilkinson cd426fd21e Merge branch '2.6.x' into 2.7.x
Closes gh-29547
3 years ago
Andy Wilkinson 75c3bff765 Merge branch '2.5.x' into 2.6.x
Closes gh-29546
3 years ago
Andy Wilkinson 761bed6c48 Upgrade buildSrc to Spring Framework 5.3.15
Closes gh-29545
3 years ago
Phillip Webb fb83e6930d Merge branch '2.7.x' 3 years ago
Phillip Webb b31e9d6b4a Merge branch '2.6.x' into 2.7.x
Closes gh-29492
3 years ago
Phillip Webb 1f61c36f7a Merge branch '2.5.x' into 2.6.x
Closes gh-29491
3 years ago
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
3 years ago
Andy Wilkinson 12cd97a20c Reinstate support for Thymeleaf 3 years ago
Stephane Nicoll 119b920969 Merge branch '2.7.x' 3 years ago
Stephane Nicoll f3d99f9ccc Merge branch '2.6.x' into 2.7.x 3 years ago
Stephane Nicoll 01c19ef444 Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll a0537888f5 Upgrade build to Log4j 2.17.1 3 years ago
Stephane Nicoll 3ef03cddb9 Merge branch '2.7.x' 3 years ago
Stephane Nicoll 9c868751d6 Merge branch '2.6.x' into 2.7.x
Closes gh-29199
3 years ago
Stephane Nicoll f54ea67ed6 Merge branch '2.5.x' into 2.6.x
Closes gh-29198
3 years ago
dreis2211 7a87d18b12 Update copyrights to 2022
See gh-29195
3 years ago
Brian Clozel f61c87c3a7 Revert "Merge branch '2.7.x'"
This reverts commit f0677a119c, reversing
changes made to 938d58f32c.
3 years ago
Brian Clozel f0677a119c Merge branch '2.7.x' 3 years ago
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
3 years ago
Madhura Bhave 34f96514ad Fix link to source code in snapshot documentation
Fixes gh-28856
3 years ago
Stephane Nicoll e994ee3be5 Merge branch '2.7.x'
See gh-28986
3 years ago
Stephane Nicoll 821f7086d9 Merge branch '2.6.x' into 2.7.x
See gh-28985
3 years ago
Stephane Nicoll e048562c34 Merge branch '2.5.x' into 2.6.x
See gh-28984
3 years ago
Stephane Nicoll 21e54a595e Upgrade Build to Log4j 2.17.0
See gh-28983
3 years ago
Phillip Webb 003fb229fd Merge branch '2.7.x' 3 years ago
Phillip Webb f3bcbca841 Update copyright year of changed files 3 years ago