Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
54,471 Commits 23 Branches 0 Tags
12ee71dcdfb5b8a9833cc7cddaefca631dce052d
Commit Graph

54471 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
65a72c0969 Merge pull request #42411 from choi-hyeseong 
* pr/42411:
  Polish 'Remove duplicated `file.getName()` call'
  Remove duplicated `file.getName()` call

Closes gh-42411
 2024-09-22 20:00:27 -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
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
c7c73be859 Merge branch '3.3.x' 2024-09-20 20:50:00 -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
c7984c5705 Merge branch '3.3.x' 2024-09-20 16:12:04 -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
a87d269333 Merge branch '3.3.x' 
Closes gh-42403
 2024-09-20 15:44:14 +01: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
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
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
Phillip Webb
84e6594770 Patch gulp-vinyl-zip to improve error messages 
Update Antora `package.json` to patch `@vscode+gulp-vinyl-zip` in order
to provide better error messages.

See gh-42392
 2024-09-19 20:02:03 -07: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
c6c4651337 Merge branch '3.3.x' 
Closes gh-42385
 2024-09-19 19:05:25 +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
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
e950801afb Merge pull request #42341 from nosan 
* pr/42341:
  Polish "Add option for configuring max messages per task"
  Add option for configuring max messages per task

Closes gh-42341
 2024-09-19 14:26:46 +02: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
Stéphane Nicoll
e133ea3dfc Merge branch '3.3.x' 2024-09-19 13:46:48 +02:00
Stéphane Nicoll
ae898ed383 Next development version (v3.3.5-SNAPSHOT) 2024-09-19 13:46:37 +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