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
Brian Clozel
81754c8bc4
Upgrade to Spring GraphQL 1.0.0-SNAPSHOT
...
This commit switches to 1.0.0-SNAPSHOT for Spring GraphQL, before its
upcoming 1.0.0-M6 version.
This commit adapts to the changes introduced in
spring-projects/spring-graphql#317 : now that `GraphQlClient` has been
introduced, `GraphQlTester` has been aligned with the new
infrastructure. The `@GraphQlTest` and `@SpringBootTest` testing support
is now using different variants for each.
All samples have been updated to use the proper GraphQL terminology, see
and spring-projects/spring-graphql#310 .
See gh-29637
2022-03-08 17:54:54 +01:00
Stephane Nicoll
37ccc52b8a
Merge branch '2.7.x'
2022-03-08 12:34:30 +01:00
Stephane Nicoll
d67aa3c054
Fix null safety in Kotlin examples
...
Closes gh-30097
2022-03-08 12:34:02 +01:00
Madhura Bhave
5960d2dba1
Merge branch '2.7.x' into main
2022-03-07 21:54:10 -08:00
Madhura Bhave
9628507756
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30094
2022-03-07 21:53:59 -08:00
Madhura Bhave
d131003456
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30093
2022-03-07 21:53:44 -08:00
Madhura Bhave
480ccc6175
Clarify devtools documentation when using with build plugins
...
Closes gh-17851
2022-03-07 21:52:43 -08:00
Madhura Bhave
0e71d80590
Merge branch '2.7.x' into main
2022-03-07 20:23:07 -08:00
Madhura Bhave
88bd0fa794
Merge branch '2.6.x' into 2.7.x
2022-03-07 20:22:57 -08:00
Madhura Bhave
27bf068091
Merge branch '2.5.x' into 2.6.x
2022-03-07 20:22:42 -08:00
Madhura Bhave
9b073c825b
Fix checkstyle
2022-03-07 20:22:27 -08:00
Madhura Bhave
524c0e1474
Merge branch '2.7.x' into main
2022-03-07 18:23:50 -08:00
Madhura Bhave
b80047c451
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30092
2022-03-07 18:23:36 -08:00
Madhura Bhave
ac04be75f8
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30091
2022-03-07 18:23:19 -08:00
Madhura Bhave
ed8f8d59ef
Document how to structure configurations for efficient slice tests
...
Closes gh-16088
2022-03-07 18:21:12 -08:00
Stephane Nicoll
e6f6b2068b
Start building against Spring Kafka 3.0.0-M3 snapshots
...
See gh-30089
2022-03-07 21:09:41 +01:00
Andy Wilkinson
c755e0d1f8
Merge branch '2.7.x'
2022-03-04 17:56:40 +00:00
Andy Wilkinson
f44e7d9391
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30071
2022-03-04 17:56:29 +00:00
Andy Wilkinson
2ef055a823
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30070
2022-03-04 17:56:14 +00:00
Andy Wilkinson
1872af056e
Make it clearer that the generated password is not for production use
...
Closes gh-30061
2022-03-04 17:55:54 +00:00
Andy Wilkinson
68a2f557c7
Merge branch '2.7.x'
2022-03-04 17:27:29 +00:00