Commit Graph

50719 Commits

Author SHA1 Message Date
Stéphane Nicoll
e3aac5d442 Merge branch '3.3.x' 2024-09-19 10:18:51 +02:00
Stéphane Nicoll
4e860f1f4d Merge branch '3.2.x' into 3.3.x 2024-09-19 10:17:38 +02:00
Stéphane Nicoll
d137191494 Next development version (v3.2.11-SNAPSHOT) 2024-09-19 10:17:23 +02:00
Phillip Webb
d72a9d9eb5 Allow EndpointRequest to match additional paths
Add `toAdditionalPaths(...)` methods on the servlet and reactive
`EndpointRequest` classes to support matching of additional paths.

A new `AdditionalPathsMapper` interface provides the mappings between
endpoint IDs and any additional paths that they might use. The existing
`AutoConfiguredHealthEndpointGroups` class has been updated to implement
the interface.

Auto-configurations have also been updated so that additional health
endpoint paths (typically `/livez` and `/readyz`) are permitted
when using Spring Security without any custom configuration.

Fixes gh-40962
2024-09-18 23:47:13 -07:00
Phillip Webb
f5b6514bef Allow additional context interfaces to be defined for testing
Update `AssertableApplicationContext` and `ApplicationContextRunner`
implementations to support additional `ApplicationContext` interfaces.

Closes gh-42369
2024-09-18 23:47:13 -07:00
Stéphane Nicoll
8ac3528b89 Upgrade to SendGrid 4.10.3
Closes gh-42368
2024-09-19 08:15:40 +02:00
Stéphane Nicoll
ced82a854c Upgrade to Zipkin Reporter 3.4.2
Closes gh-42367
2024-09-19 08:15:36 +02:00
Stéphane Nicoll
25e45831ea Merge branch '3.3.x' 2024-09-19 08:13:59 +02:00
Stéphane Nicoll
97dd01e28a Upgrade to SendGrid 4.10.3
Closes gh-42366
2024-09-19 07:48:46 +02:00
Stéphane Nicoll
1b3b3aaef4 Upgrade to Hibernate 6.5.3.Final
Closes gh-42365
2024-09-19 07:48:42 +02:00
Stéphane Nicoll
c2adc3b6cb Upgrade to Zipkin Reporter 3.4.2
Closes gh-42364
2024-09-19 07:48:38 +02:00
Stéphane Nicoll
1ee174167f Merge branch '3.3.x'
Closes gh-42363
2024-09-19 07:44:14 +02:00
Stéphane Nicoll
0271b24e0e Merge branch '3.2.x' into 3.3.x
Closes gh-42362
2024-09-19 07:44:03 +02:00
Stéphane Nicoll
ae8315e90a Use Liberica for Java 23 CI
Closes gh-42354
2024-09-19 07:39:35 +02:00
Phillip Webb
d7c6589b5e Make PulsarContainerFactoryCustomizers package private
See gh-42182
2024-09-18 18:31:40 -07:00
Andy Wilkinson
47134974fc Revert "Start building against Spring Session 3.4.0 snapshots"
This reverts commit 0ce4170612.

See gh-42149
2024-09-18 19:09:54 +01:00
Andy Wilkinson
31a41795fb Merge branch '3.3.x' 2024-09-18 15:15:23 +01:00
Andy Wilkinson
49569909ea Merge branch '3.2.x' into 3.3.x 2024-09-18 15:15:06 +01:00
Phillip Webb
f9379f4576 Apply nohttp check per-project rather than at root
Switch nohttp checks to a convention that is applied per-project rather
than at the root. This should help to reduce memory consumption.

Closes gh-42332
2024-09-18 15:14:52 +01:00
Andy Wilkinson
1a4f5abb13 Merge branch '3.3.x'
Closes gh-42358
2024-09-18 14:58:35 +01:00
Andy Wilkinson
4a6793eab5 Merge branch '3.2.x' into 3.3.x
Closes gh-42357
2024-09-18 14:55:35 +01:00
Andy Wilkinson
1240c59482 Only configure plugin classpath where it's needed
When spring-boot-gradle-plugin is using GradleRunner, it needs to be
configured with a custom plugin classpath to account for the fact
that our Gradle plugin is on the classpath of the system classloader
but some of the other plugins would only be available on a
Gradle-created classloader. This imbalance cause class loading
problems as code in spring-boot-gradle-plugin can't see types at
runtime that are only available on the Gradle-created classloader.

To overcome this, we need to configure the GradleRunner with a custom
plugin classpath that contains both spring-boot-gradle-plugin and all
of the other plugins that are used in its various integration tests.
Previously, this was done in GradleBuild that's used by both
spring-boot-gradle-plugin and spring-boot-image-tests. This caused
a problem as spring-boot-image-tests does not have the
above-described problem and trying to correct it did not work leaving
tests that use spring-boot-gradle-plugin unable to see other plugins
such that the native image plugin.

This commit reworks the customization of the plugin classpath so that
it's only done in spring-boot-gradle-plugin's integration tests.

Closes gh-42338
2024-09-18 14:53:54 +01:00
Andy Wilkinson
713afae013 Accommodate next execution time being unknown
A task's next execution time is unknown if, for example, it's
currently running. When it's unknown the nextExecution.time will be
missing from the json describing the task. This commit updates the
documentation test to accommodate this possibility.

Closes gh-42351
2024-09-18 11:55:35 +01:00
Andy Wilkinson
c1bd5bdc8b Upgrade to Spring Batch 5.2.0-M1
Closes gh-42142
2024-09-18 10:30:09 +01:00
Stéphane Nicoll
95c401e1eb Merge pull request #42340 from izeye
* pr/42340:
  Polish

Closes gh-42340
2024-09-18 11:21:11 +02:00
Johnny Lim
a0d1c10d8a Polish
See gh-42340
2024-09-18 11:19:59 +02:00
Andy Wilkinson
7eaf6d1a96 Prohibit upgrades to Kotlin Coroutines 1.9
Closes gh-42348
2024-09-18 09:49:28 +01:00
Andy Wilkinson
9750425ac7 Merge branch '3.3.x'
Closes gh-42353
2024-09-18 09:48:02 +01:00
Andy Wilkinson
23f064db89 Merge branch '3.2.x' into 3.3.x
Closes gh-42352
2024-09-18 09:45:14 +01:00
Andy Wilkinson
dc72e3853b Try to ensure that distribution always has a non-empty value
See gh-42345
2024-09-18 09:29:33 +01:00
Andy Wilkinson
6d8a421114 Update CI to use Java 23 GA
Closes gh-42345
2024-09-18 09:22:39 +01:00
Andy Wilkinson
7e096aac60 Upgrade to Tomcat 10.1.30
Closes gh-42347
2024-09-18 08:57:42 +01:00
Andy Wilkinson
fe90ef0d13 Upgrade to Spring Integration 6.4.0-M3
Closes gh-42145
2024-09-18 08:57:41 +01:00
Andy Wilkinson
32917323f9 Upgrade to Spring Authorization Server 1.4.0-M2
Closes gh-42141
2024-09-18 08:57:40 +01:00
Andy Wilkinson
6fc881e565 Upgrade to Rabbit AMQP Client 5.22.0
Closes gh-42350
2024-09-18 08:57:40 +01:00
Andy Wilkinson
59fb90ea0c Upgrade to Hibernate 6.6.1.Final
Closes gh-42349
2024-09-18 08:57:35 +01:00
Andy Wilkinson
db4e8c5133 Merge branch '3.3.x' 2024-09-18 08:48:31 +01:00
Andy Wilkinson
5ff86ea49f Upgrade to Tomcat 10.1.30
Closes gh-42346
2024-09-18 08:48:08 +01:00
Andy Wilkinson
3706dced23 Upgrade to Spring Integration 6.3.4
Closes gh-42134
2024-09-18 08:48:02 +01:00
Andy Wilkinson
0bb727341f Merge branch '3.3.x' 2024-09-18 08:44:10 +01:00
Andy Wilkinson
7ed34242d2 Merge branch '3.2.x' into 3.3.x 2024-09-18 08:43:54 +01:00
Andy Wilkinson
ef5bc91b35 Upgrade to Tomcat 10.1.30
Closes gh-42344
2024-09-18 08:19:28 +01:00
Andy Wilkinson
c37f786914 Upgrade to Spring Integration 6.2.9
Closes gh-42126
2024-09-18 08:19:23 +01:00
Phillip Webb
5324c646e1 Update merge script to support commercial repository
See gh-42333
2024-09-17 13:30:12 -07:00
Phillip Webb
58834133f1 Merge branch '3.3.x' 2024-09-17 12:33:55 -07:00
Phillip Webb
a5f27c2521 Merge branch '3.2.x' into 3.3.x 2024-09-17 12:33:34 -07:00
Phillip Webb
9726ddfe42 Add 'spring.build-type' property
See gh-42333
2024-09-17 12:32:50 -07:00
Phillip Webb
7934728102 Merge branch '3.3.x' 2024-09-17 12:29:47 -07:00
Phillip Webb
75bea6baf1 Merge branch '3.2.x' into 3.3.x 2024-09-17 12:27:39 -07:00
Phillip Webb
cad5dd2b85 Use variables for runs-on settings
See gh-42333
2024-09-17 12:25:54 -07:00