Commit Graph

26720 Commits

Author SHA1 Message Date
Stéphane Nicoll 170bb5936c Upgrade to Pooled JMS 3.1.7
Closes gh-42621
2024-10-14 11:16:30 +02:00
Stéphane Nicoll ec3d59c5ce Upgrade to Netty 4.1.114.Final
Closes gh-42620
2024-10-14 11:16:30 +02:00
Stéphane Nicoll 0e9bb034ab Upgrade to jOOQ 3.18.20
Closes gh-42618
2024-10-14 11:16:30 +02:00
Stéphane Nicoll 6b145a1ff3 Upgrade to Jetty 12.0.14
Closes gh-42617
2024-10-14 11:16:30 +02:00
Stéphane Nicoll 145dcdece0 Upgrade to Jetty Reactive HTTPClient 4.0.8
Closes gh-42616
2024-10-14 11:16:29 +02:00
Stéphane Nicoll a0083d6fee Upgrade to Jersey 3.1.9
Closes gh-42615
2024-10-14 11:16:29 +02:00
Stéphane Nicoll b8d47541e8 Upgrade to Infinispan 14.0.32.Final
Closes gh-42614
2024-10-14 11:16:29 +02:00
Stéphane Nicoll 08cf869844 Upgrade to Dropwizard Metrics 4.2.28
Closes gh-42613
2024-10-14 11:16:29 +02:00
Stéphane Nicoll 8f132486ff Upgrade to ActiveMQ 5.18.6
Closes gh-42612
2024-10-14 11:16:29 +02:00
Moritz Halbritter 2c929db53d Merge branch '3.3.x'
Closes gh-42627
2024-10-14 11:05:58 +02:00
Tran Ngoc Nhan e0e50f8f5e Fix Spring Data Cassandra Spring LDAP reference doc links
See gh-42599
2024-10-14 11:05:27 +02:00
Moritz Halbritter 384a623363 Merge branch '3.3.x'
Closes gh-42625
2024-10-14 11:00:36 +02:00
Moritz Halbritter 8a783dfdc7 Merge branch '3.2.x' into 3.3.x
Closes gh-42624
2024-10-14 11:00:27 +02:00
Yanming Zhou a80d7d6aff Polish ConfigurationPropertiesBinder
See gh-42610
2024-10-14 10:52:23 +02:00
SangYong 975a3aacd6 Polish SpringApplication
See gh-42606
2024-10-14 10:47:24 +02:00
Moritz Halbritter 957e2f8b7f Add warning if sensitive container paths are bound
Closes gh-41643
2024-10-14 10:18:34 +02:00
Moritz Halbritter 35361d14a3 Merge branch '3.3.x'
Closes gh-42597
2024-10-11 14:10:27 +02:00
Moritz Halbritter 3c6e3c14a8 Merge branch '3.2.x' into 3.3.x
Closes gh-42596
2024-10-11 14:10:12 +02:00
Moritz Halbritter 47129c0c81 Remove links to Spring Data GemFire
Closes gh-42575
2024-10-11 14:09:10 +02:00
Moritz Halbritter 95d7582f58 Fix wrong classname in logging documentation 2024-10-11 13:56:40 +02:00
Moritz Halbritter bd036eb29f Add MyCustomFormat.kt example to documentation
Closes gh-42594
2024-10-11 13:45:16 +02:00
Phillip Webb 8aee3e1e92 Allow structure logging JSON to be customized
Introduce a new `StructureLoggingJsonMembersCustomizer` interface as
well as additional properties that can be used to customize the JSON
produced with structured logging.

Closes gh-42486
2024-10-10 23:52:34 -07:00
Phillip Webb 27c59b8cb5 Add filter, name processor and value processor support to `JsonWriter`
Update `JsonWriter` to support filtering and processing of names/values.
This update will allow us to offer better customization options with
structured logging.

See gh-42486
2024-10-10 23:50:34 -07:00
Phillip Webb 763266f20d Rationalize structured logging service classes
Rename `ElasticCommonSchemaService` & `GraylogExtendedLogFormatService`
and change a few of the property names. The `Service` suffix was
originally chosen because ECS uses the term, but `Properties` is more
common in the Spring Boot codebase and works better for Graylog.

Closes gh-42578
2024-10-10 23:46:27 -07:00
Phillip Webb aed4546c43 Extract `WritableJson` from `JsonWriter`
Make `WritableJson` a top level class rather than a nested class inside
`WritableJson`.

Closes gh-42595
2024-10-10 23:45:14 -07:00
Phillip Webb b169439f86 Polish 2024-10-10 17:18:04 -07:00
Andy Wilkinson 3c095b4ec2 Prefer DynamicPropertyRegistar to DynamicPropertyRegistry
Closes gh-41996
2024-10-10 15:25:44 +01:00
Moritz Halbritter dd9a998cfe Polish "Add property to specify Docker Compose flags"
See gh-42571
2024-10-10 08:56:02 +02:00
Dmytro Nosan 2bee29c2fd Add property to specify Docker Compose flags
See gh-42571
2024-10-10 08:56:02 +02:00
Andy Wilkinson 31fada6d3e Start building against Spring Framework 6.2.0 snapshots
See gh-42562
2024-10-09 19:13:04 +01:00
Andy Wilkinson 033b4d89bb fixup! Start building against Spring Authorization Server 1.4.0 snapshots 2024-10-09 19:11:03 +01:00
Andy Wilkinson a6b066aeb6 Start building against Spring HATEOAS 2.4.0-RC2 snapshots
See gh-42572
2024-10-09 19:08:14 +01:00
Andy Wilkinson 2e5bd9fc4a Start building against Spring Security 6.4.0 snapshots
See gh-42568
2024-10-09 19:07:56 +01:00
Andy Wilkinson bfc133d551 Start building against Spring Retry 2.0.10 snapshots
See gh-42567
2024-10-09 18:49:16 +01:00
Andy Wilkinson 57c88aead7 Start building against Spring Pulsar 1.2.0 snapshots
See gh-42566
2024-10-09 18:49:16 +01:00
Andy Wilkinson 72cb71b256 Start building against Spring LDAP 3.2.7 snapshots
See gh-42565
2024-10-09 18:49:15 +01:00
Andy Wilkinson 29c425acc6 Start building against Spring Kafka 3.3.0 snapshots
See gh-42564
2024-10-09 18:49:15 +01:00
Andy Wilkinson be330baec1 Start building against Spring Integration 6.4.0 snapshots
See gh-42563
2024-10-09 18:49:14 +01:00
Andy Wilkinson 76d6f1aa7e Upgrade to Neo4j Java Driver 5.25.0
Closes gh-42570
2024-10-09 18:49:14 +01:00
Andy Wilkinson 4647d30f6e Start building against Spring Data Bom 2024.1.0 snapshots
See gh-42561
2024-10-09 18:49:13 +01:00
Andy Wilkinson 9d2acf76ca Start building against Spring Batch 5.2.0 snapshots
See gh-42560
2024-10-09 18:49:13 +01:00
Andy Wilkinson 11960df595 Start building against Spring Authorization Server 1.4.0 snapshots
See gh-42559
2024-10-09 18:49:05 +01:00
Andy Wilkinson 70c1cabe66 Start building against Spring AMQP 3.2.0 snapshots
See gh-42558
2024-10-09 17:10:00 +01:00
Andy Wilkinson 6c500c9662 Start building against Reactor Bom 2024.0.0 snapshots
See gh-42557
2024-10-09 17:10:00 +01:00
Andy Wilkinson 1d8614a065 Start building against Micrometer Tracing 1.4.0 snapshots
See gh-42556
2024-10-09 17:10:00 +01:00
Andy Wilkinson 83afef4f60 Start building against Micrometer 1.14.0 snapshots
See gh-42555
2024-10-09 17:10:00 +01:00
Andy Wilkinson 638cddeefa Start building against Spring Session 3.3.3 snapshots
See gh-42554
2024-10-09 10:25:05 +01:00
Andy Wilkinson 6ccb131de1 Start building against Spring Security 6.3.4 snapshots
See gh-42553
2024-10-09 10:25:00 +01:00
Andy Wilkinson 44c2925aa0 Start building against Spring Retry 2.0.10 snapshots
See gh-42552
2024-10-09 10:24:55 +01:00
Andy Wilkinson 19f774b553 Start building against Spring Pulsar 1.1.5 snapshots
See gh-42551
2024-10-09 10:24:51 +01:00
Andy Wilkinson c9cdd32c9e Start building against Spring LDAP 3.2.7 snapshots
See gh-42550
2024-10-09 10:24:46 +01:00
Andy Wilkinson f54603c184 Start building against Spring Integration 6.3.5 snapshots
See gh-42549
2024-10-09 10:24:42 +01:00
Andy Wilkinson 35f84f1d36 Start building against Spring Data Bom 2024.0.5 snapshots
See gh-42547
2024-10-09 10:24:33 +01:00
Andy Wilkinson 620a1b5c9a Start building against Spring Authorization Server 1.3.3 snapshots
See gh-42546
2024-10-09 10:24:28 +01:00
Andy Wilkinson f6395c3596 Start building against Reactor Bom 2023.0.11 snapshots
See gh-42545
2024-10-09 10:24:24 +01:00
Andy Wilkinson dfc40b44bb Start building against Micrometer Tracing 1.3.5 snapshots
See gh-42544
2024-10-09 10:24:19 +01:00
Andy Wilkinson cf17cf9b36 Start building against Micrometer 1.13.6 snapshots
See gh-42543
2024-10-09 10:24:15 +01:00
Andy Wilkinson c678d38630 Start building against Spring Session 3.2.6 snapshots
See gh-42542
2024-10-09 09:42:53 +01:00
Andy Wilkinson ff44b3dd76 Start building against Spring Security 6.2.7 snapshots
See gh-42541
2024-10-09 09:42:48 +01:00
Andy Wilkinson 96d8ae540f Start building against Spring Retry 2.0.10 snapshots
See gh-42540
2024-10-09 09:42:43 +01:00
Andy Wilkinson 526c84d794 Start building against Spring Pulsar 1.0.11 snapshots
See gh-42539
2024-10-09 09:42:39 +01:00
Andy Wilkinson 1168d3ad0e Start building against Spring LDAP 3.2.7 snapshots
See gh-42538
2024-10-09 09:42:34 +01:00
Andy Wilkinson d2c215c67d Start building against Spring Integration 6.2.10 snapshots
See gh-42537
2024-10-09 09:42:29 +01:00
Andy Wilkinson a6c94dc723 Start building against Spring Data Bom 2023.1.11 snapshots
See gh-42535
2024-10-09 09:42:19 +01:00
Andy Wilkinson bed5c20d5c Start building against Spring Authorization Server 1.2.7 snapshots
See gh-42534
2024-10-09 09:42:15 +01:00
Andy Wilkinson ea2dda59c1 Start building against Reactor Bom 2023.0.11 snapshots
See gh-42533
2024-10-09 09:42:10 +01:00
Andy Wilkinson 17ab87822b Start building against Micrometer Tracing 1.2.11 snapshots
See gh-42532
2024-10-09 09:42:05 +01:00
Andy Wilkinson 87028e4971 Start building against Micrometer 1.12.11 snapshots
See gh-42531
2024-10-09 09:42:00 +01:00
Stéphane Nicoll e40ec93e3b Upgrade to Maven Javadoc Plugin 3.10.1
Closes gh-42401
2024-10-08 17:03:16 +02:00
Moritz Halbritter e6165b0311 Add transport and connect timeout properties for OTLP logging
Closes gh-42528
Closes gh-42527
2024-10-08 16:01:09 +02:00
Moritz Halbritter b997c0c53a Add connect timeout properties for OTLP tracing
- Rename OtlpProperties to OtlpTracingProperties

See gh-41460
See gh-42528
2024-10-08 16:01:08 +02:00
Moritz Halbritter 40bb81419d Rename OtlpAutoConfiguration to OtlpTracingAutoConfiguration
Closes gh-42529
2024-10-08 15:56:18 +02:00
Moritz Halbritter fdcc8d9d1f Rename OtlpProperties to OtlpMetricsProperties
See gh-41460
2024-10-08 15:51:25 +02:00
Andy Wilkinson 9ef82dc864 Merge branch '3.3.x'
Closes gh-42521
2024-10-07 14:18:38 +01:00
Andy Wilkinson 6209aef319 Order alphabetically the sections in Common Application Properties
Closes gh-42520
2024-10-07 14:17:55 +01:00
Anthony Dahanne 416413957a Use builder-jammy-java-tiny when using Buildpacks
See gh-42508
2024-10-07 13:30:41 +02:00
Phillip Webb b12a4801ff Polish BasicJsonParser 2024-10-03 12:23:05 -07:00
Andy Wilkinson 8d0cfdfe5e Merge branch '3.3.x'
Closes gh-42506
2024-10-03 10:23:09 +01:00
Andy Wilkinson 7b4cd03066 Merge branch '3.2.x' into 3.3.x
Closes gh-42505
2024-10-03 10:18:17 +01:00
Andy Wilkinson 2328c1fe80 Improve javadoc for when bean type to match is inferred
Closes gh-42504
2024-10-03 10:16:27 +01:00
Johnny Lim 1585c5a109 Polish
See gh-42503
2024-10-03 07:33:40 +02:00
Phillip Webb 58a1b2bea5 Polish 'Add support for 'server.jetty.max-form-key' property'
See gh-42448
2024-10-02 21:25:24 -07:00
qingbozhang 6e885c423f Add support for 'server.jetty.max-form-key' property
Add a new 'server.jetty.max-form-key' property that can be used to
configure Jetty's Handler.setMaxFormKeys(...).

See gh-42448
2024-10-02 21:22:56 -07:00
Phillip Webb 90f375ea3e Dont deduce type for OnBean conditions when annotations are specified
Update `OnBeanCondition` to consider the annotations attribute as well
as the types and names when determining if the bean type can be deduced.

Fixes gh-42484
2024-10-02 15:21:30 -07:00
Phillip Webb fc2878a924 Fix checkstyle violation
See gh-42487
2024-10-02 13:51:47 -07:00
Phillip Webb 9ea624666f Merge pull request #42487 from woosung1223
* pr/42487:
  Refactor BasicJsonParser to use enhanced switch

Closes gh-42487
2024-10-02 13:40:38 -07:00
teo 19d7164696 Refactor BasicJsonParser to use enhanced switch
See gh-42487
2024-10-02 13:39:13 -07:00
Andy Wilkinson 6aa5ed705a Merge branch '3.3.x'
Closes gh-42499
2024-10-02 13:47:39 +01:00
Andy Wilkinson 93e5b3a0ff Deprecate ControllerEndpointHandlerMapping for MVC and WebFlux
Closes gh-42498
2024-10-02 13:46:57 +01:00
Andy Wilkinson fae3cd1ca5 Harmonize configuration properties that accept a list of values
Closes gh-42478
2024-10-02 10:56:15 +01:00
Stéphane Nicoll 6b216f1748 Apply active profiles consistently with AOT
Profiles that are active during AOT processing are automatically enabled
when the AOT initializer runs. While this works for an arrangement that
only relies on the ApplicationContext, it does not for Spring Boot that
has specific handling of profiles when it prepares the environment, way
before the ApplicationContext is event created.

This commit adds a specific contribution that generates a dedicated
EnvironmentPostProcessor. It also updates the handling of post
processors so that when AOT runs, the AOT generated one if it exists is
invoked first.

This has the effect of consistently activating such profiles in a
Spring Boot application.

Closes gh-41562
2024-10-02 10:41:13 +02:00
Phillip Webb 54dcd9894c Remove remaining use of loader classic
Closes gh-42495
2024-10-01 18:23:35 -07:00
Phillip Webb e529769b0c Merge branch '3.3.x' 2024-10-01 17:20:14 -07:00
Phillip Webb 9f34899454 Merge branch '3.2.x' into 3.3.x 2024-10-01 17:20:10 -07:00
Phillip Webb d342eefa27 Use Sync task rather than Copy
See gh-42333
2024-10-01 17:19:52 -07:00
Andy Wilkinson 842afa4381 Upgrade to Jackson 2.18.0
Closes gh-42480
2024-10-01 17:23:25 +01:00
Andy Wilkinson 42ad6ddf0a Raise the minimum supported version of Gradle to 8.4
Closes gh-42481
2024-10-01 17:23:24 +01:00
Andy Wilkinson 2f42b9cb29 Merge branch '3.3.x'
Closes gh-42491
2024-10-01 17:23:01 +01:00
Andy Wilkinson 26d3b845c5 Merge branch '3.2.x' into 3.3.x
Closes gh-42490
2024-10-01 17:22:11 +01:00
Andy Wilkinson 95665a4b28 Fall back to connection details when configuring Rabbit Streams
Closes gh-42489
2024-10-01 17:20:49 +01:00
Phillip Webb 99142dbbb2 Merge branch '3.3.x' 2024-09-30 16:25:47 -07:00
Phillip Webb ec615f631c Merge branch '3.2.x' into 3.3.x 2024-09-30 16:03:30 -07:00
Phillip Webb 05b4edfd2c Use `ifeval` block for Commercial/OSS documentation
See gh-42333
2024-09-30 15:56:40 -07:00
Stéphane Nicoll 689bce88d2 Merge branch '3.3.x'
Closes gh-42477
2024-09-30 13:09:50 +02:00
Stéphane Nicoll c8d3e07eec Merge branch '3.2.x' into 3.3.x
Closes gh-42476
2024-09-30 13:09:40 +02:00
Stéphane Nicoll ab968494e6 Document how to handle the manifest in a native image with Maven
Closes gh-42412
2024-09-30 10:55:58 +02:00
Stéphane Nicoll f908fcd1f3 Merge branch '3.3.x'
Closes gh-42473
2024-09-30 09:14:12 +02:00
Tran Ngoc Nhan 44848aa88d Fix links to Micrometer reference doc
See gh-42467
2024-09-30 09:12:36 +02:00
Johnny Lim 7a27e6794e Fix typo in "committed" in ProcessInfo
See gh-42471
2024-09-30 08:46:47 +02:00
Phillip Webb bc5a718cfa Merge branch '3.3.x' 2024-09-27 17:35:23 -07:00
Phillip Webb 3b8ae47096 Merge branch '3.2.x' into 3.3.x 2024-09-27 17:35:01 -07:00
Phillip Webb d44e7c9af2 Dynamically populate repositories used in Ant/Maven integration tests
Update build scripts and tests so that repository settings are copied
dynamically from the build.

See gh-42333
2024-09-27 17:33:00 -07:00
Phillip Webb 7d8507d186 Polish 2024-09-27 17:31:24 -07:00
Phillip Webb 7fe7c61e7f Merge branch '3.3.x' 2024-09-27 12:18:11 -07:00
Phillip Webb e086439e51 Merge branch '3.2.x' into 3.3.x 2024-09-27 12:18:06 -07:00
Phillip Webb c347ccaa76 Attempt to fix system tests following repository updates
See gh-42333
2024-09-27 12:17:29 -07:00
Phillip Webb 8282a90268 Merge branch '3.3.x' 2024-09-27 10:34:32 -07:00
Phillip Webb 055064f16b Merge branch '3.2.x' into 3.3.x 2024-09-27 10:33:30 -07:00
Phillip Webb 9836011ffd Create extension to configure Spring maven repositories
Create a small Groovy script that can be used in `settings.gradle`
files to extend `repositories` to support the various maven
repositories required for our build.

See gh-42333
2024-09-27 10:30:20 -07:00
Phillip Webb 89f4a8bc7f Polish 2024-09-27 10:29:25 -07:00
Moritz Halbritter a1441804ec Reapply "Configure virtual threads on Undertow if enabled"
This reverts commit 2f99c19f11.

Closes gh-38819
2024-09-27 12:54:42 +02:00
Johnny Lim 3882dcc2fa Polish
See gh-42457
2024-09-27 12:13:36 +02:00
Dmytro Nosan e4f6dff77f Polish HazelcastConnectionDetailsConfiguration
See gh-42459
2024-09-27 11:58:32 +02:00
Moritz Halbritter 33def6d6b4 Polish "Add service connection support for Hazelcast"
See gh-42416
2024-09-26 16:45:26 +02:00
Dmytro Nosan cee7439dbe Add service connection support for Hazelcast
See gh-42416
2024-09-26 14:34:12 +02:00
Moritz Halbritter fb3dd68dd3 Merge branch '3.3.x'
Closes gh-42455
2024-09-26 14:02:15 +02:00
Moritz Halbritter 2ba2bd9716 Merge branch '3.2.x' into 3.3.x
Closes gh-42454
2024-09-26 14:00:58 +02:00
Tran Ngoc Nhan db9cb54ce0 Polish documentation
See gh-42445
2024-09-26 13:58:32 +02:00
Moritz Halbritter 593d2cccc4 Polish "Add support for virtual threads in OtlpMetricRegistry configuration"
See gh-42407
2024-09-26 13:42:39 +02:00
Mike Turbe e615eb313a Add support for virtual threads in OtlpMetricRegistry configuration
See gh-42407
2024-09-26 13:26:30 +02:00
Moritz Halbritter 2114744937 Polish "Add support for partitioned cookies"
See gh-42316
2024-09-25 16:05:01 +02:00
Dmytro Nosan 4a1676d857 Add support for partitioned cookies
See gh-42316
2024-09-25 15:58:50 +02:00
Yanming Zhou 0871feb0d9 Polish javadoc of TestImage for consistency
See gh-42426
2024-09-25 13:59:35 +02:00
Moritz Halbritter 3ec55b2157 Merge branch '3.3.x'
Closes gh-42447
2024-09-25 13:56:45 +02:00
Moritz Halbritter 003b182d95 Merge branch '3.2.x' into 3.3.x
Closes gh-42446
2024-09-25 13:56:33 +02:00
Yanming Zhou 72d68a2cb8 Remove duplicated dependency
See gh-42442
2024-09-25 13:56:01 +02:00
Phillip Webb 7b3077280c Merge branch '3.3.x'
Closes gh-42441
2024-09-24 14:32:48 -07:00
Phillip Webb 100bedc07d Merge branch '3.2.x' into 3.3.x
Closes gh-42440
2024-09-24 14:29:09 -07:00
Phillip Webb ad72411e2b Apply conventions plugin to all subprojects
Closes gh-42438
2024-09-24 14:26:32 -07:00
Phillip Webb 72f379a5b2 Merge branch '3.2.x' into 3.3.x
Closes gh-42434
2024-09-24 13:01:05 -07:00
Phillip Webb eafe61c4ca Backport upgrade to Gradle 8.10.1
Cherry-pick commits d756bf4e86, 083ac67d13 and 162c929a80 to
upgrade to Gradle 8.10.1.

Closes gh-42433
2024-09-24 12:55:29 -07:00
Andy Wilkinson 6806276b64 Retain jOOQ configuration bean when used defines a DSLContext bean
Closes gh-42400
2024-09-23 18:31:46 +01:00
Andy Wilkinson 97ff6e2ef1 Merge branch '3.3.x'
Closes gh-42422
2024-09-23 15:24:10 +01:00
Andy Wilkinson 9c6a744fc9 Merge branch '3.2.x' into 3.3.x
Closes gh-42421
2024-09-23 15:23:51 +01:00
Andy Wilkinson 2aea7caf36 Remove use of reflection in Artemis connection factory creation
Fixes gh-42414
2024-09-23 14:08:35 +01:00
Phillip Webb 9b49e93f62 Polish 'Improve exception message to hint that you might need a '-spring' file'
See gh-42405
2024-09-22 20:35:13 -07:00
Dmytro Nosan 86ce051bb5 Improve exception message to hint that you might need a '-spring' file
See gh-42405
2024-09-22 20:33:55 -07:00
Phillip Webb 9b72e1f506 Merge branch '3.3.x'
Closes gh-42419
2024-09-22 20:31:08 -07:00
Johnny Lim a0dc929e6c Add Javadoc `@Since` for new `PrometheusScrapeEndpoint` constructor
See gh-42406
2024-09-22 20:30:31 -07:00
Phillip Webb 60f615849d Polish 'Remove duplicated `file.getName()` call'
See gh-42411
2024-09-22 19:59:22 -07:00
choi-hyeseong bd223e8bea Remove duplicated `file.getName()` call
Update `WebServerPortFileWriter` so that `file.getName()` is only called
once.

See gh-42411
2024-09-22 19:56:59 -07:00
Phillip Webb 21b0bdec12 Merge branch '3.3.x'
Closes gh-42418
2024-09-22 17:52:42 -07:00
Phillip Webb 593862b082 Merge branch '3.2.x' into 3.3.x
Closes gh-42417
2024-09-22 17:52:37 -07:00
arefbehboudi 0d3fceec5d Polish
See gh-42413
2024-09-22 17:45:59 -07:00
Andy Wilkinson 3952d63369 Revert "Merge branch '3.3.x'"
This reverts commit ba0ef11b6b, reversing
changes made to d380ada4b2.

See gh-42389
2024-09-20 11:08:37 +01:00
Andy Wilkinson 391b643d8d Revert "Merge branch '3.2.x' into 3.3.x"
This reverts commit d86160d362, reversing
changes made to 70d2907351.

See gh-42388
2024-09-20 11:07:30 +01:00
Andy Wilkinson b4702612de Revert "Increase timeouts in ZipkinWebClientSenderTests"
This reverts commit 0aeea6f069.

See gh-42375
2024-09-20 11:06:18 +01:00
Andy Wilkinson 4a7d6c445a Merge branch '3.3.x'
Closes gh-42398
2024-09-20 10:33:17 +01:00
Andy Wilkinson a1593585e3 Merge branch '3.2.x' into 3.3.x
Closes gh-42397
2024-09-20 10:33:02 +01:00
Andy Wilkinson 267a642e0f Reduce duplicate binding of meters to user-defined composites
Fixes gh-42396
2024-09-20 10:32:20 +01:00
Moritz Halbritter ee322d69f1 Merge branch '3.3.x'
Closes gh-42394
2024-09-20 10:25:54 +02:00
Yanming Zhou 7c8a6740c1 Remove redundant @Test annotation
See gh-42393
2024-09-20 10:22:47 +02:00
Andy Wilkinson ba0ef11b6b Merge branch '3.3.x'
Closes gh-42389
2024-09-19 19:10:06 +01:00
Andy Wilkinson d86160d362 Merge branch '3.2.x' into 3.3.x
Closes gh-42388
2024-09-19 19:09:52 +01:00
Andy Wilkinson 0aeea6f069 Increase timeouts in ZipkinWebClientSenderTests
This is an attempt to stabilize the tests. They are currently flaky
due to a timeout that appears to occur because the mock web server isn't
responding quickly enough. A larger timeout will either confirm this if
the tests stabilize or indicate that the problem has a different cause
if they do not stabilize.

Closes gh-42375
2024-09-19 19:06:53 +01:00
Andy Wilkinson d380ada4b2 Merge branch '3.3.x'
Closes gh-42387
2024-09-19 19:06:23 +01:00
Andy Wilkinson 70d2907351 Merge branch '3.2.x' into 3.3.x
Closes gh-42386
2024-09-19 19:06:12 +01:00
Andy Wilkinson 319e33f786 Make a single scrape attempt, protected by Awaitility
Using a single scrape attempt that is protected by Awaitility should
protect against instability of the OpenTelemetry Collector instance
running in the container and will hopefully stabilize the test.

This commit has also increased the timeout for a successful response
to 30 seconds and removed the configuration of the configuration of
the polling delay and interval as the values being set were the same
as the defaults.

Closes gh-42377
2024-09-19 19:06:05 +01:00
Andy Wilkinson 24a5b04c28 Merge branch '3.3.x'
Closes gh-42383
2024-09-19 19:04:00 +01:00
Andy Wilkinson 61ce431761 Merge branch '3.2.x' into 3.3.x
Closes gh-42382
2024-09-19 19:03:11 +01:00
Andy Wilkinson 0e7bdb3e8b Remove note about graceful shutdown requiring Tomcat 9.0.33
Since the note was added, we've upgraded to and now require Tomcat
10.1 so it no longer applies.

Closes gh-42373
2024-09-19 19:02:56 +01:00
Andy Wilkinson 1c65bb1d21 Merge branch '3.3.x'
Closes gh-42381
2024-09-19 19:02:17 +01:00
Andy Wilkinson d4f7cb7bae Merge branch '3.2.x' into 3.3.x
Closes gh-42380
2024-09-19 19:02:03 +01:00
Andy Wilkinson 41bcda8429 Document support for Java 23
Closes gh-42374
2024-09-19 14:23:32 +01:00
Stéphane Nicoll e930a963ad Polish "Add option for configuring max messages per task"
See gh-42341
2024-09-19 14:19:01 +02:00
Dmytro Nosan 09b57eff76 Add option for configuring max messages per task
See gh-42341
2024-09-19 14:12:24 +02:00
Andy Wilkinson 6346d4fd6b Accommodate absence of last execution
A task's last execution is absent if it has not yet been executed.
This commit updates the documentation test to accommodate this
possibility.

See gh-42351
2024-09-19 12:03:04 +01:00
Andy Wilkinson 627c691616 Document the reason for deprecation of clean-on-validation-error
See gh-42295
2024-09-19 11:22:08 +01:00
Andy Wilkinson 814369e8b0 Enable graceful shutdown by default
Closes gh-37495
2024-09-19 10:58:53 +01:00
Johnny Lim 94e8c5db36 Polish gh-39957 and gh-41444
See gh-42359
2024-09-19 11:37:11 +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 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
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 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
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 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