fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,938 Commits 22 Branches 339 Tags
Commit Graph

2772 Commits

Author SHA1 Message Date
Stephane Nicoll
2088381d4b Merge branch '2.7.x' 2022-03-21 10:06:56 +01:00
Stephane Nicoll
a2959bbcf2 Polish "Add support for cache2k in memory caching" 
See gh-28498
 2022-03-21 09:59:24 +01:00
Andy Wilkinson
17b5611ace Merge branch '2.7.x' 2022-03-19 11:05:21 +00:00
Andy Wilkinson
f05c19a40a Kotlin Fix JsonSerializer example in reference guide 
Closes gh-30331
 2022-03-19 10:53:22 +00:00
Chris Dennis
3ed3d3eb36 Restore Ehcache 3 Support 
See gh-30002
 2022-03-19 09:33:47 +01:00
Stephane Nicoll
c322cebe49 Merge branch '2.7.x' 2022-03-19 09:28:43 +01:00
Stephane Nicoll
d8bb2ec4e0 Merge branch '2.6.x' into 2.7.x 
Closes gh-30331
 2022-03-19 09:28:35 +01:00
Stephane Nicoll
bce247eafb Merge branch '2.5.x' into 2.6.x 
Closes gh-30330
 2022-03-19 09:28:24 +01:00
Stephane Nicoll
39339ccb49 Update copyright year of change file 
See gh-30329
 2022-03-19 09:25:46 +01:00
SangHyun-Park
8536100009 Fix JsonSerializer example in reference guide 
See gh-30329
 2022-03-19 09:25:12 +01:00
Andy Wilkinson
a1e972ebaa Update Spock for Groovy 4.0 compatibility 
Closes gh-30318
 2022-03-18 12:38:41 +00:00
Andy Wilkinson
dd812a3f76 Upgrade to Groovy 4.0.1 
Closes gh-30279
 2022-03-18 12:38:41 +00:00
Andy Wilkinson
568cd687af Remove support for REST Assured until it supports Groovy 4.0 
REST Assured does not work with Groovy 4.0 so support is being
temporarily removed again.

See gh-29543
 2022-03-18 12:35:19 +00:00
Stephane Nicoll
3afda66be2 Merge branch '2.7.x' 2022-03-17 16:39:36 +01:00
Stephane Nicoll
2631b0ce01 Merge branch '2.6.x' into 2.7.x 
Closes gh-30275
 2022-03-17 16:39:20 +01:00
Stephane Nicoll
be34ad36b5 Restore WebSockets section in the reference guide 
Closes gh-30231
 2022-03-17 16:35:04 +01:00
Andy Wilkinson
05130d9eb0 Merge branch '2.7.x' 2022-03-15 19:18:11 +00:00
Andy Wilkinson
e97fa0ae52 Merge branch '2.6.x' into 2.7.x 
See gh-30167
 2022-03-15 19:15:03 +00:00
Andy Wilkinson
05c12737fe Merge branch '2.5.x' into 2.6.x 
See gh-30166
 2022-03-15 19:14:42 +00:00
Andy Wilkinson
3ab688ef82 Add missing task dependencies 
See gh-29406
 2022-03-15 19:14:25 +00:00
Andy Wilkinson
1dadc77346 Document that the minimum supported version of Kotlin is now 1.6 
Closes gh-30197
 2022-03-15 18:04:36 +00:00
Andy Wilkinson
5736f5401b Merge branch '2.7.x' 2022-03-11 08:23:27 +00:00
Andy Wilkinson
c0a72bf5ea Merge branch '2.6.x' into 2.7.x 
Closes gh-30167
 2022-03-11 08:21:13 +00:00
Andy Wilkinson
4c1d1a6a69 Merge branch '2.5.x' into 2.6.x 
Closes gh-30166
 2022-03-11 08:17:59 +00:00
Andy Wilkinson
cced7edd9c Document Devtools' property defaults directly in reference docs 
Closes gh-29406
 2022-03-11 08:15:40 +00:00
Madhura Bhave
44f71a46aa Merge branch '2.7.x' into main 2022-03-09 15:55:18 -08:00
Madhura Bhave
24c48f0b43 Merge branch '2.6.x' into 2.7.x 
Closes gh-30150
 2022-03-09 15:54:49 -08:00
Madhura Bhave
bdcc2509f5 Merge branch '2.5.x' into 2.6.x 
Closes gh-30149
 2022-03-09 15:52:56 -08:00
Madhura Bhave
d0883ba6ef Document the WebSocket-related exclusions that are required to use Jetty 10 
Closes gh-29275
 2022-03-09 15:40:01 -08:00
Stephane Nicoll
e5cdcdadd5 Merge branch '2.7.x' 2022-03-09 08:29:23 +01:00
Stephane Nicoll
a71d9f5088 Merge branch '2.6.x' into 2.7.x 
Closes gh-30121
 2022-03-09 08:29:16 +01:00
Stephane Nicoll
069c328075 Merge branch '2.5.x' into 2.6.x 
Closes gh-30120
 2022-03-09 08:29:07 +01:00
fml2
80b90ed386 Fix typo 
See gh-30118
 2022-03-09 08:28:44 +01:00
Stephane Nicoll
06321d4e55 Merge branch '2.7.x' 2022-03-09 08:26:30 +01:00
Stephane Nicoll
b66bf393e4 Merge branch '2.6.x' into 2.7.x 
Closes gh-30119
 2022-03-09 08:26:20 +01:00
Stephane Nicoll
be85f317d3 Fix anchor tag for Spring HATEOAS section 
Closes gh-30106
 2022-03-09 08:25:10 +01:00
Madhura Bhave
5368ed98ef Merge branch '2.7.x' into main 2022-03-08 22:03:08 -08:00
Madhura Bhave
06496d85cd Merge branch '2.6.x' into 2.7.x 
Closes gh-30115
Closes gh-30116
 2022-03-08 22:02:27 -08:00
Madhura Bhave
09dc4e5ce3 Merge branch '2.5.x' into 2.6.x 
Closes gh-30113
Closes gh-30114
 2022-03-08 22:01:26 -08:00
Madhura Bhave
ef7d7487fa Document when config data properties are invalid 
This commit also reinstates documentation for
`spring.profiles.include`

Closes gh-25849
Closes gh-28451
 2022-03-08 21:58:43 -08:00
Madhura Bhave
70efe7d384 Fix javax import 2022-03-08 19:02:20 -08:00
Madhura Bhave
7846fb09be Merge branch '2.7.x' into main 2022-03-08 18:13:30 -08:00
Madhura Bhave
ee291dc36f Merge branch '2.6.x' into 2.7.x 
Closes gh-30112
 2022-03-08 18:13:14 -08:00
Madhura Bhave
b86ad89523 Merge branch '2.5.x' into 2.6.x 
Closes gh-30111
 2022-03-08 18:13:01 -08:00
Madhura Bhave
7d63faac7c Document the scalar types supported by MapBinder 
Closes gh-27581
 2022-03-08 18:12:21 -08:00
Madhura Bhave
f10f27c3d4 Merge branch '2.7.x' into main 2022-03-08 17:41:28 -08:00
Madhura Bhave
ba7ba08811 Merge branch '2.6.x' into 2.7.x 
Closes gh-30110
 2022-03-08 17:41:12 -08:00
Madhura Bhave
9c437c6cd9 Merge branch '2.5.x' into 2.6.x 
Closes gh-30109
 2022-03-08 17:40:52 -08:00
Madhura Bhave
d240e293db Document how to obtain ServletContext with an embedded container setup 
Closes gh-24561
 2022-03-08 17:34:35 -08:00
Gautham Mohan
4388910435 Consider DataFetcherExceptionResolver in GraphQTest 
Prior to this commit, `@GraphQlTest` slice tests would only consider
JsonComponent, RuntimeWiringConfigurer, Converter and
GenericConverter beans. But DataFetcherExceptionResolver,
Instrumentation and GraphQlSourceBuilderCustomizer are used in
setting up the GraphQL source.

This commit ensures that the `GraphQlTypeExcludeFilter` considers
those bean types.

Closes gh-30078
 2022-03-08 17:54:55 +01:00