Commit Graph
42355 Commits
Author SHA1 Message Date
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 83457bb0e8 Merge branch '2.7.x' into 3.0.x 2023-07-14 19:13:34 +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 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 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 69252def7e Merge branch '2.7.x' into 3.0.x 2023-07-13 16:07:56 +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 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 2a5a5d19b7 Update Servlet container system requirements
Closes gh-36354
2023-07-12 08:33:10 +01: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
Stephane Nicoll 2bc135c23b Upgrade to Groovy 3.0.18
Closes gh-36312
2023-07-11 16:07:57 +02:00
Stephane Nicoll 45cdb53e23 Upgrade to Elasticsearch 7.17.11
Closes gh-36311
2023-07-11 16:07:57 +02:00
Stephane Nicoll 90a96acf89 Merge branch '2.7.x' into 3.0.x 2023-07-11 16:06:42 +02:00
Stephane Nicoll a5cb6b9f0e Upgrade to Tomcat 10.1.11
Closes gh-36330
2023-07-11 15:00:02 +02:00
Stephane Nicoll 8d94b4b059 Upgrade to Rabbit AMQP Client 5.16.1
Closes gh-36329
2023-07-11 14:59:57 +02:00
Stephane Nicoll 17e27251a8 Upgrade to Micrometer Tracing 1.0.8
Closes gh-36291
2023-07-11 14:59:52 +02:00
Stephane Nicoll dd6cbd3d8c Upgrade to Micrometer 1.10.9
Closes gh-36178
2023-07-11 14:59:52 +02:00
Stephane Nicoll 601a7d9043 Upgrade to jOOQ 3.17.14
Closes gh-36328
2023-07-11 14:59:51 +02:00
Stephane Nicoll 11104412c0 Upgrade to JBoss Logging 3.5.3.Final
Closes gh-36327
2023-07-11 14:59:46 +02:00
Stephane Nicoll abd9494d0a Upgrade to Janino 3.1.10
Closes gh-36326
2023-07-11 14:59:41 +02:00
Stephane Nicoll e99311d10b Upgrade to Jakarta WebSocket 2.1.1
Closes gh-36325
2023-07-11 14:59:37 +02:00
Stephane Nicoll a9a93fed6f Upgrade to Infinispan 14.0.12.Final
Closes gh-36324
2023-07-11 14:59:32 +02:00
Stephane Nicoll d6c468a46d Upgrade to Hibernate Validator 8.0.1.Final
Closes gh-36323
2023-07-11 14:59:27 +02:00
Stephane Nicoll 642be39556 Upgrade to Groovy 4.0.13
Closes gh-36322
2023-07-11 14:59:22 +02:00
Andy Wilkinson b67978bc10 Merge branch '2.7.x' into 3.0.x
Closes gh-36318
2023-07-11 13:35:16 +01:00
Andy Wilkinson de2382e61c Merge pull request #36303 from dependabot[bot]
* gh-36303:
  Update to gradle-build-action 2.6.0

Closes gh-36303
2023-07-11 13:35:08 +01:00
dependabot[bot] 365f524ea2 Update to gradle-build-action 2.6.0
Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 2.5.1 to 2.6.0.
- [Release notes](https://github.com/gradle/gradle-build-action/releases)
- [Commits](https://github.com/gradle/gradle-build-action/compare/40b6781dcdec2762ad36556682ac74e31030cfe2...bd5760595778326ba7f1441bcf7e88b49de61a25)

See gh-36303
2023-07-11 13:34:31 +01:00
Stephane Nicoll d9b58cf17e Upgrade to Tomcat 9.0.78
Closes gh-36317
2023-07-11 14:30:54 +02:00
Stephane Nicoll b72fea74ce Upgrade to Reactor Bom 2020.0.34
Closes gh-36172
2023-07-11 14:30:49 +02:00
Stephane Nicoll a508606fd0 Upgrade to Rabbit AMQP Client 5.14.3
Closes gh-36316
2023-07-11 14:30:49 +02:00
Stephane Nicoll f50f76962d Upgrade to Neo4j Java Driver 4.4.12
Closes gh-36315
2023-07-11 14:30:44 +02:00
Stephane Nicoll a9746b25c3 Upgrade to Micrometer 1.9.13
Closes gh-36171
2023-07-11 14:30:39 +02:00
Stephane Nicoll a19c421b99 Upgrade to Johnzon 1.2.21
Closes gh-36314
2023-07-11 14:30:38 +02:00