Andy Wilkinson
fe123e5b10
Fix handling of additional-hosts with Mongo
...
Closes gh-36441
2023-07-18 21:15:20 +01:00
Phillip Webb
28b5b7a218
Merge branch '3.0.x' into 3.1.x
2023-07-18 10:32:01 +01:00
Phillip Webb
9d91dbc4e5
Use explicit matchers following Spring Security 6.0.5 upgrade
...
See gh-36293
2023-07-18 10:31:41 +01:00
Phillip Webb
30cc2a48c7
Merge branch '3.0.x' into 3.1.x
2023-07-18 10:16:56 +01:00
Phillip Webb
0233178855
Use explicit matchers following Spring Security 6.0.5 upgrade
...
See gh-36293
2023-07-18 09:49:11 +01:00
Stephane Nicoll
e3c238dac9
Merge branch '3.0.x' into 3.1.x
2023-07-18 06:25:02 +02:00
Stephane Nicoll
12011fb4d9
Merge branch '2.7.x' into 3.0.x
2023-07-18 06:24:57 +02:00
Stephane Nicoll
5af99fe219
Upgrade to Spring Security 6.1.2
...
Closes gh-36298
2023-07-18 06:22:50 +02:00
Stephane Nicoll
1dcfb3cfb1
Upgrade to Spring Security 6.0.5
...
Closes gh-36293
2023-07-18 06:22:09 +02:00
Stephane Nicoll
7ec9f45929
Upgrade to Spring Security 5.7.10
...
Closes gh-36295
2023-07-18 06:21:22 +02:00
Stephane Nicoll
00ca0ace81
Merge branch '3.0.x' into 3.1.x
2023-07-17 19:58:50 +02:00
Stephane Nicoll
3a12e8ee8b
Merge branch '2.7.x' into 3.0.x
2023-07-17 19:58:38 +02:00
Stephane Nicoll
7913b22f6a
Upgrade to Spring Kafka 3.0.9
...
Closes gh-36182
2023-07-17 19:57:22 +02:00
Stephane Nicoll
5014861c96
Upgrade to Spring Kafka 3.0.9
...
Closes gh-36187
2023-07-17 19:57:01 +02:00
Stephane Nicoll
3b53c15084
Upgrade to Spring AMQP 3.0.6
...
Closes gh-36403
2023-07-17 19:57:01 +02:00
Stephane Nicoll
10720721bf
Upgrade to Lettuce 6.2.5.RELEASE
...
Closes gh-36436
2023-07-17 19:57:01 +02:00
Stephane Nicoll
c5a951dc9d
Upgrade to Dependency Management Plugin 1.1.2
...
Closes gh-36435
2023-07-17 19:56:56 +02:00
Stephane Nicoll
a838cab65c
Upgrade to Spring AMQP 3.0.6
...
Closes gh-36401
2023-07-17 19:55:53 +02:00
Stephane Nicoll
bf5cdbf3f3
Upgrade to Lettuce 6.2.5.RELEASE
...
Closes gh-36434
2023-07-17 19:55:53 +02:00
Stephane Nicoll
0f396c91f4
Upgrade to Dependency Management Plugin 1.1.2
...
Closes gh-36433
2023-07-17 19:55:48 +02:00
Stephane Nicoll
250868ad84
Upgrade to Spring AMQP 2.4.14
...
Closes gh-36399
2023-07-17 19:53:54 +02:00
Stephane Nicoll
7195d87e6c
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36429
2023-07-17 15:48:30 +02:00
Stephane Nicoll
c0e263dc3c
Merge pull request #35619 from johnnywiller
...
* pr/35619:
Polish "Allow custom ExemplarSampler to be used"
Allow custom ExemplarSampler to be used
Closes gh-35619
2023-07-17 15:48:17 +02:00
Stephane Nicoll
750096b9c2
Polish "Allow custom ExemplarSampler to be used"
...
See gh-35619
2023-07-17 15:46:48 +02:00
Johnny Goncalves
94b17ecd26
Allow custom ExemplarSampler to be used
...
See gh-35619
2023-07-17 15:44:05 +02:00
Stephane Nicoll
bb16ed1245
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36427
2023-07-17 15:24:58 +02:00
Stephane Nicoll
3586bfb629
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36426
2023-07-17 15:22:43 +02:00
Stephane Nicoll
08054cf380
Merge pull request #36062 from quaff
...
* pr/36062:
Polish "Replace @CsvSource with @ValueSource where feasible"
Replace @CsvSource with @ValueSource where feasible
Closes gh-36062
2023-07-17 15:22:22 +02:00
Stephane Nicoll
09e5d38348
Polish "Replace @CsvSource with @ValueSource where feasible"
...
See gh-36062
2023-07-17 15:16:27 +02:00
Yanming Zhou
acb7acd5d9
Replace @CsvSource with @ValueSource where feasible
...
@ValueSource is more appropriate for single parameter.
See gh-36062
2023-07-17 15:16:26 +02:00
Stephane Nicoll
588129318c
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36423
2023-07-17 15:06:00 +02:00
Stephane Nicoll
bbaac07d64
Merge pull request #36155 from jonatan-ivanov
...
* pr/36155:
Add missing OTel Span attributes
Closes gh-36155
2023-07-17 15:04:24 +02:00
Jonatan Ivanov
58cfdbfa2d
Add missing OTel Span attributes
...
OTel semantic conventions mandate certain resource attributes to present
on exported spans. This commits make sure that the attribute we add are
merged with the defaults, rather than replacing them.
See gh-36155
2023-07-17 15:00:51 +02:00
Stephane Nicoll
940ef7f968
Merge pull request #36281 from izeye
...
* pr/36281:
Polish PemSslBundleProperties
Closes gh-36281
2023-07-17 13:23:02 +02:00
Johnny Lim
9b38db6672
Polish PemSslBundleProperties
...
See gh-36281
2023-07-17 13:22:27 +02:00
Stephane Nicoll
795f0b7a79
Merge pull request #36306 from dreis2211
...
* pr/36306:
Update copyright year of changed files
Fix typos
Closes gh-36306
2023-07-17 09:49:13 +02:00
Stephane Nicoll
d2912c6442
Update copyright year of changed files
...
See gh-36306
2023-07-17 09:40:57 +02:00
Christoph Dreis
8321887d6a
Fix typos
...
See gh-36306
2023-07-17 09:40:16 +02:00
Stephane Nicoll
657890412e
Merge branch '3.0.x' into 3.1.x
2023-07-14 19:19:15 +02:00
Stephane Nicoll
83457bb0e8
Merge branch '2.7.x' into 3.0.x
2023-07-14 19:13:34 +02:00
Stephane Nicoll
0e3a151657
Upgrade to Spring HATEOAS 2.1.1
...
Closes gh-36414
2023-07-14 19:09:00 +02:00
Stephane Nicoll
225abf73c6
Upgrade to Spring Data Bom 2023.0.2
...
Closes gh-36184
2023-07-14 19:08:56 +02:00
Stephane Nicoll
60150d96bd
Upgrade to Spring HATEOAS 2.0.5
...
Closes gh-36181
2023-07-14 19:08:06 +02:00
Stephane Nicoll
0a29a6a8c3
Upgrade to Spring Data Bom 2022.0.8
...
Closes gh-36179
2023-07-14 19:08:06 +02:00
Stephane Nicoll
beb4010d07
Upgrade to Spring HATEOAS 1.5.5
...
Closes gh-36413
2023-07-14 19:05:56 +02:00
Stephane Nicoll
67bae9de36
Upgrade to Spring Data Bom 2021.2.14
...
Closes gh-36173
2023-07-14 19:05:52 +02:00
Andy Wilkinson
3f4474031f
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36409
2023-07-14 10:42:05 +01:00
Andy Wilkinson
7eddacf406
Merge pull request #36109 from Pengfei-Lu
...
* gh-36109:
Correct conditions on auto-configured JacksonJsonpMapper
Closes gh-36109
2023-07-14 10:41:27 +01:00
Pengfei-Lu
8697d9ddd5
Correct conditions on auto-configured JacksonJsonpMapper
...
See gh-36109
Signed-off-by: Pengfei-Lu <459360594@qq.com >
2023-07-13 18:10:21 +01:00
Stephane Nicoll
56a7eddb9c
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36391
2023-07-13 16:19:50 +02:00