Commit Graph

37952 Commits

Author SHA1 Message Date
Stephane Nicoll 8d2af7ea93 Start building against Reactor 2020.0.24 snapshots
See gh-32587
2022-10-07 09:04:08 +02:00
Andy Wilkinson d909c4efb6 Merge branch '2.6.x' into 2.7.x
Closes gh-32610
2022-10-06 11:11:56 +01:00
Andy Wilkinson c4a0dad6fe Upgrade to Spring Java Format 0.0.35
Closes gh-32609
2022-10-06 11:10:45 +01: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 c31d99d3a0 Merge branch '2.6.x' into 2.7.x 2022-09-29 12:52:37 +01:00
Andy Wilkinson 8a93abfaaa Improve diagnostics when run does not produce expected logging 2022-09-29 12:52:02 +01: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
Stephane Nicoll f415541afe Merge pull request #32476 from 1993heqiang
* pr/32476:
  Remove redundant @ExtendWith(SpringExtension.class) for sample

Closes gh-32476
2022-09-27 08:51:57 +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 1928177da2 Merge pull request #32505 from micopiira
* pr/32505:
  Polish "Use non-blocking API in CouchbaseReactiveHealthIndicator"
  Use non-blocking API in CouchbaseReactiveHealthIndicator

Closes gh-32505
2022-09-27 08:37:23 +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 9a004a6508 Merge branch '2.6.x' into 2.7.x
Closes gh-32511
2022-09-27 08:30:37 +02:00
Stephane Nicoll 8a27f0b46c Merge pull request #32501 from izeye
* pr/32501:
  Enable LoaderIntegrationTests with Java 19

Closes gh-32501
2022-09-27 08:30:32 +02:00
Johnny Lim 975affc497 Enable LoaderIntegrationTests with Java 19
See gh-32501
2022-09-27 08:30:13 +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 01cef2d7b6 Merge pull request #32504 from dreis2211
* pr/32504:
  Polish "Avoid using JUnit 4 assertions"
  Avoid using JUnit 4 assertions

Closes gh-32504
2022-09-27 08:27:52 +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
Scott Frederick 4ecc6656f3 Merge branch '2.6.x' into 2.7.x
Closes gh-32507
2022-09-26 14:18:47 -05:00
Scott Frederick 81598b51f9 Use task outputs in distZip Paketo system tests
Using the outputs from `distZip` and `bootDistZip` as input to the
`bootBuildImage` task instead of indirectly using the output file
path prevents Gradle warnings about implicit task dependencies.

Fixes gh-32506
2022-09-26 14:18:17 -05: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
Andy Wilkinson 50040bd748 Merge branch '2.6.x' into 2.7.x 2022-09-22 13:23:49 +01:00
Spring Builds f1d7e21752 Next development version (v2.7.5-SNAPSHOT) 2022-09-22 11:07:36 +00:00
Spring Builds 33afbcc092 Next development version (v2.6.13-SNAPSHOT) 2022-09-22 09:10:06 +00:00
Stephane Nicoll 88723b784e Merge branch '2.6.x' into 2.7.x 2022-09-22 09:35:40 +02: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 c5a4b1f71d Merge branch '2.6.x' into 2.7.x
Closes gh-32468
2022-09-21 19:53:22 +01:00
Andy Wilkinson 856bd84df9 Remove JDK 18 CI
Closes gh-32290
2022-09-21 19:52:15 +01:00
Andy Wilkinson 7566666304 Merge branch '2.6.x' into 2.7.x
Closes gh-32467
2022-09-21 19:46:38 +01:00
Andy Wilkinson 5affcecd24 Update Java 19 CI to use Bellsoft Liberica
Closes gh-32289
2022-09-21 19:44:16 +01: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 0111988e1b Merge branch '2.6.x' into 2.7.x 2022-09-21 10:04:41 +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 b607aca478 Merge branch '2.6.x' into 2.7.x 2022-09-21 08:24:38 +02: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