Stephane Nicoll
2b57ac2903
Merge branch '3.1.x'
2023-06-15 16:10:01 +02:00
Stephane Nicoll
d35a2024b5
Merge branch '3.0.x' into 3.1.x
2023-06-15 16:09:51 +02:00
Stephane Nicoll
19b3ce9f49
Merge branch '2.7.x' into 3.0.x
2023-06-15 16:09:31 +02:00
Stephane Nicoll
88a58a0933
Upgrade to Spring Framework 6.0.10
...
Closes gh-35751
2023-06-15 16:09:16 +02:00
Stephane Nicoll
f20c0424ee
Upgrade to Spring Framework 6.0.10
...
Closes gh-35739
2023-06-15 16:08:05 +02:00
Stephane Nicoll
836d88c9c8
Upgrade to Spring Framework 5.3.28
...
Closes gh-35729
2023-06-15 16:04:38 +02:00
Andy Wilkinson
91fdae45b6
Merge branch '3.1.x'
2023-06-15 14:47:32 +01:00
Andy Wilkinson
61752184f2
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35911
2023-06-15 14:47:21 +01:00
Andy Wilkinson
7bb3caf914
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35910
2023-06-15 14:47:01 +01:00
Andy Wilkinson
ee606db34a
Update Data REST starter description to mention Spring MVC
...
Closes gh-35678
2023-06-15 14:46:23 +01:00
Andy Wilkinson
740815da03
Merge branch '3.1.x'
2023-06-15 14:38:43 +01:00
Andy Wilkinson
251b5f2d0f
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35909
2023-06-15 14:38:31 +01:00
Andy Wilkinson
a5981a4dac
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35908
2023-06-15 14:38:13 +01:00
Andy Wilkinson
9feb84e234
Add DynmicPropertySource to ordered list of property sources
...
Closes gh-32901
2023-06-15 14:36:38 +01:00
Moritz Halbritter
6e86f5c444
Register uncategorized ObservationHandlers after categorized ones
...
Closes gh-34399
2023-06-15 15:01:13 +02:00
Moritz Halbritter
5bad242bfb
Merge branch '3.1.x'
2023-06-15 13:50:17 +02:00
Moritz Halbritter
be471c58fe
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35907
2023-06-15 13:49:57 +02:00
Moritz Halbritter
b1f2bde9d9
Merge pull request #35611 from mhalbritter
...
* mh/35096-add-support-for-multiple-context-propagation-types-for-tracing:
Add support for multiple tracing propagation formats
Closes gh-35611
2023-06-15 13:37:40 +02:00
Moritz Halbritter
8cd8d21720
Add support for multiple tracing propagation formats
...
See gh-35611
2023-06-15 13:37:33 +02:00
Andy Wilkinson
2c06f274dc
Merge branch '3.1.x'
2023-06-15 12:21:08 +01:00
Andy Wilkinson
cb36df47c8
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35905
2023-06-15 12:20:55 +01:00
Andy Wilkinson
6def7252d6
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35904
2023-06-15 12:20:27 +01:00
Andy Wilkinson
088006ff60
Use ephemeral port for Hazelcast
...
When Hazelcast is started on a fixed port and that port is already in
use, it does not fail to start which makes the problem hard to
detect. A symptom of the problem is that clients will not be able to
connect and will either retry indefinitely or will timeout depending
on their configuration.
This commit updates the Hazelcast client tests to start the Hazelcast
instance on an ephemeral port and to customize the client
configuration with the instance's address before use. This should
allow the client tests to work reliably in an environment where
Hazelcast's default port is already in use.
Closes gh-35903
2023-06-15 12:19:34 +01:00
Moritz Halbritter
efcc65bc5b
Apply filter order to ServerHttpObservationFilter
...
Closes gh-35067
2023-06-15 11:45:05 +02:00
Moritz Halbritter
140c37ceba
Enable virtual threads on Jetty
...
Closes gh-35703
2023-06-15 11:01:11 +02:00
Moritz Halbritter
23979e6ccf
Enable LoaderIntegrationTests on Java 21
2023-06-15 10:13:19 +02:00
Moritz Halbritter
3e4a9f5204
Add property to limit maximum connections for Jetty
...
Closes gh-35899
2023-06-15 09:42:51 +02:00
Moritz Halbritter
f81787e65d
Enable virtual threads on Tomcat
...
Closes gh-35704
2023-06-15 08:30:09 +02:00
Moritz Halbritter
6e604ad65c
Implement @ConditionalOnVirtualThreads
...
Closes gh-35892
2023-06-15 08:30:09 +02:00
Moritz Halbritter
fb64f6744e
Add 21 to JavaVersion
...
See gh-35892
2023-06-15 08:30:08 +02:00
Phillip Webb
0a607b3edf
Merge branch '3.1.x'
2023-06-14 15:45:05 -07:00
Phillip Webb
805e9e53a1
Merge branch '3.0.x' into 3.1.x
2023-06-14 15:44:55 -07:00
Phillip Webb
4337aa6a90
Merge branch '2.7.x' into 3.0.x
2023-06-14 15:44:46 -07:00
Phillip Webb
63978978b4
Drop STS plugins from Eclipse setup
2023-06-14 15:42:57 -07:00
Scott Frederick
483bc087a2
Merge branch '3.1.x'
2023-06-14 15:49:31 -05:00
Scott Frederick
aafaf0fab9
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35898
2023-06-14 15:49:21 -05:00
Scott Frederick
244bf4801b
Enable Paketo builder system tests on Java 20
...
Closes gh-35897
2023-06-14 15:49:07 -05:00
Scott Frederick
21941c7954
Merge branch '3.1.x'
2023-06-14 13:50:07 -05:00
Scott Frederick
779ac09417
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35895
2023-06-14 13:49:54 -05:00
Scott Frederick
504d9fc50b
Fix validation of process args metadata in Paketo system tests
...
Fixes gh-35894
2023-06-14 13:49:11 -05:00
Andy Wilkinson
0ce2b054d2
Merge branch '3.1.x'
2023-06-14 18:20:07 +01:00
Andy Wilkinson
9b88128e3b
Merge branch '3.0.x' into 3.1.x
2023-06-14 18:19:53 +01:00
Andy Wilkinson
4694e20628
Merge branch '2.7.x' into 3.0.x
2023-06-14 18:19:43 +01:00
Andy Wilkinson
7d07c0d09c
Polish configuration related to predictive test selection
...
Most notably, this commit splits the tests that use Spring REST Docs
out into a separate task for which predictive test selection is
disabled. This allows it to be cached and use Gradle's built-in
up-to-date checking, thereby avoiding the generation of new snippets
and the need to then run the asciidoctor and asciidoctorPdf tasks.
It also updates spring-boot-smoke-test-junit-vintage to disable
predictive test selection so that we can continue to assert that
the some tests were executed.
See gh-35869
2023-06-14 18:15:04 +01:00
Andy Wilkinson
5d04a71f1d
Merge branch '3.1.x'
2023-06-14 14:58:12 +01:00
Andy Wilkinson
9da1fbd3d0
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35893
2023-06-14 14:57:13 +01:00
Andy Wilkinson
ca5acaf1f2
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35779
2023-06-14 14:56:47 +01:00
Andy Wilkinson
27b8ec8a3d
Upgrade CI images to ubuntu:jammy-20230522
...
Closes gh-35778
2023-06-14 14:55:05 +01:00
Stephane Nicoll
67fc2f9346
Merge branch '3.1.x'
2023-06-14 09:36:47 +02:00
Stephane Nicoll
7f6dbdbe36
Merge branch '3.0.x' into 3.1.x
2023-06-14 09:36:33 +02:00
