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
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
Moritz Halbritter
22a991b334
Document tags format used in Gradle and Maven plugins
...
Closes gh-33088
2023-11-14 17:03:50 +01:00
Moritz Halbritter
ed7cf1043e
Merge branch '3.1.x'
...
Closes gh-38353
2023-11-14 16:29:59 +01:00
Moritz Halbritter
83da5a5bd8
Document how to remove base path from Cloud Foundry actuator endpoints
...
Closes gh-24991
2023-11-14 16:29:28 +01:00
Andy Wilkinson
c33f391691
Merge branch '3.1.x'
2023-11-14 14:50:28 +00:00
Andy Wilkinson
d43b95d08c
Merge branch '3.0.x' into 3.1.x
2023-11-14 14:50:17 +00:00
Andy Wilkinson
a829722461
Merge branch '2.7.x' into 3.0.x
2023-11-14 14:50:05 +00:00
Andy Wilkinson
8d01944666
Start building against Spring WS 3.1.8 snapshots
...
See gh-38284
2023-11-14 13:40:27 +00:00
Moritz Halbritter
874ed701a2
Merge pull request #38350 from sdeleuze
...
* pr/38350:
Document Liberica JDK with CRaC
Closes gh-38350
2023-11-14 13:26:11 +01:00
Sébastien Deleuze
e88bab69f6
Document Liberica JDK with CRaC
...
See gh-38350
2023-11-14 13:25:30 +01:00
Phillip Webb
0ef87f5102
Merge branch '3.1.x'
2023-11-13 10:42:56 -08:00
Phillip Webb
b902bf6aca
Merge branch '3.0.x' into 3.1.x
2023-11-13 10:42:32 -08:00
Phillip Webb
09e5a2f24a
Update copyright year of changed files
2023-11-13 10:42:26 -08:00
Phillip Webb
80210e93d3
Make LogCorrelationPropertySource an EnumerablePropertySource
...
Change `LogCorrelationPropertySource` to an `EnumerablePropertySource`
to reduce the likelihood of `Binder` errors.
Closes gh-38349
2023-11-13 10:40:24 -08:00
Phillip Webb
ba56953ea5
Skip ValueObjectBinder if parameter names cannot be discovered
...
Update `ValueObjectBinder` so that it is skipped if parameter names
cannot be discovered. This is much more likely as of Since Spring
Framework 6.1 as it no longer performs ASM parsing to discover names.
Fixes gh-38201
2023-11-13 10:24:06 -08:00
Phillip Webb
1a487d5cad
Merge branch '3.1.x'
2023-11-13 09:27:56 -08:00
Phillip Webb
211e8c004a
Merge branch '3.0.x' into 3.1.x
2023-11-13 09:27:45 -08:00
Phillip Webb
2cabcbc8fa
Polish adoc formatting
2023-11-13 09:27:15 -08:00
Andy Wilkinson
da67ce4a76
Upgrade to Micrometer Tracing 1.2.0
...
Closes gh-38306
2023-11-13 15:57:10 +00:00
Andy Wilkinson
a6c4ea7e8c
Upgrade to Micrometer 1.12.0
...
Closes gh-38305
2023-11-13 15:57:09 +00:00
Andy Wilkinson
28b4298cdd
Upgrade to Dependency Management Plugin 1.1.4
...
Closes gh-38346
2023-11-13 15:57:09 +00:00
Andy Wilkinson
9ddf6cc390
Merge branch '3.1.x'
2023-11-13 15:54:50 +00:00
Andy Wilkinson
c4adc2c770
Upgrade to Micrometer Tracing 1.1.7
...
Closes gh-38298
2023-11-13 15:54:37 +00:00
Andy Wilkinson
25e6c8828f
Upgrade to Micrometer 1.11.6
...
Closes gh-38297
2023-11-13 15:54:36 +00:00
Andy Wilkinson
246c29e498
Upgrade to Dependency Management Plugin 1.1.4
...
Closes gh-38345
2023-11-13 15:54:36 +00:00
Andy Wilkinson
0bdd2a237f
Merge branch '3.1.x'
2023-11-13 15:50:30 +00:00
Andy Wilkinson
9e2d75936e
Merge branch '3.0.x' into 3.1.x
2023-11-13 15:50:19 +00:00
Andy Wilkinson
74b395bda4
Upgrade to Micrometer Tracing 1.0.12
...
Closes gh-38291
2023-11-13 15:50:00 +00:00
Andy Wilkinson
721ac5d7ee
Upgrade to Micrometer 1.10.13
...
Closes gh-38290
2023-11-13 15:49:59 +00:00