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
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
Andy Wilkinson
814c86c5e8
Raise the minimum supported version of Gradle to 7.3
...
Closes gh-28100
2021-11-30 15:36:54 +00:00
Andy Wilkinson
75c117a33f
Prepare 2.7.x branch
2021-11-30 15:02:11 +00:00
Andy Wilkinson
354a18c9a6
Prepare 2.6.x branch
2021-11-30 10:36:19 +00:00
Phillip Webb
beb68671bb
Update copyright year of changed files
2021-11-24 10:23:32 -08:00
Andy Wilkinson
381c094c41
Merge branch '2.5.x'
2021-11-19 13:39:37 +00:00
Andy Wilkinson
8f0e12dc34
Revert accidentally committed changes
...
This partially reverts commit c083e0b049
.
2021-11-19 13:39:22 +00:00
Andy Wilkinson
c0d90dfa8f
Merge branch '2.5.x'
...
Closes gh-28749
2021-11-19 13:36:01 +00:00
Andy Wilkinson
c083e0b049
Avoid using temp before @TempDir has initialized it
...
Closes gh-28748
2021-11-19 13:35:30 +00:00
Andy Wilkinson
00fa0fb769
Merge branch '2.5.x'
...
Closes gh-28746
2021-11-19 10:19:14 +00:00
Andy Wilkinson
f2b959b0a5
Add <type>zip</type> to Elasticsearch dist in dependencies bom
...
Fixes gh-28725
2021-11-19 10:13:14 +00:00
Andy Wilkinson
2a342ef416
Merge branch '2.5.x'
...
Closes gh-28662
2021-11-12 23:40:35 +00:00
Andy Wilkinson
5e4a502b2d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28661
2021-11-12 20:31:25 +00:00
Andy Wilkinson
2cec3971d7
Prohibit unwanted dependencies in all modules not just starters
...
Closes gh-28658
2021-11-12 20:04:35 +00:00
Andy Wilkinson
51dc02e37b
Merge branch '2.5.x'
...
See gh-28485
2021-10-29 17:18:52 +01:00