250868ad84
Upgrade to Spring AMQP 2.4.14
...
Closes gh-36399
2023-07-17 19:53:54 +02:00
7195d87e6c
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36429
2023-07-17 15:48:30 +02:00
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
750096b9c2
Polish "Allow custom ExemplarSampler to be used"
...
See gh-35619
2023-07-17 15:46:48 +02:00
94b17ecd26
Allow custom ExemplarSampler to be used
...
See gh-35619
2023-07-17 15:44:05 +02:00
bb16ed1245
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36427
2023-07-17 15:24:58 +02:00
3586bfb629
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36426
2023-07-17 15:22:43 +02:00
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
09e5d38348
Polish "Replace @CsvSource with @ValueSource where feasible"
...
See gh-36062
2023-07-17 15:16:27 +02:00
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
588129318c
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36423
2023-07-17 15:06:00 +02:00
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
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
940ef7f968
Merge pull request #36281 from izeye
...
* pr/36281:
Polish PemSslBundleProperties
Closes gh-36281
2023-07-17 13:23:02 +02:00
9b38db6672
Polish PemSslBundleProperties
...
See gh-36281
2023-07-17 13:22:27 +02:00
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
d2912c6442
Update copyright year of changed files
...
See gh-36306
2023-07-17 09:40:57 +02:00
8321887d6a
Fix typos
...
See gh-36306
2023-07-17 09:40:16 +02:00
657890412e
Merge branch '3.0.x' into 3.1.x
2023-07-14 19:19:15 +02:00
83457bb0e8
Merge branch '2.7.x' into 3.0.x
2023-07-14 19:13:34 +02:00
0e3a151657
Upgrade to Spring HATEOAS 2.1.1
...
Closes gh-36414
2023-07-14 19:09:00 +02:00
225abf73c6
Upgrade to Spring Data Bom 2023.0.2
...
Closes gh-36184
2023-07-14 19:08:56 +02:00
60150d96bd
Upgrade to Spring HATEOAS 2.0.5
...
Closes gh-36181
2023-07-14 19:08:06 +02:00
0a29a6a8c3
Upgrade to Spring Data Bom 2022.0.8
...
Closes gh-36179
2023-07-14 19:08:06 +02:00
beb4010d07
Upgrade to Spring HATEOAS 1.5.5
...
Closes gh-36413
2023-07-14 19:05:56 +02:00
67bae9de36
Upgrade to Spring Data Bom 2021.2.14
...
Closes gh-36173
2023-07-14 19:05:52 +02:00
3f4474031f
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36409
2023-07-14 10:42:05 +01:00
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
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
56a7eddb9c
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36391
2023-07-13 16:19:50 +02:00
b3244d19c4
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36392
2023-07-13 16:19:24 +02:00
1c55673405
Upgrade CI to Docker 24.0.4
...
Closes gh-36390
2023-07-13 16:18:38 +02:00
d4c3f7ab47
Merge branch '3.0.x' into 3.1.x
2023-07-13 16:08:14 +02:00
69252def7e
Merge branch '2.7.x' into 3.0.x
2023-07-13 16:07:56 +02:00
9f462546e8
Start building against Spring Integration 6.1.2 snapshots
...
See gh-36404
2023-07-13 16:06:47 +02:00
f6b96040ad
Start building against Spring AMQP 3.0.6 snapshots
...
See gh-36403
2023-07-13 16:06:42 +02:00
60e7185ae6
Upgrade to Spring Framework 6.0.11
...
Closes gh-36185
2023-07-13 16:04:30 +02:00
9d0360cc1e
Upgrade to Reactor Bom 2022.0.9
...
Closes gh-36297
2023-07-13 16:04:29 +02:00
babfff3060
Upgrade to Dependency Management Plugin 1.1.1
...
Closes gh-36402
2023-07-13 16:04:29 +02:00
fbde75e149
Start building against Spring AMQP 3.0.6 snapshots
...
See gh-36401
2023-07-13 16:01:59 +02:00
6351cdd4bf
Upgrade to Spring Framework 6.0.11
...
Closes gh-36180
2023-07-13 15:57:35 +02:00
fc9006f53c
Upgrade to Reactor Bom 2022.0.9
...
Closes gh-36292
2023-07-13 15:57:34 +02:00
23653e72be
Upgrade to Dependency Management Plugin 1.1.1
...
Closes gh-36400
2023-07-13 15:57:33 +02:00
b3513b5d89
Start building against Spring AMQP 2.4.14 snapshots
...
See gh-36399
2023-07-13 15:53:13 +02:00
37832be5d0
Upgrade to Spring Framework 5.3.29
...
Closes gh-36174
2023-07-13 15:50:22 +02:00
218f4f2679
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36359
2023-07-12 12:00:11 +01:00
090802b11b
Use existing value rather than deducing bind method
...
When there is an existing value, deducing the bind method may
incorrectly result in the use of constructor binding. This
results in a failure in the configuration properties
post-processor as it refuses to bind properties to a bean whose
attributes indicate that constructor binding should have been used.
This commit updates ConfigurationPropertiesBean to avoid tryin to
deduce the bind method and instead use the presence or absence of an
existing value to determine the type of binding that should be used.
Only when there is no existing value is constructor binding
appropriate.
Fixes gh-36175
2023-07-12 11:13:48 +01:00
d5ca66d47c
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36355
2023-07-12 08:33:43 +01:00
2a5a5d19b7
Update Servlet container system requirements
...
Closes gh-36354
2023-07-12 08:33:10 +01:00
a4055b5871
Merge branch '3.0.x' into 3.1.x
2023-07-11 16:08:13 +02:00
Stephane Nicoll
Johnny Goncalves
Yanming Zhou
Jonatan Ivanov
Johnny Lim
Christoph Dreis
Andy Wilkinson
Pengfei-Lu