Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
35,294 Commits 23 Branches 0 Tags
00a274e46d02f6dddb2cbdfa0b939681483c8e8f
Commit Graph

344 Commits

Author SHA1 Message Date
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
Phillip Webb
003fb229fd Merge branch '2.7.x' 2021-12-16 13:07:22 -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
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
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
Andy Wilkinson
28d323ee3a Merge branch '2.4.x' into 2.5.x 
See gh-28484
 2021-10-29 17:18:30 +01:00
Andy Wilkinson
b9e3660833 Revert running tests in parallel 
See gh-19876
 2021-10-29 17:18:13 +01:00
Andy Wilkinson
c7a2d61aee Merge branch '2.4.x' 
Closes gh-28485
 2021-10-29 13:48:36 +01:00
Andy Wilkinson
7fe6f4887c Merge branch '2.4.x' into 2.5.x 
Closes gh-28484
 2021-10-29 13:48:23 +01:00
Andy Wilkinson
22d85e6d7b Allow tests to be run in parallel across multiple workers 
Closes gh-19876
 2021-10-29 12:48:45 +01:00
Phillip Webb
66aa713b85 Merge branch '2.5.x' 2021-10-14 17:41:06 -07:00
Phillip Webb
467e063d4b Merge branch '2.4.x' into 2.5.x 2021-10-14 17:40:47 -07:00
Phillip Webb
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
Phillip Webb
e95b0b5257 Polish 2021-10-14 17:37:48 -07:00
Andy Wilkinson
37a7144426 Merge branch '2.5.x' 
Closes gh-28343
 2021-10-14 14:26:57 +01:00
Andy Wilkinson
1a30c660f3 Merge branch '2.4.x' into 2.5.x 
Closes gh-28342
 2021-10-14 14:22:25 +01:00
Andy Wilkinson
adb9226dec Prohibit org.apache.geronimo.specs dependencies in our starters 
Closes gh-28338
 2021-10-14 14:19:21 +01:00
Andy Wilkinson
2d837a6eae Merge branch '2.5.x' 
Closes gh-28337
 2021-10-14 13:48:08 +01:00
Andy Wilkinson
3800f060b5 Merge branch '2.4.x' into 2.5.x 
Closes gh-28336
 2021-10-14 13:42:54 +01:00
Andy Wilkinson
2fb8c8d27e Check starters for unnecessary exclusions 
Closes gh-28332
 2021-10-14 13:37:53 +01:00
Andy Wilkinson
191b50241d Merge branch '2.5.x' 
Closes gh-28331
 2021-10-14 10:13:37 +01:00
Andy Wilkinson
d3037103fe Merge branch '2.4.x' into 2.5.x 
Closes gh-28330
 2021-10-14 10:13:24 +01:00