Commit Graph

20697 Commits

Author SHA1 Message Date
Andy Wilkinson 3e99118a48 Merge branch '2.7.x' into 3.0.x
Closes gh-36633
2023-07-28 12:22:21 +01:00
Andy Wilkinson 21ce7a08fc Polish "Polish"
See gh-36620
2023-07-28 11:40:34 +01:00
Johnny Lim 5a205dbfd1 Polish
See gh-36620
2023-07-28 11:35:33 +01:00
Andy Wilkinson 81844c04c4 Merge branch '2.7.x' into 3.0.x
Closes gh-36629
2023-07-28 11:31:49 +01:00
rob-valor 4bbfc5e630 Correct RestTemplateBuilder#defaultHeader javadoc
Replace reactor.netty.http.client.HttpClientRequest with
org.springframework.http.client.ClientHttpRequest

See gh-36614
2023-07-28 11:30:46 +01:00
Andy Wilkinson a92c1abf70 Merge branch '2.7.x' into 3.0.x
Closes gh-36626
2023-07-28 11:00:59 +01:00
Andy Wilkinson c44e7376b4 Upgrade to Spring Asciidoctor Extensions 0.6.2
Closes gh-36625
2023-07-28 10:53:48 +01:00
Andy Wilkinson 6b6e8b3fd4 Merge branch '2.7.x' into 3.0.x
Closes gh-36621
2023-07-28 10:10:32 +01:00
Christoph Dreis 42e89079d3 Enable debug option for Kotlin in Gradle Plugin tests
See gh-36617
2023-07-28 10:09:59 +01:00
Stephane Nicoll 150526a6a0 Merge branch '2.7.x' into 3.0.x
Closes gh-36611
2023-07-27 14:52:37 +02:00
Stephane Nicoll 87554fb4dc Add test for RabbitMQ smoke test
Closes gh-36610
2023-07-27 14:51:50 +02:00
Moritz Halbritter c187d96367 Merge branch '2.7.x' into 3.0.x
Closes gh-36583
2023-07-26 10:23:08 +02:00
Francisco Bento 307d6c0a97 Fix Tomcat SSL protocol warn message
See gh-36572
2023-07-26 10:21:43 +02:00
Moritz Halbritter 1a8ffd54fc Merge branch '2.7.x' into 3.0.x
Closes gh-36580
2023-07-26 09:52:40 +02:00
Mahatma_Fatal_Error 98f76698c8 Fix server.forward-headers-strategy documentation
See gh-36564
2023-07-26 09:50:33 +02:00
Andy Wilkinson e106828fc8 Merge branch '2.7.x' into 3.0.x
Closes gh-36566
2023-07-25 14:59:44 +01:00
Andy Wilkinson 5c6a9122cb Polish "Test Micrometer config to property exposure"
See gh-33743
2023-07-25 14:43:14 +01:00
Mirko Sobeck 19e70055a5 Test Micrometer config to property exposure
See gh-33743
2023-07-25 14:37:25 +01:00
Andy Wilkinson d290d05f63 Add missing Stackdriver metric-type-prefix property
Closes gh-36499
2023-07-25 13:01:59 +01:00
Andy Wilkinson 45624c0a78 Merge branch '2.7.x' into 3.0.x
Closes gh-36555
2023-07-25 12:53:11 +01:00
Andy Wilkinson aae8665db1 Add missing management.metrics.export.wavefront properties
Closes gh-36498
2023-07-25 12:35:58 +01:00
Andy Wilkinson 826bad5820 Merge branch '2.7.x' into 3.0.x
Closes gh-36552
2023-07-25 12:08:19 +01:00
Andy Wilkinson a6c19dae07 Add missing management.metrics.export.signalfx properties
Closes gh-36497
2023-07-25 11:35:57 +01:00
Stephane Nicoll 4d708641b3 Test Gradle plugin against Gradle 8.2.1
Closes gh-36548
2023-07-25 11:52:48 +02:00
Stephane Nicoll d30afee06e Merge branch '2.7.x' into 3.0.x
Closes gh-36549
2023-07-25 11:51:46 +02:00
Stephane Nicoll a350ede711 Test Gradle plugin against Gradle 8.2.1
Closes gh-36548
2023-07-25 11:41:48 +02:00
Stephane Nicoll 259fac57a9 Merge branch '2.7.x' into 3.0.x
Closes gh-36531
2023-07-24 16:29:56 +02:00
Stephane Nicoll 854c162966 Polish "Fail fast if job name does not exist"
See gh-36060
2023-07-24 16:21:44 +02:00
Akshay Dubey c38cd74542 Fail fast if job name does not exist
See gh-36060
2023-07-24 16:15:04 +02:00
Stephane Nicoll 73cc54ad34 Prevent PostConstruct to be used in production code
Closes gh-36528
2023-07-24 16:08:50 +02:00
Andy Wilkinson 2db45e9ba3 Merge branch '2.7.x' into 3.0.x
Closes gh-36525
2023-07-24 14:34:50 +01:00
Andy Wilkinson a5d5908c27 Add missing management.metrics.export.atlas properties
Closes gh-36496
2023-07-24 14:34:11 +01:00
Stephane Nicoll 3aeb853c63 Merge branch '2.7.x' into 3.0.x
Closes gh-36519
2023-07-24 13:24:40 +02:00
Stephane Nicoll cc77b8ace1 Polish contribution
See gh-36463
2023-07-24 13:14:01 +02:00
elevne d59cec9e01 Harmonize use of Stream in ConfigDataLocationBindHandler.onSuccess
See gh-36463
2023-07-24 13:06:47 +02:00
Stephane Nicoll 74349d1192 Merge branch '2.7.x' into 3.0.x
Closes gh-36515
2023-07-24 13:00:38 +02:00
fzyzcjy e67bca121b Fix description of started and ready time metrics
See gh-36507
2023-07-24 12:57:06 +02:00
Andy Wilkinson 84c1c5ccaa Polish "Don't run process-aot or process-test-aot on reactor projects"
See gh-35377
2023-07-21 16:39:50 +01:00
Urs Keller 0308de1672 Don't run process-aot or process-test-aot on reactor projects
See gh-35377
2023-07-21 16:39:24 +01:00
Andy Wilkinson 6a2a3e2b26 Merge branch '2.7.x' into 3.0.x
Closes gh-36491
2023-07-21 15:06:34 +01:00
Andy Wilkinson 5a0f1bbe9b Polish "Correct description of overrides for spring.redis.url"
See gh-36477
2023-07-21 14:47:54 +01:00
Johnny Lim 1effd3723f Correct description of overrides for spring.redis.url
See gh-36477
2023-07-21 14:47:25 +01:00
Andy Wilkinson 960f0ea1da Revert "Upgrade to R2DBC Pool 1.0.1.RELEASE"
This reverts commit e754a1b11e.

See gh-36464
2023-07-20 09:22:21 +01:00
Andy Wilkinson e30b3fe4f2 Upgrade to Spring HATEOAS 2.0.6
Closes gh-36453
2023-07-20 08:21:42 +01:00
Andy Wilkinson 277efdc6b1 Upgrade to R2DBC Postgresql 1.0.2.RELEASE
Closes gh-36465
2023-07-20 08:21:41 +01:00
Andy Wilkinson e754a1b11e Upgrade to R2DBC Pool 1.0.1.RELEASE
Closes gh-36464
2023-07-20 08:21:36 +01:00
Andy Wilkinson f145ca0c3c Fix reflection hint generation for properties nested in superclass
Fixes gh-36406
2023-07-19 14:37:52 +01:00
Stephane Nicoll 1dcfb3cfb1 Upgrade to Spring Security 6.0.5
Closes gh-36293
2023-07-18 06:22:09 +02:00
Stephane Nicoll 7ec9f45929 Upgrade to Spring Security 5.7.10
Closes gh-36295
2023-07-18 06:21:22 +02:00
Stephane Nicoll 7913b22f6a Upgrade to Spring Kafka 3.0.9
Closes gh-36182
2023-07-17 19:57:22 +02:00
Stephane Nicoll a838cab65c Upgrade to Spring AMQP 3.0.6
Closes gh-36401
2023-07-17 19:55:53 +02:00
Stephane Nicoll bf5cdbf3f3 Upgrade to Lettuce 6.2.5.RELEASE
Closes gh-36434
2023-07-17 19:55:53 +02:00
Stephane Nicoll 0f396c91f4 Upgrade to Dependency Management Plugin 1.1.2
Closes gh-36433
2023-07-17 19:55:48 +02:00
Stephane Nicoll 250868ad84 Upgrade to Spring AMQP 2.4.14
Closes gh-36399
2023-07-17 19:53:54 +02:00
Stephane Nicoll 750096b9c2 Polish "Allow custom ExemplarSampler to be used"
See gh-35619
2023-07-17 15:46:48 +02:00
Johnny Goncalves 94b17ecd26 Allow custom ExemplarSampler to be used
See gh-35619
2023-07-17 15:44:05 +02:00
Stephane Nicoll 3586bfb629 Merge branch '2.7.x' into 3.0.x
Closes gh-36426
2023-07-17 15:22:43 +02:00
Stephane Nicoll 09e5d38348 Polish "Replace @CsvSource with @ValueSource where feasible"
See gh-36062
2023-07-17 15:16:27 +02:00
Yanming Zhou acb7acd5d9 Replace @CsvSource with @ValueSource where feasible
@ValueSource is more appropriate for single parameter.

See gh-36062
2023-07-17 15:16:26 +02:00
Jonatan Ivanov 58cfdbfa2d Add missing OTel Span attributes
OTel semantic conventions mandate certain resource attributes to present
on exported spans. This commits make sure that the attribute we add are
merged with the defaults, rather than replacing them.

See gh-36155
2023-07-17 15:00:51 +02:00
Stephane Nicoll 60150d96bd Upgrade to Spring HATEOAS 2.0.5
Closes gh-36181
2023-07-14 19:08:06 +02:00
Stephane Nicoll 0a29a6a8c3 Upgrade to Spring Data Bom 2022.0.8
Closes gh-36179
2023-07-14 19:08:06 +02:00
Stephane Nicoll beb4010d07 Upgrade to Spring HATEOAS 1.5.5
Closes gh-36413
2023-07-14 19:05:56 +02:00
Stephane Nicoll 67bae9de36 Upgrade to Spring Data Bom 2021.2.14
Closes gh-36173
2023-07-14 19:05:52 +02:00
Pengfei-Lu 8697d9ddd5 Correct conditions on auto-configured JacksonJsonpMapper
See gh-36109

Signed-off-by: Pengfei-Lu <459360594@qq.com>
2023-07-13 18:10:21 +01:00
Stephane Nicoll fbde75e149 Start building against Spring AMQP 3.0.6 snapshots
See gh-36401
2023-07-13 16:01:59 +02:00
Stephane Nicoll fc9006f53c Upgrade to Reactor Bom 2022.0.9
Closes gh-36292
2023-07-13 15:57:34 +02:00
Stephane Nicoll 23653e72be Upgrade to Dependency Management Plugin 1.1.1
Closes gh-36400
2023-07-13 15:57:33 +02:00
Stephane Nicoll b3513b5d89 Start building against Spring AMQP 2.4.14 snapshots
See gh-36399
2023-07-13 15:53:13 +02:00
Andy Wilkinson 090802b11b Use existing value rather than deducing bind method
When there is an existing value, deducing the bind method may
incorrectly result in the use of constructor binding. This
results in a failure in the configuration properties
post-processor as it refuses to bind properties to a bean whose
attributes indicate that constructor binding should have been used.

This commit updates ConfigurationPropertiesBean to avoid tryin to
deduce the bind method and instead use the presence or absence of an
existing value to determine the type of binding that should be used.
Only when there is no existing value is constructor binding
appropriate.

Fixes gh-36175
2023-07-12 11:13:48 +01:00
Andy Wilkinson 2a5a5d19b7 Update Servlet container system requirements
Closes gh-36354
2023-07-12 08:33:10 +01:00
Stephane Nicoll d45903060d Upgrade to Reactor Bom 2020.0.34
Closes gh-36172
2023-07-11 16:07:58 +02:00
Stephane Nicoll 324539e707 Upgrade to Rabbit AMQP Client 5.14.3
Closes gh-36316
2023-07-11 16:07:58 +02:00
Stephane Nicoll eb0e50f909 Upgrade to Neo4j Java Driver 4.4.12
Closes gh-36315
2023-07-11 16:07:58 +02:00
Stephane Nicoll 328d86092b Upgrade to Micrometer 1.9.13
Closes gh-36171
2023-07-11 16:07:57 +02:00
Stephane Nicoll 6d0d1ffbad Upgrade to Johnzon 1.2.21
Closes gh-36314
2023-07-11 16:07:57 +02:00
Stephane Nicoll 9142f1516e Upgrade to Janino 3.1.10
Closes gh-36313
2023-07-11 16:07:57 +02:00
Stephane Nicoll 2bc135c23b Upgrade to Groovy 3.0.18
Closes gh-36312
2023-07-11 16:07:57 +02:00
Stephane Nicoll 45cdb53e23 Upgrade to Elasticsearch 7.17.11
Closes gh-36311
2023-07-11 16:07:57 +02:00
Stephane Nicoll 8d94b4b059 Upgrade to Rabbit AMQP Client 5.16.1
Closes gh-36329
2023-07-11 14:59:57 +02:00
Stephane Nicoll 17e27251a8 Upgrade to Micrometer Tracing 1.0.8
Closes gh-36291
2023-07-11 14:59:52 +02:00
Stephane Nicoll dd6cbd3d8c Upgrade to Micrometer 1.10.9
Closes gh-36178
2023-07-11 14:59:52 +02:00
Stephane Nicoll 601a7d9043 Upgrade to jOOQ 3.17.14
Closes gh-36328
2023-07-11 14:59:51 +02:00
Stephane Nicoll 11104412c0 Upgrade to JBoss Logging 3.5.3.Final
Closes gh-36327
2023-07-11 14:59:46 +02:00
Stephane Nicoll abd9494d0a Upgrade to Janino 3.1.10
Closes gh-36326
2023-07-11 14:59:41 +02:00
Stephane Nicoll e99311d10b Upgrade to Jakarta WebSocket 2.1.1
Closes gh-36325
2023-07-11 14:59:37 +02:00
Stephane Nicoll a9a93fed6f Upgrade to Infinispan 14.0.12.Final
Closes gh-36324
2023-07-11 14:59:32 +02:00
Stephane Nicoll d6c468a46d Upgrade to Hibernate Validator 8.0.1.Final
Closes gh-36323
2023-07-11 14:59:27 +02:00
Stephane Nicoll 642be39556 Upgrade to Groovy 4.0.13
Closes gh-36322
2023-07-11 14:59:22 +02:00
Andy Wilkinson 9a03a353ec Start building against Spring Security 5.7.10 snapshots
See gh-36295
2023-07-10 13:56:57 +01:00
Andy Wilkinson 4a9327b3f1 Start building against Spring Security 6.0.5 snapshots
See gh-36293
2023-07-10 13:43:24 +01:00
Andy Wilkinson 7462065f38 Start building against Reactor Bom 2022.0.9 snapshots
See gh-36292
2023-07-10 13:43:19 +01:00
Andy Wilkinson b1f9be6a28 Start building against Micrometer Tracing 1.0.8 snapshots
See gh-36291
2023-07-10 13:43:14 +01:00
Andy Wilkinson 732424f7cb Polish 2023-07-07 12:19:05 +01:00
Andy Wilkinson cc80bb78fe Merge branch '2.7.x' into 3.0.x
Closes gh-36275
2023-07-07 12:06:51 +01:00
Andy Wilkinson 52f732920b Support multiple health groups with an additional path with Jersey
This commit knowingly makes breaking API changes to
JerseyHealthEndpointAdditionalPathResourceFactory. We considered
other options but they all had the potential to be backwards
incompatible in one way or another. Faced with that situation we
concluded that the likelihood of anyone using the modified API
directly is small enough to warrant making the breaking changes.
If it becomes apparent that we have misjudged things we can revisit
the changes in the future.

Closes gh-36250
2023-07-07 11:21:56 +01:00
Andy Wilkinson 4d70b83e80 Improve javadoc of ClientHttpRequestFactories
Closes gh-36267
2023-07-06 19:42:17 +01:00
Johnny Lim 0fa58c04e7 Use Stream.toList()
See gh-36167
2023-07-05 09:38:19 +01:00
Eddú Meléndez f57e6a1fa5 Use spring-amqp-bom
See gh-36168
2023-07-05 09:19:24 +01:00
Yanming Zhou 9439494923 Polish formatting in "Running Spring Batch Jobs on Startup"
See gh-36225
2023-07-05 09:12:07 +01:00
Andy Wilkinson 581c2633f8 Merge branch '2.7.x' into 3.0.x
Closes gh-36229
2023-07-05 09:09:07 +01:00
Andy Wilkinson f4c996b432 Polish "Check for Class and ResolvableType object type attributes"
See gh-36224
2023-07-05 09:04:58 +01:00
Bernardo Bulgarelli 3a7185206e Check for Class and ResolvableType object type attributes
See gh-36224
2023-07-05 09:04:04 +01:00
Andy Wilkinson cbc0f7117f Merge branch '2.7.x' into 3.0.x
Closes gh-36226
2023-07-05 08:52:55 +01:00
Andy Wilkinson fe08c70973 Test Gradle plugin against Gradle 8.2
Closes gh-36207
2023-07-05 08:13:24 +01:00
Phillip Webb 9884abb379 Merge branch '2.7.x' into 3.0.x
Closes gh-36218
2023-07-04 15:18:15 +01:00
Phillip Webb fc31e14e72 Polish 'Improve Kubernetes probe customization documentation'
See gh-34978
2023-07-04 15:17:20 +01:00
Ivo Smid 028ff3a7be Improve Kubernetes probe customization documentation
See gh-34978
2023-07-04 15:17:20 +01:00
Andy Wilkinson b764b5beee Merge branch '2.7.x' into 3.0.x
Closes gh-36214
2023-07-04 15:13:19 +01:00
Andy Wilkinson 1f75ba557e Document HTTP client auto-detection for RestTemplate and WebClient
Closes gh-34136
2023-07-04 15:09:40 +01:00
Phillip Webb ab7e4da703 Merge branch '2.7.x' into 3.0.x
Closes gh-36208
2023-07-04 12:18:52 +01:00
Phillip Webb 5d0640a356 Use MergedAnnotations for `@AliasFor` support
Update `ImportsContextCustomizer` to use `MergedAnnotations` so
that `@AliasFor` can be supported.

See gh-34917
2023-07-04 12:17:58 +01:00
Laurent Martelli 9baf23ccd5 Test that ImportsContextCustomizer can support @AliasFor
Add test to ensure that `ImportsContextCustomizer` can support
`@AliasFor` annotations.

See gh-34917
2023-07-04 12:17:58 +01:00
Andy Wilkinson 2b1189ff31 Start building against Spring Kafka 3.0.9 snapshots
See gh-36182
2023-07-03 16:50:09 +01:00
Andy Wilkinson 356504ade4 Start building against Spring HATEOAS 2.0.5 snapshots
See gh-36181
2023-07-03 16:50:04 +01:00
Andy Wilkinson c6d0c15c57 Start building against Spring Data Bom 2022.0.8 snapshots
See gh-36179
2023-07-03 16:49:55 +01:00
Andy Wilkinson fc7e9d277b Start building against Micrometer 1.10.9 snapshots
See gh-36178
2023-07-03 16:49:50 +01:00
Andy Wilkinson a3990f16b9 Start building against Spring Data Bom 2021.2.14 snapshots
See gh-36173
2023-07-03 15:41:15 +01:00
Andy Wilkinson b9881fa6f0 Start building against Reactor Bom 2020.0.34 snapshots
See gh-36172
2023-07-03 15:41:10 +01:00
Andy Wilkinson 90760e834f Start building against Micrometer 1.9.13 snapshots
See gh-36171
2023-07-03 15:41:05 +01:00
Phillip Webb f1b0d76d9b Merge branch '2.7.x' into 3.0.x
Closes gh-36162
2023-07-02 19:46:45 +01:00
Phillip Webb b6990940b1 Polish 'Choose SAML party based on entity ID rather than always using first'
See gh-35902
2023-07-02 19:02:08 +01:00
Lasse Lindqvist 864af59adc Choose SAML party based on entity ID rather than always using first
Update `Saml2RelyingPartyRegistrationConfiguration` so that
`RelyingPartyRegistrations` uses `collectionFromMetadataLocation`
rather than `fromMetadataLocation` and searches candidates for a
matching entity ID.

Prior to this commit, it was possible for the wrong provider to be
used if multiple candidates existed in the returned metadata.

See gh-35902
2023-07-02 18:54:34 +01:00
Phillip Webb 566549021b Merge branch '2.7.x' into 3.0.x
Closes gh-36159
2023-07-02 14:00:47 +01:00
Phillip Webb 51ee702dac Allow configprops endpoint stringify primitive wrappers
Update `ConfigurationPropertiesReportEndpoint` so that primitive
wrapper input values in the Environment are stringified for display.

Fixes gh-36076
2023-07-02 13:59:30 +01:00
Phillip Webb a14ddd6900 Polish adoc formatting 2023-06-30 14:54:21 +01:00
Andy Wilkinson 70406452df Merge branch '2.7.x' into 3.0.x
Closes gh-36144
2023-06-30 14:47:20 +01:00
Andy Wilkinson b06e7e60f9 Polish "Fix asymmetry of equals when element has trailing dashes"
See gh-34804
2023-06-30 14:38:31 +01:00
Eyðun Nielsen a86429a62a Fix asymmetry of equals when element has trailing dashes
See gh-34804
2023-06-30 14:37:47 +01:00
Andy Wilkinson 3d1ca62a6f Merge branch '2.7.x' into 3.0.x
Closes gh-36141
2023-06-30 14:06:39 +01:00
Andy Wilkinson 362182efd8 Polish "Polish Kafka Properties Docs"
See gh-36032
2023-06-30 14:06:13 +01:00
Gary Russell 025063e708 Polish Kafka Properties Docs
There are 4 client types but there were a couple of places where not
all client types were mentioned (such as 'applies to producers,
consumers and admins').

See gh-36032
2023-06-30 14:01:26 +01:00
Andy Wilkinson 66aa55b65d Merge branch '2.7.x' into 3.0.x
Closes gh-36138
2023-06-30 13:00:25 +01:00
JuHyeong Ahn dbdb4d4e8d Fix typo in Using R2DBC
See gh-36019
2023-06-30 12:59:49 +01:00
Moritz Halbritter 606063589f Document trace propagation with RestTemplate and WebClient
Closes gh-34053
2023-06-30 10:44:14 +02:00
Andy Wilkinson fa72f90a10 Avoid NPE when a PeriodicTrigger has no initial delay
Closes gh-36081
2023-06-30 08:47:34 +01:00
Andy Wilkinson 93f8bd2170 Merge branch '2.7.x' into 3.0.x
Closes gh-36126
2023-06-30 08:25:53 +01:00
Andy Wilkinson 996252f929 Stop using deprecated classifier property
Closes gh-36125
2023-06-30 08:22:14 +01:00
Scott Frederick 884489e73a Apply system properties to RestTemplate HttpClient
Fixes gh-35815
2023-06-29 16:31:09 -06:00
Andy Wilkinson 6effd6061c Provide hints when template auto-config is excluded
Fixes gh-35682
2023-06-29 18:09:30 +01:00
Moritz Halbritter 2b398827de Add "baggage" section to tracing docs
Closes gh-34977
2023-06-29 11:30:58 +02:00
Andy Wilkinson 79cd3a027a Merge branch '2.7.x' into 3.0.x
Closes gh-36098
2023-06-27 20:30:24 +01:00
Andy Wilkinson 9e1f2c4257 Tolerate Flway 9.20
Closes gh-36029
2023-06-27 20:22:24 +01:00
Andy Wilkinson b3c321e40c Polish javadoc of RestTemplateBuilder.requestFactory(Function)
Closes gh-36046
2023-06-27 20:13:11 +01:00
Andy Wilkinson b2bc114d6f Update javadoc to link to non-deprecated ConstructorBinding
Closes gh-36045
2023-06-27 20:08:03 +01:00
Andy Wilkinson ffbef7bb80 Test server.max-http-request-header-size with Undertow
Closes gh-36047
2023-06-27 13:50:04 +01:00
Scott Frederick 4a3abdd7c3 Merge branch '2.7.x' into 3.0.x
Closes gh-36053
2023-06-23 15:46:27 -06:00
Johnny Lim 59d4bf97a1 Add Javadoc since to ImageReference.inTaglessForm()
See gh-36048
2023-06-23 15:45:29 -06:00
Scott Frederick eeeb2ad72a Merge branch '2.7.x' into 3.0.x
Closes gh-36049
2023-06-23 15:19:44 -06:00
Johnny Lim 4a2c9d99dc Remove redundant Files.delete() calls in tests
See gh-35986
2023-06-23 15:14:59 -06:00
Andy Wilkinson 2fae5de245 Merge branch '2.7.x' into 3.0.x
Closes gh-36043
2023-06-23 15:50:02 +01:00
Andy Wilkinson d2966e1cbf Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
See gh-35915
2023-06-23 12:38:12 +01:00
ThomazPassarelli f9da30faf1 Replace calls to verifyComplete() to avoid indefinite blocking
See gh-35915
2023-06-23 12:16:26 +01:00
Phillip Webb 9db3c5a2f7 Polish 2023-06-22 00:24:39 -07:00
Phillip Webb f7af1bab5b Upgrade to Spring WS 4.0.5
Closes gh-36010
2023-06-21 23:40:28 -07:00
Phillip Webb 5c8ed944ca Start building against Spring WS 4.0.5 snapshots
See gh-36010
2023-06-21 16:49:12 -07:00
Andy Wilkinson f6841c3c16 Revert "Start building against Spring WS 3.1.7 snapshots"
This reverts commit 5e963b02a7.

See gh-35732
2023-06-21 20:55:10 +01:00
Andy Wilkinson 39c382713b Initialize WebSocket infrastructure when using WebFlux and Jetty
In Spring Framework 5.x with Jetty 9, the reactive
JettyRequestUpgradeStrategy was able to initialize Jetty's WebSocket
infrastructure itself. With Jetty 10 this is no longer possible and
Boot must perform the initialization as part of preparing the
reactive JettyWebServer.

This commit updates the reactive WebSocket auto-configuration to
initialize Jetty's WebSocket infrastructure as part of creating the
reactive JettyWebServer.

Fixes gh-33347
2023-06-21 14:59:50 +01:00
Andy Wilkinson 641f00f24c Disable test when Java version is too high
Gradle 7.3.3 does not support Java 20 so the test that verifies that
the plugin fails fast when running on a version of Gradle that it
does not support needs to be disabled on Java 20 and later.

See gh-35931
2023-06-21 13:12:20 +01:00
Andy Wilkinson f584d6dbd9 Replace `@EnableBatchProcessing` in slice test examples
Using `@EnableBatchProcessing` is no longer necessary to enable
Batch's auto-configuration so it's no longer a good example when
discussing sliced tests and user configuration.

This commit replaces `@EnableBatchProcessing` with an alternative
annotation, `@EnableMongoAuditing` and updates the accompanying
text.

Closes gh-33435
2023-06-21 12:41:28 +01:00
Andy Wilkinson 35ee52275e Upgrade to Spring Integration 6.0.6
Closes gh-35740
2023-06-21 11:06:49 +01:00
Andy Wilkinson 2fd5319eda Merge branch '2.7.x' into 3.0.x
Closes gh-36002
2023-06-21 11:02:34 +01:00
Andy Wilkinson 0fb4c9a095 Prohibit upgrades to RSocket 1.1.4
Closes gh-35798
2023-06-21 10:55:48 +01:00
Stephane Nicoll 4c06dc49b3 Upgrade to Spring Session 3.0.2
Closes gh-35744
2023-06-20 16:59:47 +02:00
Stephane Nicoll cf955671d8 Upgrade to Spring Security 6.0.4
Closes gh-35743
2023-06-20 16:59:46 +02:00
Stephane Nicoll 6066fb53ed Upgrade to Spring Kafka 3.0.8
Closes gh-35993
2023-06-20 16:59:46 +02:00
Stephane Nicoll 0b582651b3 Upgrade to Spring GraphQL 1.1.5
Closes gh-35775
2023-06-20 16:59:41 +02:00
Stephane Nicoll 1940d876c3 Upgrade to Spring AMQP 3.0.5
Closes gh-35737
2023-06-20 16:59:40 +02:00
Stephane Nicoll a7d71a3921 Upgrade to Netty 4.1.94.Final
Closes gh-35992
2023-06-20 16:59:40 +02:00
Stephane Nicoll 3e3428af95 Upgrade to Infinispan 14.0.11.Final
Closes gh-35990
2023-06-20 16:59:29 +02:00
Stephane Nicoll e7f6faf6ae Upgrade to Hazelcast 5.1.7
Closes gh-35989
2023-06-20 16:59:23 +02:00
Stephane Nicoll cb5330fd11 Upgrade to Spring Session Bom 2021.2.2
Closes gh-35731
2023-06-20 16:57:04 +02:00
Stephane Nicoll b0af370038 Upgrade to Spring Security 5.7.9
Closes gh-35730
2023-06-20 16:57:03 +02:00
Stephane Nicoll f206f1807f Upgrade to Netty 4.1.94.Final
Closes gh-35988
2023-06-20 16:57:03 +02:00
Stephane Nicoll 0dd93de05d Upgrade to Hazelcast 5.1.7
Closes gh-35987
2023-06-20 16:56:56 +02:00
Moritz Halbritter 975e2d110c Polish CompositePropagationFactory
Remove shaded Guava import
2023-06-19 21:03:05 +02:00
Stephane Nicoll 607c155d4c Upgrade to Spring Retry 2.0.2
Closes gh-35742
2023-06-17 17:14:33 +02:00
Stephane Nicoll 3194edefbd Upgrade to Spring LDAP 3.0.4
Closes gh-35741
2023-06-17 17:14:32 +02:00
Stephane Nicoll 381857b3d3 Upgrade to Spring Data Bom 2022.0.7
Closes gh-35738
2023-06-17 17:14:32 +02:00
Stephane Nicoll 33341f241d Upgrade to Spring Data Bom 2021.2.13
Closes gh-35728
2023-06-17 17:03:11 +02:00
Stephane Nicoll b4b6477899 Upgrade to Spring AMQP 2.4.13
Closes gh-35727
2023-06-17 17:03:10 +02:00
Phillip Webb af846da69b Merge branch '2.7.x' into 3.0.x
Closes gh-35933
2023-06-16 16:14:52 -07:00
Phillip Webb efa072204a Don't migrate properties that cause a circular reference
Update `PropertiesMigrationReporter` so that properties are only
migrated automatically when they don't cause a circular reference.

Fixes gh-35919
2023-06-16 16:14:41 -07:00
Phillip Webb 2f39ebfe89 Polish 2023-06-16 15:23:12 -07:00
Phillip Webb 48e13af8c4 Merge branch '2.7.x' into 3.0.x 2023-06-16 14:34:54 -07:00
Phillip Webb b8d2c279ee Update copyright year of changed files 2023-06-16 14:32:43 -07:00
Scott Frederick fbba2df7bf Enable Gradle plugin tests on Java 20
Closes gh-35931
2023-06-16 16:10:24 -05:00
Phillip Webb 0fd1c89889 Polish 2023-06-16 13:53:33 -07:00
Phillip Webb 9b72cc41ab Polish 'Add support for multiple tracing propagation formats'
See gh-35611
2023-06-16 13:43:46 -07:00
Phillip Webb 691b549e36 Merge branch '2.7.x' into 3.0.x 2023-06-16 10:18:43 -07:00
Phillip Webb f3f8610539 Polish 2023-06-16 10:17:08 -07:00
Phillip Webb 4c8b93b37d Merge branch '2.7.x' into 3.0.x
Closes gh-35920
2023-06-15 14:26:36 -07:00
Phillip Webb 137f4ee451 Support reporting of custom Log4J2 log levels from the LoggersEndpoint
Support custom Log4J2 log levels by changing `LoggerConfiguration` so
that it can now report levels using a `LevelConfiguration` object
rather than the limited `LogLevel` enum.

The `Log4J2LoggingSystem` class now uses `LevelConfiguration.ofCustom`
for custom logging levels, rather than throwing an exception.

The `LoggersEndpoint` has also been updated so that it can return the
custom logger name.

Fixes gh-35227
2023-06-15 14:03:22 -07:00
Andy Wilkinson eeea065595 Merge branch '2.7.x' into 3.0.x
Closes gh-35912
2023-06-15 15:49:36 +01:00
Andy Wilkinson e779fb0bc4 Validate constructor bound config props that implement Validator
Closes gh-33669
2023-06-15 15:29:20 +01:00
Andy Wilkinson 7bb3caf914 Merge branch '2.7.x' into 3.0.x
Closes gh-35910
2023-06-15 14:47:01 +01:00
Andy Wilkinson ee606db34a Update Data REST starter description to mention Spring MVC
Closes gh-35678
2023-06-15 14:46:23 +01:00
Andy Wilkinson a5981a4dac Merge branch '2.7.x' into 3.0.x
Closes gh-35908
2023-06-15 14:38:13 +01:00
Andy Wilkinson 9feb84e234 Add DynmicPropertySource to ordered list of property sources
Closes gh-32901
2023-06-15 14:36:38 +01:00
Moritz Halbritter 8cd8d21720 Add support for multiple tracing propagation formats
See gh-35611
2023-06-15 13:37:33 +02:00