Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
49,988 Commits 23 Branches 0 Tags
3c079da7254debe05da3ec40e0ce6edf3a0802bf
Commit Graph

49988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phillip Webb
3c079da725 Merge branch '3.2.x' into 3.3.x 2024-09-24 16:49:11 -07:00
Phillip Webb
1d3fff402f Fix checkstyle tool version reference 2024-09-24 16:48:52 -07:00
Phillip Webb
21f6801368 Merge branch '3.2.x' into 3.3.x 2024-09-24 15:24:57 -07:00
Phillip Webb
68aed50615 Use toolchains for Java 22 
See gh-42433
 2024-09-24 15:24:22 -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
de2e5eeb22 Merge branch '3.2.x' into 3.3.x 2024-09-24 13:51:53 -07:00
Phillip Webb
54c3ccb4df Fix checkstyle violations in testng smoke test 
Add conventions plugin and fix surfaced checkstyle errors.
 2024-09-24 13:51:16 -07:00
Phillip Webb
e210444c68 Fix KotlinConventions merge error 
See gh-42433
 2024-09-24 13:25:09 -07:00
Phillip Webb
7ec5db8332 Merge branch '3.2.x' into 3.3.x 
Closes gh-42436
 2024-09-24 13:23:10 -07:00
Phillip Webb
54df1edf8c Upgrade to Gradle 8.10.2 
Closes gh-42435
 2024-09-24 13:22:44 -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
Phillip Webb
689a61e4f5 Merge branch '3.2.x' into 3.3.x 2024-09-23 22:06:33 -07:00
Phillip Webb
23ddad1ebd Propagate gradle.properties to buildSrc 
Update `buildSrc` so that properties frok the root `gradle.properties`
file are available.

See gh-42333
 2024-09-23 21:59:39 -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
Phillip Webb
bc20582a22 Merge pull request #42406 from izeye 
* pr/42406:
  Add Javadoc `@Since` for new `PrometheusScrapeEndpoint` constructor

Closes gh-42406
 2024-09-22 20:31:01 -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
593862b082 Merge branch '3.2.x' into 3.3.x 
Closes gh-42417
 2024-09-22 17:52:37 -07:00
Phillip Webb
0781e71e5e Merge pull request #42413 from arefbehboudi 
* pr/42413:
  Polish

Closes gh-42413
 2024-09-22 17:47:13 -07:00
arefbehboudi
0d3fceec5d Polish 
See gh-42413
 2024-09-22 17:45:59 -07:00
Phillip Webb
c81913b76d Merge branch '3.2.x' into 3.3.x 2024-09-20 20:49:49 -07:00
Phillip Webb
19d9e3b6cc Update BOM plugin to support commercial releases 
See gh-42333
 2024-09-20 17:33:46 -07:00
Phillip Webb
561b1710a5 Merge branch '3.2.x' into 3.3.x 2024-09-20 16:11:49 -07:00
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