Commit Graph

50613 Commits

Author SHA1 Message Date
Phillip Webb
80b1944878 Update changelog-generator for commercial builds
See gh-42333
2024-09-20 16:10:33 -07:00
Andy Wilkinson
27eb983887 Trigger a docs build when doing a release
Closes gh-42378
2024-09-20 15:41:43 +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
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
de2defc74e Merge pull request #42393 from quaff
* pr/42393:
  Remove redundant @Test annotation

Closes gh-42393
2024-09-20 10:23:01 +02: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
7b427f4d3b Merge branch '3.2.x' into 3.3.x
Closes gh-42384
2024-09-19 19:05:12 +01:00
Andy Wilkinson
87c647cf65 Reduce log output of SampleJettyApplicationTests
Closes gh-42376
2024-09-19 19:04:59 +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
ae898ed383 Next development version (v3.3.5-SNAPSHOT) 2024-09-19 13:46:37 +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
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
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
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
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
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
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
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
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
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
Stéphane Nicoll
bdbd006234 Merge branch '3.2.x' into 3.3.x
Closes gh-42334
2024-09-17 09:19:47 +02:00
Stéphane Nicoll
3d53d7363a Merge pull request #42331 from dependabot[bot]
* pr/42331:
  Polish "Bump gradle/actions from 4.0.1 to 4.1.0"
  Bump gradle/actions from 4.0.1 to 4.1.0

Closes gh-42331
2024-09-17 09:19:40 +02:00
Stéphane Nicoll
c6c0923dce Polish "Bump gradle/actions from 4.0.1 to 4.1.0"
See gh-42331
2024-09-17 09:19:08 +02:00
dependabot[bot]
6f535adb47 Bump gradle/actions from 4.0.1 to 4.1.0
Bumps [gradle/actions](https://github.com/gradle/actions) from 4.0.1 to 4.1.0.
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](16bf8bc8fe...d156388eb1)

---
updated-dependencies:
- dependency-name: gradle/actions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

See gh-42331
2024-09-17 09:16:59 +02:00
Stéphane Nicoll
49d8de1033 Merge branch '3.2.x' into 3.3.x 2024-09-17 09:16:12 +02: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