25822 Commits

Author SHA1 Message Date
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 d86160d362ddf3d848d7134993a6e51b36536d67, reversing
changes made to 70d2907351bc8aa48c82a6484744a0a633a55e35.

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

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
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
3706dced23 Upgrade to Spring Integration 6.3.4
Closes gh-42134
2024-09-18 08:48:02 +01:00
Andy Wilkinson
c37f786914 Upgrade to Spring Integration 6.2.9
Closes gh-42126
2024-09-18 08:19:23 +01:00
Stéphane Nicoll
36b43f681c Upgrade to Spring Pulsar 1.1.4
Closes gh-42136
2024-09-17 09:13:10 +02:00
Stéphane Nicoll
fc5b80ac64 Upgrade to Spring Kafka 3.2.4
Closes gh-42135
2024-09-17 09:13:10 +02:00
Stéphane Nicoll
de5f7ad318 Upgrade to Spring Pulsar 1.0.10
Closes gh-42128
2024-09-17 09:13:03 +02:00
Stéphane Nicoll
e009581a41 Upgrade to Spring Kafka 3.1.9
Closes gh-42127
2024-09-17 09:13:02 +02:00
Stéphane Nicoll
f7cb18c605 Upgrade to Spring Retry 2.0.9
Closes gh-42327
2024-09-16 14:49:27 +02:00
Stéphane Nicoll
c16c04abfe Upgrade to R2DBC MariaDB 1.2.2
Closes gh-42326
2024-09-16 14:49:22 +02:00
Stéphane Nicoll
b75c2b6529 Upgrade to Spring Retry 2.0.9
Closes gh-42325
2024-09-16 14:48:13 +02:00
Stéphane Nicoll
04891746ff Merge branch '3.2.x' into 3.3.x
Closes gh-42322
2024-09-16 09:45:23 +02:00
Stéphane Nicoll
78a140ae25 Polish "Use DataSource.unwrap to get routing data source"
See gh-42313
2024-09-16 09:37:22 +02:00
Dmytro Nosan
3f9f0490a6 Use DataSource.unwrap to get routing data source
This commit uses DataSource.isWrapperFor and DataSource.unwrap to detect
if a DataSource is an AbstractRoutingDataSource. Previously, it relied
on instanceof which does not account for cases where the datasource has
been proxied.

See gh-42313
2024-09-16 09:28:46 +02:00
Stéphane Nicoll
437ff754ef Merge branch '3.2.x' into 3.3.x
Closes gh-42320
2024-09-16 09:04:07 +02:00
Stéphane Nicoll
242803d59b Polish "Replace Configuration fully qualified name by constant"
See gh-42311
2024-09-16 09:01:36 +02:00
mushroom528
9bcfc72307 Replace Configuration fully qualified name by constant
See gh-42311
2024-09-16 09:01:23 +02:00
Stéphane Nicoll
6c36c82376 Merge branch '3.2.x' into 3.3.x
Closes gh-42303
2024-09-13 16:27:13 +02:00
Stéphane Nicoll
e6e7357303 Upgrade to Undertow 2.3.17.Final
Closes gh-42302
2024-09-13 16:26:00 +02:00
Stéphane Nicoll
99d4e5cbf8 Upgrade to Spring Data Bom 2024.0.4
Closes gh-42132
2024-09-13 15:47:29 +02:00
Stéphane Nicoll
d3861bcaef Upgrade to Spring Data Bom 2023.1.10
Closes gh-42124
2024-09-13 15:45:58 +02:00
Stéphane Nicoll
831cbedb31 Upgrade to Groovy 4.0.23
Closes gh-42292
2024-09-13 11:20:54 +02:00
Stéphane Nicoll
0215da06df Upgrade to Groovy 4.0.23
Closes gh-42291
2024-09-13 11:17:58 +02:00
Phillip Webb
ee2ec9bc9d Merge branch '3.2.x' into 3.3.x
Closes gh-42287
2024-09-12 18:57:01 -07:00
Yanming Zhou
ee10425b6d Add tests to ensure private constructor is not used for binding
See gh-42277
2024-09-12 18:54:30 -07:00
Phillip Webb
a405c42006 Merge branch '3.2.x' into 3.3.x
Closes gh-42285
2024-09-12 18:43:54 -07:00
Phillip Webb
03e7be3ccf Document that spring.jmx.enabled is not for third-party libraries
Closes gh-42272
2024-09-12 18:35:57 -07:00
Stéphane Nicoll
37cd9e7949 Upgrade to Spring HATEOAS 2.3.3
Closes gh-42282
2024-09-12 15:13:43 +02:00
Stéphane Nicoll
a810494447 Upgrade to Spring HATEOAS 2.2.5
Closes gh-42281
2024-09-12 15:06:46 +02:00