Commit Graph

41519 Commits

Author SHA1 Message Date
Phillip Webb
b70aed5806 Merge branch '3.0.x' 2023-02-22 18:41:46 -08:00
Phillip Webb
40ec064de4 Merge branch '2.7.x' into 3.0.x 2023-02-22 18:41:04 -08:00
Phillip Webb
c7dad423e4 Add .git-blame-ignore-revs for reformat commit 2023-02-22 18:39:18 -08:00
Phillip Webb
157091a811 Merge branch '3.0.x' 2023-02-22 18:36:57 -08:00
Phillip Webb
0b15962aca Merge branch '2.7.x' into 3.0.x 2023-02-22 18:36:16 -08:00
Phillip Webb
a5902d7a00 Update copyright year of changed files 2023-02-22 18:35:17 -08:00
Phillip Webb
34de7919d2 Merge branch '3.0.x' 2023-02-22 13:36:29 -08:00
Phillip Webb
58e7cae20f Merge branch '2.7.x' into 3.0.x 2023-02-22 13:36:01 -08:00
Phillip Webb
737ef61456 Enable and fix GraphQlTestIntegrationTests 2023-02-22 13:34:40 -08:00
Andy Wilkinson
f6e208c647 Merge branch '3.0.x'
See gh-34235
2023-02-22 21:29:28 +00:00
Andy Wilkinson
88de3cc089 Temporarily remove auto-config for Reactor context propagation
See gh-34201
2023-02-22 21:10:59 +00:00
Andy Wilkinson
f19119d66e Merge branch '3.0.x' 2023-02-22 21:06:40 +00:00
Andy Wilkinson
06ccdc1399 Upgrade to Spring Integration 6.0.3
Closes gh-34039
2023-02-22 21:06:29 +00:00
Andy Wilkinson
c58998feab Merge branch '3.0.x' 2023-02-22 21:00:10 +00:00
Andy Wilkinson
070a698a92 Merge branch '2.7.x' into 3.0.x 2023-02-22 20:59:49 +00:00
Andy Wilkinson
8499b886f9 Upgrade to Spring Batch 4.3.8
Closes gh-34143
2023-02-22 20:59:34 +00:00
Andy Wilkinson
ccd23f14d1 Start building against Spring Integration 6.1.0-M1 snapshots
See gh-34308
2023-02-22 20:57:21 +00:00
Phillip Webb
c0cf81dbf0 Merge branch '3.0.x' 2023-02-22 12:40:38 -08:00
Phillip Webb
1132b5e8a5 Merge branch '2.7.x' into 3.0.x 2023-02-22 12:40:23 -08:00
Phillip Webb
b126c33195 Enable and fix ImportCandidatesTests 2023-02-22 12:39:00 -08:00
Andy Wilkinson
7aba96d132 Merge branch '3.0.x'
Closes gh-34341
2023-02-22 19:49:14 +00:00
Andy Wilkinson
31b1c3e8ad Replace property placeholders in Logback component class names
Closes gh-34336
2023-02-22 19:47:41 +00:00
Andy Wilkinson
7d697310a0 Merge branch '3.0.x'
Closes gh-34335
2023-02-22 11:03:10 +00:00
Andy Wilkinson
50da0bce56 Merge branch '2.7.x' into 3.0.x
Closes gh-34334
2023-02-22 11:02:41 +00:00
Andy Wilkinson
510c78154b Remove unused version alignment support from Bomr
Closes gh-34333
2023-02-22 10:51:42 +00:00
Phillip Webb
eddee5321f Merge branch '3.0.x' 2023-02-22 00:50:29 -08:00
Phillip Webb
e04c09ceae Merge branch '2.7.x' into 3.0.x 2023-02-22 00:50:18 -08:00
Phillip Webb
891ce3bd1b Disable recently renamed tests 2023-02-22 00:49:23 -08:00
Phillip Webb
8f2320d1ac Merge branch '3.0.x' 2023-02-21 23:56:57 -08:00
Phillip Webb
01e8c42c16 Merge branch '2.7.x' into 3.0.x 2023-02-21 23:55:34 -08:00
Phillip Webb
bcfb250da2 Merge branch '3.0.x' 2023-02-21 23:52:02 -08:00
Phillip Webb
66016921c6 Merge branch '2.7.x' into 3.0.x 2023-02-21 23:51:52 -08:00
Phillip Webb
3651ba348d Fix checkstyle test violations 2023-02-21 23:49:56 -08:00
Phillip Webb
b07269a018 Merge branch '3.0.x' 2023-02-21 23:20:07 -08:00
Phillip Webb
c4de86c244 Merge branch '2.7.x' into 3.0.x 2023-02-21 23:17:57 -08:00
Phillip Webb
df5898a146 Reformat code following spring-javaformat upgrade 2023-02-21 22:53:27 -08:00
Phillip Webb
d2e3e5231c Merge branch '3.0.x'
Closes gh-34331
2023-02-21 22:39:03 -08:00
Phillip Webb
d3104257d7 Merge branch '2.7.x' into 3.0.x
Closes gh-34330
2023-02-21 22:37:44 -08:00
Phillip Webb
b93c9f7fec Upgrade to spring-javaformat 0.0.38
Closes gh-34329
2023-02-21 22:29:11 -08:00
Phillip Webb
565256f33a Exclude more files from nohttp check 2023-02-21 20:36:43 -08:00
Andy Wilkinson
f65befef19 Merge branch '3.0.x'
Closes gh-34325
2023-02-21 19:27:21 +00:00
Andy Wilkinson
0d0566b2cd Remove spring-ldap-core-tiger as it no longer exists
Closes gh-34299
2023-02-21 19:26:10 +00:00
Andy Wilkinson
4612ac8c3c Merge branch '3.0.x' 2023-02-21 19:10:03 +00:00
Andy Wilkinson
cae8c14ac7 Make Micrometer context-propagation available to test compilation
See gh-34201
2023-02-21 19:08:55 +00:00
Andy Wilkinson
4a8846f395 Merge branch '3.0.x' 2023-02-21 18:09:02 +00:00
Andy Wilkinson
86b6cd6d78 Upgrade to Spring Security 6.0.2
Closes gh-34155
2023-02-21 18:08:52 +00:00
Andy Wilkinson
4fc92f5bac Upgrade to Spring Kafka 3.0.3
Closes gh-34153
2023-02-21 18:08:52 +00:00
Andy Wilkinson
8f52a1af93 Upgrade to Spring GraphQL 1.1.2
Closes gh-34323
2023-02-21 18:08:51 +00:00
Andy Wilkinson
a5d3107064 Upgrade to Spring AMQP 3.0.2
Closes gh-34322
2023-02-21 18:08:47 +00:00
Andy Wilkinson
06c130a798 Merge branch '3.0.x' 2023-02-21 18:06:28 +00:00