Commit Graph

17336 Commits

Author SHA1 Message Date
Stephane Nicoll
593f2ca7fe Start building against Reactor 2020.0.24 snapshots
See gh-32592
2022-10-07 09:45:47 +02:00
Phillip Webb
0f4d98b1f4 Merge branch '2.6.x' into 2.7.x
Closes gh-32575
2022-10-03 17:56:10 -07:00
Phillip Webb
e917bd0ed0 Only build OutputCapture strings when necessary
Update `OutputCapture` so that expensive build operations are only
performed when necessary. This update is especially important for Kotlin
users calling `"Expected String" in output` since this results in a call
to Kotlin's `CharSequence.contains` which calls the `length()` and
`charAt()` methods many times.

Closes gh-32033
2022-10-03 16:55:44 -07:00
Phillip Webb
0e98a577fe Merge branch '2.6.x' into 2.7.x 2022-09-30 21:18:09 -07:00
Phillip Webb
75f4d9e3fd Fix empty @DefaultValue annotation test failures on Java 17
See gh-32559
2022-09-30 21:16:48 -07:00
Phillip Webb
1eb0dd5e39 Merge branch '2.6.x' into 2.7.x
Closes gh-32563
2022-09-30 20:16:36 -07:00
Phillip Webb
efc431bdc4 Support empty @DefaultValue annotations on aggregates and optional
Update `ValueObjectBinder` to allow an empty `@DefaultValue` to be
used on map, collection, arrays and optional types.

Closes gh-32559
2022-09-30 18:21:54 -07:00
Andy Wilkinson
3ef633b096 Merge branch '2.6.x' into 2.7.x
Closes gh-32543
2022-09-29 11:39:42 +01:00
Andy Wilkinson
84a25c7dcf Configure Log4j2 classpath overrides consistently
Closes gh-32537
2022-09-29 11:25:21 +01:00
Andy Wilkinson
9f5b7db553 Merge branch '2.6.x' into 2.7.x
Closes gh-32535
2022-09-29 10:04:19 +01:00
Andy Wilkinson
be48f37a83 Fix LogbackMetrics auto-config test with Logback and Log4j2 on cp
Closes gh-32533
2022-09-29 10:03:52 +01:00
Stephane Nicoll
cb191dfec2 Merge branch '2.6.x' into 2.7.x
Closes gh-32515
2022-09-27 08:59:11 +02:00
heqiang
5db6cc1cba Remove redundant @ExtendWith(SpringExtension.class) for sample
See gh-32476
2022-09-27 08:49:46 +02:00
Stephane Nicoll
eb4b0a3f3c Merge branch '2.6.x' into 2.7.x
Closes gh-32513
2022-09-27 08:41:20 +02:00
Stephane Nicoll
8f598f876b Polish "Use non-blocking API in CouchbaseReactiveHealthIndicator"
See gh-32505
2022-09-27 08:34:22 +02:00
Mico Piira
f51c4c3df0 Use non-blocking API in CouchbaseReactiveHealthIndicator
See gh-32505
2022-09-27 08:31:57 +02:00
Stephane Nicoll
33680e5acc Merge branch '2.6.x' into 2.7.x
Closes gh-32509
2022-09-27 08:28:15 +02:00
Stephane Nicoll
0457536d72 Polish "Avoid using JUnit 4 assertions"
See gh-32504
2022-09-27 08:24:03 +02:00
dreis2211
cee353fba6 Avoid using JUnit 4 assertions
See gh-32504
2022-09-27 08:11:47 +02:00
Andy Wilkinson
5124ae94ae Merge branch '2.6.x' into 2.7.x
Closes gh-32499
2022-09-26 13:15:11 +01:00
Andy Wilkinson
cfac7f55a4 Correct annotations on BootBuildImage's file-based inputs
Closes gh-32495
2022-09-26 13:13:16 +01:00
Stephane Nicoll
ca830240fa Upgrade to Spring Batch 4.3.7
Closes gh-32278
2022-09-22 09:35:29 +02:00
Stephane Nicoll
82763deb93 Upgrade to Spring Batch 4.3.7
Closes gh-32271
2022-09-22 09:26:07 +02:00
Brian Clozel
8f9323d66c Document "classpath:*" location for GraphQL Schemas
This commit mentions the `"classpath*:graphql/**` schema location in
case the application needs to find schemas across multiple classpath
roots, for example across multiple modules.

Closes gh-31772
2022-09-21 21:09:22 +02:00
Andy Wilkinson
3620959dca Upgrade to Dependency Management Plugin 1.0.14.RELEASE
Closes gh-32459
2022-09-21 10:06:56 +01:00
Andy Wilkinson
9d30a0a5b6 Upgrade to Dependency Management Plugin 1.0.14.RELEASE
Closes gh-32458
2022-09-21 10:04:03 +01:00
Stephane Nicoll
8bca178b83 Upgrade to Byte Buddy 1.12.17
Closes gh-32454
2022-09-21 08:24:27 +02:00
Stephane Nicoll
d5debb1d3d Upgrade to Spring Integration 5.5.15
Closes gh-32453
2022-09-21 08:22:25 +02:00
Stephane Nicoll
b3db0768c0 Upgrade to Spring GraphQL 1.0.2
Closes gh-32426
2022-09-21 08:21:56 +02:00
Stephane Nicoll
4e18da99a3 Upgrade to Spring Integration 5.5.15
Closes gh-32452
2022-09-21 08:18:15 +02:00
Phillip Webb
445dff0483 Upgrade to MariaDB 3.0.8
Closes gh-32445
2022-09-20 14:15:06 -07:00
Phillip Webb
0ff789415e Upgrade to Jetty 9.4.49.v20220914
Closes gh-32444
2022-09-20 14:15:03 -07:00
Phillip Webb
f9b532d5aa Upgrade to Groovy 3.0.13
Closes gh-32443
2022-09-20 14:14:59 -07:00
Phillip Webb
c7254cfe25 Upgrade to Jetty 9.4.49.v20220914
Closes gh-32441
2022-09-20 14:06:08 -07:00
Phillip Webb
634799f887 Upgrade to Groovy 3.0.13
Closes gh-32440
2022-09-20 14:06:06 -07:00
Stephane Nicoll
4e82a69a0b Start building against Spring GraphQL 1.0.2 snapshots
See gh-32426
2022-09-20 03:36:08 +02:00
Stephane Nicoll
e616fb5d8b Upgrade to Spring Kafka 2.8.9
Closes gh-32277
2022-09-20 03:30:50 +02:00
Stephane Nicoll
cddfa4b58c Upgrade to Spring AMQP 2.4.7
Closes gh-32276
2022-09-20 03:30:23 +02:00
Stephane Nicoll
6c37838f31 Upgrade to Spring Kafka 2.8.9
Closes gh-32270
2022-09-20 03:29:41 +02:00
Stephane Nicoll
033b6b5dbe Upgrade to Spring AMQP 2.4.7
Closes gh-32269
2022-09-20 03:29:16 +02:00
Stephane Nicoll
85d73a1f62 Upgrade to Spring Data 2021.2.3
Closes gh-32275
2022-09-19 17:57:17 +02:00
Stephane Nicoll
d72e0b39fc Upgrade to Spring Data 2021.1.7
Closes gh-32268
2022-09-19 17:56:19 +02:00
Andy Wilkinson
a800f7d77c Merge branch '2.6.x' into 2.7.x
Closes gh-32406
2022-09-16 17:03:13 +01:00
Andy Wilkinson
61e11cd361 Ensure that TCCL is clean when DataSource is accessed
Previously, when using Tomcat, its web app class loader was the thread
context class loader when H2ConsoleAutoConfiguration triggered
initialization of Hikari's pool. This was the case because it's done
in the bean method of a ServletRegistrationBean. Such Servlet-related
beans are intentionally created with Tomcat's web app classloader as
the TCCL. This arrangement results in the pool's threads using
Tomcat's web app class loader as their TCCL which is not desirable.
One consequence of this was that Tomcat could log a warning at
shutdown about the thread being left running when it will, in fact,
be stopped as part of the context being closed.

This commit updates H2ConsoleAutoConfiguration to set the TCCL to its
own ClassLoader while the DataSource information is being logged.

Closes gh-32382
2022-09-16 16:24:57 +01:00
Andy Wilkinson
7827e8166e Merge branch '2.6.x' into 2.7.x
Closes gh-32402
2022-09-16 11:38:07 +01:00
Andy Wilkinson
ab26050fe7 Document support for Java 19
Closes gh-32259
2022-09-16 11:37:14 +01:00
Stephane Nicoll
756eaea766 Upgrade to Spring HATEOAS 1.5.2
Closes gh-32378
2022-09-16 07:41:04 +02:00
Stephane Nicoll
998396dd8a Upgrade to Spring HATEOAS 1.4.5
Closes gh-32400
2022-09-16 07:39:56 +02:00
Andy Wilkinson
52522b87f0 Merge branch '2.6.x' into 2.7.x
Closes gh-32393
2022-09-15 11:57:28 +01:00
Andy Wilkinson
77f428498f Compile against SnakeYAML 1.32 and test against older versions
Closes gh-32392
2022-09-15 11:55:44 +01:00