root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
46,320 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

46320 Commits

Author SHA1 Message Date
Andy Wilkinson 981aff044b Merge branch '3.1.x' 2023-11-16 15:59:48 +00:00
Andy Wilkinson a9f49e1085 Upgrade to Spring HATEOAS 2.1.3 
Closes gh-38375
 2023-11-16 15:59:26 +00:00
Andy Wilkinson 0d7e1e1c27 Merge branch '3.0.x' into 3.1.x 2023-11-16 15:58:54 +00:00
Andy Wilkinson 473b801c52 Upgrade to Spring HATEOAS 2.0.7 
Closes gh-38374
 2023-11-16 15:58:41 +00:00
Andy Wilkinson 301c76e2c2 Merge branch '2.7.x' into 3.0.x 2023-11-16 15:58:08 +00:00
Andy Wilkinson 19f8e042a6 Upgrade to Spring HATEOAS 1.5.6 
Closes gh-38373
 2023-11-16 15:57:56 +00:00
Andy Wilkinson e5933c8e0e Upgrade to Spring Framework 6.1.0 
Closes gh-38312
 2023-11-16 15:05:35 +00:00
Andy Wilkinson 01779e26e8 Merge branch '3.1.x' 2023-11-16 15:05:05 +00:00
Andy Wilkinson a0f94172cb Upgrade to Spring Framework 6.0.14 
Closes gh-38301
 2023-11-16 15:04:46 +00:00
Andy Wilkinson a11bda6a9a Merge branch '3.0.x' into 3.1.x 2023-11-16 15:04:15 +00:00
Andy Wilkinson 77cce80da7 Upgrade to Spring Framework 6.0.14 
Closes gh-38294
 2023-11-16 15:04:02 +00:00
Andy Wilkinson ef67838f14 Merge branch '3.1.x' 
Closes gh-38376
 2023-11-16 14:40:39 +00:00
Andy Wilkinson 4a38d032af Restore use of avg in JPA smoke test 
Closes gh-34895
 2023-11-16 14:40:13 +00:00
Andy Wilkinson 5f30213b3a Merge branch '3.1.x' 2023-11-16 12:13:06 +00:00
Andy Wilkinson a68eae66e1 Start building against Spring HATEOAS 2.1.3 snapshots 
See gh-38375
 2023-11-16 12:12:21 +00:00
Andy Wilkinson 60a70c9365 Merge branch '3.0.x' into 3.1.x 2023-11-16 12:11:12 +00:00
Andy Wilkinson 15e9ae91ea Start building against Spring HATEOAS 2.0.7 snapshots 
See gh-38374
 2023-11-16 12:10:58 +00:00
Andy Wilkinson 9362658ed5 Merge branch '2.7.x' into 3.0.x 2023-11-16 12:10:07 +00:00
Andy Wilkinson 239e8a640e Start building against Spring HATEOAS 1.5.6 snapshots 
See gh-38373
 2023-11-16 12:09:55 +00:00
Andy Wilkinson bb92bf32bd Merge branch '3.1.x' 2023-11-16 09:42:55 +00:00
Andy Wilkinson 1a3feb3c10 Merge branch '3.0.x' into 3.1.x 2023-11-16 09:42:45 +00:00
Andy Wilkinson bdf4582860 Merge branch '2.7.x' into 3.0.x 2023-11-16 09:42:33 +00:00
Andy Wilkinson 85b930be9c Merge branch '3.1.x' 2023-11-16 09:42:15 +00:00
Andy Wilkinson 4d63983493 Start building against Spring Kafka 3.0.13 snapshots 
See gh-38370
 2023-11-16 09:41:42 +00:00
Andy Wilkinson 87e2b1ea8e Upgrade to Spring Framework 5.3.31 
Closes gh-38283
 2023-11-16 09:38:35 +00:00
Moritz Halbritter d8ce901011 Close meter registries early in the shutdown process 
Closes gh-38240
 2023-11-16 09:26:02 +01:00
Scott Frederick 50bce029e2 Merge pull request #38359 from eddumelendez 
* pr/38359:
  Polish "Use KafkaContainer in smoke test for Kafka with SSL"
  Use KafkaContainer in smoke test for Kafka with SSL

Closes gh-38359
 2023-11-15 17:05:50 -06:00
Scott Frederick 586bb26eff Polish "Use KafkaContainer in smoke test for Kafka with SSL" 
See gh-38359
 2023-11-15 15:25:58 -06:00
Eddú Meléndez 51f13404a5 Use KafkaContainer in smoke test for Kafka with SSL 
See gh-38359
 2023-11-15 15:25:58 -06:00
Andy Wilkinson 8b72e5612b Start building against Spring Kafka 3.0.13 snapshots 
See gh-38369
 2023-11-15 19:21:09 +00:00
Andy Wilkinson 517026ab9f Merge branch '3.1.x' 
Closes gh-38366
 2023-11-15 16:00:20 +00:00
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
Moritz Halbritter 7a8a393154 Revert "Close meter registries early in the shutdown process" 
This reverts commit f62c1188a1.
 2023-11-15 14:17:07 +01:00
Moritz Halbritter f62c1188a1 Close meter registries early in the shutdown process 
Closes gh-38240

Co-authored-by: Phillip Webb <pwebb@vmware.com>
 2023-11-15 10:24:54 +01:00
Moritz Halbritter d6f67b02f7 Clarify which tracing components are disabled when using tracing in tests 
See gh-33975
 2023-11-15 09:13:15 +01:00
Moritz Halbritter 328261337e Merge branch '3.1.x' 
Closes gh-38362
 2023-11-15 09:07:09 +01:00
Moritz Halbritter 9c1c18c2b9 Document that tracing is disabled in tests in the "Tracing" section 
Closes gh-33975
 2023-11-15 09:06:39 +01:00
Andy Wilkinson 178756ccd6 Upgrade to Reactor Bom 2023.0.0 
Closes gh-38307
 2023-11-14 20:47:00 +00:00
Andy Wilkinson 49e771f7e1 Merge branch '3.1.x' 2023-11-14 20:46:14 +00:00
Andy Wilkinson b7c7b47c97 Upgrade to Reactor Bom 2022.0.13 
Closes gh-38299
 2023-11-14 20:46:00 +00:00
Andy Wilkinson 4d295dbc3e Merge branch '3.0.x' into 3.1.x 2023-11-14 20:45:15 +00:00
Andy Wilkinson 7f6014f411 Upgrade to Reactor Bom 2022.0.13 
Closes gh-38292
 2023-11-14 20:45:03 +00:00
Andy Wilkinson bf5564ae12 Merge branch '2.7.x' into 3.0.x 2023-11-14 20:44:29 +00:00
Andy Wilkinson 9b8bcec33e Upgrade to Reactor Bom 2020.0.38 
Closes gh-38280
 2023-11-14 20:44:18 +00:00
Andy Wilkinson 4c98cf88e6 Merge branch '3.1.x' 
Closes gh-38358
 2023-11-14 20:01:46 +00:00
Andy Wilkinson 38b5f80ba6 Merge branch '3.0.x' into 3.1.x 
Closes gh-38357
 2023-11-14 20:01:29 +00:00
Andy Wilkinson 88393da438 Upgrade to AspectJ 1.9.20.1 
Closes gh-38355
 2023-11-14 20:00:47 +00:00
Moritz Halbritter 82f0684cd8 Merge branch '3.1.x' 
Closes gh-38354
 2023-11-14 17:04:41 +01:00