root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
45,052 Commits 23 Branches 345 Tags 276 MiB
Commit Graph

2166 Commits

Author SHA1 Message Date
Andy Wilkinson 37b2567aeb Merge branch '3.0.x' into 3.1.x 
Closes gh-38365
 2023-11-15 16:00:05 +00:00
Andy Wilkinson ff555c5ceb Merge branch '2.7.x' into 3.0.x 
Closes gh-38364
 2023-11-15 15:57:39 +00:00
Andy Wilkinson c2156d6803 Remove static state from CF web endpoint integration tests 
The mocks being static meant that their state was shared across each
test in the class. This resulted in the tests being order dependent.
This commit uses instance variables to hold the mocks, thereby
ensuring that they're recreated for each test as part of the standard
JUnit lifecycle.

Closes gh-38363
 2023-11-15 15:16:24 +00:00
Phillip Webb 0ea75f0f65 Polish 2023-11-05 10:53:25 -08:00
Moritz Halbritter 607ed86edb Merge branch '3.0.x' into 3.1.x 2023-10-31 10:23:01 +01:00
Moritz Halbritter dccf378d49 Polish CloudFoundryActuatorAutoConfiguration 2023-10-31 10:09:44 +01:00
Moritz Halbritter e0985331c0 Polish ReactiveCloudFoundrySecurityService 2023-10-31 09:56:35 +01:00
Moritz Halbritter 9152217c96 Fix JUnit's @Nested usage 2023-10-31 09:49:01 +01:00
Moritz Halbritter 627a821d5f Polish ReactiveTokenValidator 2023-10-31 09:49:01 +01:00
Moritz Halbritter 140ba4039d Merge branch '3.0.x' into 3.1.x 
Closes gh-38079
 2023-10-27 14:20:07 +02:00
Moritz Halbritter 43a3fbf449 Move "Sanitize Sensitive Values" in docs 
Closes gh-35917
 2023-10-27 14:16:48 +02:00
Moritz Halbritter 790ee9afb5 Add FailureAnalyzer for NoSuchHealthContributorFailureExceptions 
Closes gh-36489
 2023-10-27 10:48:48 +02:00
Phillip Webb 1d456e09d2 Merge branch '3.0.x' into 3.1.x 
Closes gh-37966
 2023-10-19 21:12:52 -07:00
Phillip Webb a0b999c8b4 Merge branch '2.7.x' into 3.0.x 
Closes gh-37965
 2023-10-19 20:55:51 -07:00
Phillip Webb abdad1cabe Constently use assertThatExceptionOf... assertions 
Closes gh-37964
 2023-10-19 20:17:26 -07:00
Andy Wilkinson 19b877fc14 Merge branch '3.0.x' into 3.1.x 
Closes gh-37838
 2023-10-12 11:39:06 +01:00
Andy Wilkinson f780cc6d03 Merge branch '2.7.x' into 3.0.x 
Closes gh-37837
 2023-10-12 11:38:32 +01:00
Andy Wilkinson 11311dbf6d Register task executor metrics when using lazy init 
Fixes gh-37832
 2023-10-12 11:19:33 +01:00
Andy Wilkinson 411586347c Merge branch '3.0.x' into 3.1.x 
Closes gh-37829
 2023-10-11 15:04:21 +01:00
Andy Wilkinson 781ac2ece2 Merge branch '2.7.x' into 3.0.x 
Closes gh-37828
 2023-10-11 15:02:36 +01:00
Andy Wilkinson d59ea2f038 Start building against Micrometer Tracing 1.1.6 snapshots 
See gh-37694
 2023-10-04 10:00:18 +01:00
Andy Wilkinson 7907358875 Start building against Micrometer Tracing 1.0.11 snapshots 
See gh-37679
 2023-10-04 09:52:49 +01:00
Andy Wilkinson a4100e12ff Merge branch '3.0.x' into 3.1.x 
Closes gh-37661
 2023-10-03 11:05:51 +01:00
Andy Wilkinson 931584f8af Merge branch '2.7.x' into 3.0.x 
Closes gh-37659
 2023-10-03 10:28:51 +01:00
Johnny Lim c9932bb73a Use AssertJ's fail, not JUnit's 
This commit also updates Checkstyle to prevent use of JUnit's
assertions from being reintroduced.

See gh-37655
 2023-10-03 10:11:12 +01:00
Phillip Webb 78eb8f90d1 Merge branch '3.0.x' into 3.1.x 2023-09-20 17:12:27 -07:00
Phillip Webb 78c3512e32 Polish 2023-09-20 17:11:54 -07:00
Stephane Nicoll 7df79432eb Polish "Upgrade to Micrometer Tracing 1.0.10" 
See gh-37345
 2023-09-12 15:10:19 +02:00
Moritz Halbritter d9b7a8c0af Merge branch '3.0.x' into 3.1.x 
Closes gh-37253
 2023-09-08 11:17:40 +02:00
Moritz Halbritter bbc10856ee Merge branch '2.7.x' into 3.0.x 
Closes gh-37252
 2023-09-08 11:17:25 +02:00
Johnny Lim 5f9bc721d3 Add default value metadata for management.metrics.export.signalfx.published-histogram-type 
See gh-37210
 2023-09-08 11:04:26 +02:00
Scott Frederick 03dcf8b663 Merge branch '3.0.x' into 3.1.x 
Closes gh-37178
 2023-09-01 14:42:15 -05:00
Scott Frederick 1e85bf7ca8 Fix mapping of consumed types to propagators 
Fixes gh-37161
 2023-09-01 14:40:01 -05:00
Moritz Halbritter b86937bb8e Merge branch '3.0.x' into 3.1.x 
Closes gh-37156
 2023-08-31 11:51:15 +02:00
Moritz Halbritter 61739bd917 Prevent propagation for local fields when using W3C propagation 
Closes gh-37109
 2023-08-31 11:50:05 +02:00
Andy Wilkinson ee9574d399 Merge branch '3.0.x' into 3.1.x 
Closes gh-36567
 2023-07-25 15:04:30 +01:00
Andy Wilkinson e106828fc8 Merge branch '2.7.x' into 3.0.x 
Closes gh-36566
 2023-07-25 14:59:44 +01:00
Andy Wilkinson 5c6a9122cb Polish "Test Micrometer config to property exposure" 
See gh-33743
 2023-07-25 14:43:14 +01:00
Mirko Sobeck 19e70055a5 Test Micrometer config to property exposure 
See gh-33743
 2023-07-25 14:37:25 +01:00
Andy Wilkinson 2766c4b648 Merge branch '3.0.x' into 3.1.x 
Closes gh-36559
 2023-07-25 13:07:48 +01:00
Andy Wilkinson d290d05f63 Add missing Stackdriver metric-type-prefix property 
Closes gh-36499
 2023-07-25 13:01:59 +01:00
Andy Wilkinson 22fa904590 Merge branch '3.0.x' into 3.1.x 
Closes gh-36556
 2023-07-25 12:54:34 +01:00
Andy Wilkinson 45624c0a78 Merge branch '2.7.x' into 3.0.x 
Closes gh-36555
 2023-07-25 12:53:11 +01:00
Andy Wilkinson aae8665db1 Add missing management.metrics.export.wavefront properties 
Closes gh-36498
 2023-07-25 12:35:58 +01:00
Andy Wilkinson 5d1b2348e8 Merge branch '3.0.x' into 3.1.x 
Closes gh-36553
 2023-07-25 12:08:43 +01:00
Andy Wilkinson 826bad5820 Merge branch '2.7.x' into 3.0.x 
Closes gh-36552
 2023-07-25 12:08:19 +01:00
Andy Wilkinson a6c19dae07 Add missing management.metrics.export.signalfx properties 
Closes gh-36497
 2023-07-25 11:35:57 +01:00
Andy Wilkinson 54323d1a95 Merge branch '3.0.x' into 3.1.x 
Closes gh-36526
 2023-07-24 14:35:14 +01:00
Andy Wilkinson 2db45e9ba3 Merge branch '2.7.x' into 3.0.x 
Closes gh-36525
 2023-07-24 14:34:50 +01:00
Andy Wilkinson a5d5908c27 Add missing management.metrics.export.atlas properties 
Closes gh-36496
 2023-07-24 14:34:11 +01:00