Commit Graph

37611 Commits

Author SHA1 Message Date
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
Andy Wilkinson
997f7cbfce Merge branch '2.7.x' 2022-03-08 14:09:59 +00:00
Andy Wilkinson
dfd4097436 Merge branch '2.6.x' into 2.7.x
Closes gh-30101
2022-03-08 14:09:47 +00:00
Andy Wilkinson
5b2cc74f71 Merge branch '2.5.x' into 2.6.x
Closes gh-30100
2022-03-08 14:09:35 +00:00
Andy Wilkinson
708e57eafb Register metrics for wrapped R2DBC ConnectionPools
Closes gh-30090
2022-03-08 13:55:34 +00:00
Andy Wilkinson
d92dcf9452 Merge branch '2.7.x' 2022-03-08 13:53:11 +00:00
Andy Wilkinson
dcaca38154 Merge branch '2.6.x' into 2.7.x
Closes gh-30099
2022-03-08 13:52:46 +00:00
Andy Wilkinson
119a713f09 Merge branch '2.5.x' into 2.6.x
Closes gh-30098
2022-03-08 13:52:25 +00:00
Andy Wilkinson
e7705f4f71 Improve condition message produced by @ConditionalOnSingleCandidate
Closes gh-30073
2022-03-08 13:51:38 +00:00
Stephane Nicoll
cc3021d2df Start building against Spring Framework 6.0.0-M3 snapshots
See gh-29957
2022-03-08 12:49:37 +01:00
Stephane Nicoll
0a81c238c2 Compile Kotlin code with a JVM target of 17
Closes gh-29956
2022-03-08 12:43:54 +01:00
Stephane Nicoll
099e811a38 Raise the minimum supported version of Kotlin to 1.6
Closes gh-29660
2022-03-08 12:42:31 +01:00
Stephane Nicoll
d5f4cfe6cb Upgrade to Kotlin 1.6.20-RC
Closes gh-29958
2022-03-08 12:35: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
6f8ce3deb5 Avoid use of instance supplier for core infrastructure bean
Closes gh-30021
2022-03-07 21:09:41 +01: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
0bf1090e29 Merge branch '2.7.x' 2022-03-07 14:58:08 +00:00
Andy Wilkinson
a3cdc4e799 Merge branch '2.6.x' into 2.7.x
Closes gh-30088
2022-03-07 14:57:32 +00:00
Andy Wilkinson
344f71c75a Merge branch '2.5.x' into 2.6.x
Closes gh-30087
2022-03-07 14:57:20 +00:00
Andy Wilkinson
4bcb7e2f77 Prevent ActiveProfilesTests from binding to 8080
Due to gh-29695, smoketest.profile.ActiveProfilesTests starts a web
server bound to the default port (8080) despite the test setting
`webEnvironment` to `NONE`.

This commit works around the problem by running the tests with
server.port set to zero.

Closes gh-30086
2022-03-07 14:55:00 +00:00
Moritz Halbritter
24a68fc595 Merge branch '2.7.x' 2022-03-07 14:12:19 +01:00
Moritz Halbritter
d95dc75de9 Merge branch '2.6.x' into 2.7.x 2022-03-07 14:11:22 +01:00
Moritz Halbritter
e980a53399 Merge branch '2.5.x' into 2.6.x 2022-03-07 14:11:11 +01:00
Moritz Halbritter
f3eb90046f Remove @Repeatable support for @DisabledOnOs
We'll add it back again when we need it, and delay the naming issue.

See gh-30082
2022-03-07 14:10:13 +01:00
Moritz Halbritter
74fe5735d9 Polish 2022-03-07 13:28:41 +01:00
Moritz Halbritter
a1b1377733 Merge branch '2.7.x' 2022-03-07 13:23:06 +01:00
Moritz Halbritter
50d766020c Merge branch '2.6.x' into 2.7.x
Closes gh-30084
2022-03-07 13:22:53 +01:00
Moritz Halbritter
564555347f Merge branch '2.5.x' into 2.6.x
Closes gh-30083
2022-03-07 13:22:34 +01:00
Moritz Halbritter
be38311c5d Disable incompatible tests on Linux AArch64
- Adds a new @DisableOnOs annotation, which is inspired from JUnit5s
  @DisableOnOs annotation. This new annotation supports the architecture
  and is repeatable

Closes gh-30082
2022-03-07 13:22:17 +01:00
Stephane Nicoll
f869c490f4 Merge branch '2.7.x' 2022-03-07 09:49:21 +01:00
Stephane Nicoll
ce4f7ded8a Merge branch '2.6.x' into 2.7.x
Closes gh-30081
2022-03-07 09:49:10 +01:00
Stephane Nicoll
c6a9e138e5 Merge branch '2.5.x' into 2.6.x
Closes gh-30080
2022-03-07 09:49:00 +01:00
Stephane Nicoll
089ea17423 Merge pull request #30074 from hak7a3
* pr/30074:
  Update copyright year of change file
  Fix references to spring.data.cassandra.connection.connect-timeout

Closes gh-30074
2022-03-07 09:48:50 +01:00
Stephane Nicoll
cf9cc82025 Update copyright year of change file
See gh-30074
2022-03-07 09:47:12 +01:00
hak7a3
0a035c7fa6 Fix references to spring.data.cassandra.connection.connect-timeout
See gh-30074
2022-03-07 09:42:43 +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