Commit Graph

25851 Commits

Author SHA1 Message Date
Andy Wilkinson cf17cf9b36 Start building against Micrometer 1.13.6 snapshots
See gh-42543
2024-10-09 10:24:15 +01:00
Andy Wilkinson 6209aef319 Order alphabetically the sections in Common Application Properties
Closes gh-42520
2024-10-07 14:17:55 +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
Andy Wilkinson 93e5b3a0ff Deprecate ControllerEndpointHandlerMapping for MVC and WebFlux
Closes gh-42498
2024-10-02 13:46:57 +01: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 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 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 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
Tran Ngoc Nhan 44848aa88d Fix links to Micrometer reference doc
See gh-42467
2024-09-30 09:12:36 +02: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 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 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
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 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 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 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
Johnny Lim a0dc929e6c Add Javadoc `@Since` for new `PrometheusScrapeEndpoint` constructor
See gh-42406
2024-09-22 20:30:31 -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 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 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
Yanming Zhou 7c8a6740c1 Remove redundant @Test annotation
See gh-42393
2024-09-20 10:22:47 +02: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 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 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 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 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