Commit Graph

44507 Commits

Author SHA1 Message Date
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
Stephane Nicoll
b3244d19c4 Merge branch '2.7.x' into 3.0.x
Closes gh-36392
2023-07-13 16:19:24 +02:00
Stephane Nicoll
1c55673405 Upgrade CI to Docker 24.0.4
Closes gh-36390
2023-07-13 16:18:38 +02:00
Stephane Nicoll
d4c3f7ab47 Merge branch '3.0.x' into 3.1.x 2023-07-13 16:08:14 +02:00
Stephane Nicoll
69252def7e Merge branch '2.7.x' into 3.0.x 2023-07-13 16:07:56 +02:00
Stephane Nicoll
9f462546e8 Start building against Spring Integration 6.1.2 snapshots
See gh-36404
2023-07-13 16:06:47 +02:00
Stephane Nicoll
f6b96040ad Start building against Spring AMQP 3.0.6 snapshots
See gh-36403
2023-07-13 16:06:42 +02:00
Stephane Nicoll
60e7185ae6 Upgrade to Spring Framework 6.0.11
Closes gh-36185
2023-07-13 16:04:30 +02:00
Stephane Nicoll
9d0360cc1e Upgrade to Reactor Bom 2022.0.9
Closes gh-36297
2023-07-13 16:04:29 +02:00
Stephane Nicoll
babfff3060 Upgrade to Dependency Management Plugin 1.1.1
Closes gh-36402
2023-07-13 16:04:29 +02:00
Stephane Nicoll
fbde75e149 Start building against Spring AMQP 3.0.6 snapshots
See gh-36401
2023-07-13 16:01:59 +02:00
Stephane Nicoll
6351cdd4bf Upgrade to Spring Framework 6.0.11
Closes gh-36180
2023-07-13 15:57:35 +02:00
Stephane Nicoll
fc9006f53c Upgrade to Reactor Bom 2022.0.9
Closes gh-36292
2023-07-13 15:57:34 +02:00
Stephane Nicoll
23653e72be Upgrade to Dependency Management Plugin 1.1.1
Closes gh-36400
2023-07-13 15:57:33 +02:00
Stephane Nicoll
b3513b5d89 Start building against Spring AMQP 2.4.14 snapshots
See gh-36399
2023-07-13 15:53:13 +02:00
Stephane Nicoll
37832be5d0 Upgrade to Spring Framework 5.3.29
Closes gh-36174
2023-07-13 15:50:22 +02:00
Andy Wilkinson
218f4f2679 Merge branch '3.0.x' into 3.1.x
Closes gh-36359
2023-07-12 12:00:11 +01:00
Andy Wilkinson
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
Andy Wilkinson
d5ca66d47c Merge branch '3.0.x' into 3.1.x
Closes gh-36355
2023-07-12 08:33:43 +01:00
Andy Wilkinson
2a5a5d19b7 Update Servlet container system requirements
Closes gh-36354
2023-07-12 08:33:10 +01:00
Stephane Nicoll
a4055b5871 Merge branch '3.0.x' into 3.1.x 2023-07-11 16:08:13 +02:00
Stephane Nicoll
3dc05f390b Merge branch '2.7.x' into 3.0.x 2023-07-11 16:08:04 +02:00
Stephane Nicoll
ddb6fd676f Upgrade to Tomcat 9.0.78
Closes gh-36317
2023-07-11 16:07:58 +02:00
Stephane Nicoll
d45903060d Upgrade to Reactor Bom 2020.0.34
Closes gh-36172
2023-07-11 16:07:58 +02:00
Stephane Nicoll
324539e707 Upgrade to Rabbit AMQP Client 5.14.3
Closes gh-36316
2023-07-11 16:07:58 +02:00
Stephane Nicoll
eb0e50f909 Upgrade to Neo4j Java Driver 4.4.12
Closes gh-36315
2023-07-11 16:07:58 +02:00
Stephane Nicoll
328d86092b Upgrade to Micrometer 1.9.13
Closes gh-36171
2023-07-11 16:07:57 +02:00
Stephane Nicoll
6d0d1ffbad Upgrade to Johnzon 1.2.21
Closes gh-36314
2023-07-11 16:07:57 +02:00
Stephane Nicoll
9142f1516e Upgrade to Janino 3.1.10
Closes gh-36313
2023-07-11 16:07:57 +02:00