Commit Graph

48349 Commits

Author SHA1 Message Date
Andy Wilkinson
2c6006eeff Move verification into reusable workflow
Closes gh-40350
2024-04-15 13:32:07 +01:00
Andy Wilkinson
e8a92d3d9c Merge branch '3.2.x' 2024-04-12 16:02:16 +01:00
Andy Wilkinson
74fff36e82 Merge branch '3.1.x' into 3.2.x 2024-04-12 16:02:07 +01:00
Brian Clozel
54926980d5 Merge branch '3.1.x' 2024-04-12 16:40:32 +02:00
Brian Clozel
24f80154d4 Do not overwrite attributes in ClientObservationConventionAdapter
Prior to this commit, the `ClientObservationConventionAdapter` would
overwrite a request builder attribute. This would happen when the
request is not fully built when the observation starts. At that point,
the tags are built for long task timers, but not for the actual metric.
This effectively overrides the correct value of the URI template in the
builder.

This commit removes this builder update which was invalid in the first
place.

Fixes gh-40330
2024-04-12 16:31:02 +02:00
Andy Wilkinson
578d9ec453 Upgrade to Spring LDAP 3.2.3
Closes gh-40228
2024-04-12 14:06:03 +01:00
Andy Wilkinson
ab783d495f Upgrade to Spring HATEOAS 2.3.0-RC1
Closes gh-40336
2024-04-12 14:06:02 +01:00
Andy Wilkinson
d7ccdc4ac1 Upgrade to Spring Framework 6.1.6
Closes gh-40225
2024-04-12 14:05:58 +01:00
Andy Wilkinson
45d80aa5b4 Upgrade to Spring Data Bom 2024.0.0-RC1
Closes gh-40224
2024-04-12 14:05:57 +01:00
Andy Wilkinson
d515479706 Upgrade to Reactor Bom 2023.0.5
Closes gh-40221
2024-04-12 14:05:56 +01:00
Andy Wilkinson
2b31db85ea Upgrade to R2DBC Postgresql 1.0.5.RELEASE
Closes gh-40335
2024-04-12 14:05:55 +01:00
Andy Wilkinson
ed7c2da857 Upgrade to Infinispan 15.0.1.Final
Closes gh-40334
2024-04-12 14:05:51 +01:00
Andy Wilkinson
b223bdf2d5 Upgrade to Elasticsearch Client 8.13.2
Closes gh-40333
2024-04-12 14:05:46 +01:00
Andy Wilkinson
c50c973080 Upgrade to Brave 6.0.3
Closes gh-40332
2024-04-12 14:05:42 +01:00
Andy Wilkinson
3544e96c18 Upgrade to Awaitility 4.2.1
Closes gh-40331
2024-04-12 14:05:37 +01:00
Andy Wilkinson
4fd0375eb1 Adapt tests to addition of new JWT validator in Spring Security
See gh-40230
2024-04-12 12:14:05 +01:00
Andy Wilkinson
b1d8a612ca Merge branch '3.2.x' 2024-04-12 11:19:44 +01:00
Andy Wilkinson
1266516605 Merge branch '3.1.x' into 3.2.x 2024-04-12 11:19:33 +01:00
Andy Wilkinson
12e004f131 Revert "Exclude unwanted javax.inject dependency from Data Couchbase"
This reverts commit 06f5ab162f. The
dependency has been removed in Data Couchbase, making the exclude
unnecessary.

See gh-40200
2024-04-12 11:19:16 +01:00
Andy Wilkinson
a3d62e0b2f Merge branch '3.2.x'
Closes gh-40327
2024-04-12 10:31:39 +01:00
Andy Wilkinson
1c5ba19e86 Merge branch '3.1.x' into 3.2.x
Closes gh-40326
2024-04-12 10:31:26 +01:00
Andy Wilkinson
a946f66e7c Minimize pollution of Log4j2's environment
Closes gh-40178
2024-04-12 10:25:25 +01:00
Brian Clozel
04faec1d3e Add spring.graphql.websocket.keep-alive property
As of spring-projects/spring-graphql#534, Spring for GraphQL supports
the configuration of keep-alive PINGs for WebSocket connections.
This commit auto-configures this value in the `GraphQlWebSocketHandler`
WebFlux and MVC implementations if the
`spring.graphql.websocket.keep-alive` property is configured.

Closes gh-40320
2024-04-11 18:52:00 +02:00
Andy Wilkinson
e557af7b85 Merge branch '3.2.x' 2024-04-11 17:07:41 +01:00
Andy Wilkinson
1e0cb25bff Merge branch '3.1.x' into 3.2.x 2024-04-11 17:07:34 +01:00
Andy Wilkinson
1ea6f2f51f Revert "Revert "Exclude unwanted javax.inject dependency from Data Couchbase""
This reverts commit 3b76165f4e.

Turns out, the exclude's still needed for now? with Data Couchbase
5.1.x.

See gh-40200
2024-04-11 17:06:03 +01:00
Andy Wilkinson
93c8513a78 Merge branch '3.2.x'
See gh-40224
2024-04-11 16:56:41 +01:00
Andy Wilkinson
7d3ea3f06f Merge branch '3.1.x' into 3.2.x
See gh-40212
2024-04-11 16:56:22 +01:00
Andy Wilkinson
3b76165f4e Revert "Exclude unwanted javax.inject dependency from Data Couchbase"
This reverts commit 06f5ab162f. The
dependency has been removed in Data Couchbase, making the exclude
unnecessary.

See gh-40200
2024-04-11 16:55:24 +01:00
Andy Wilkinson
0ed6864d1d Merge branch '3.2.x'
Closes gh-40324
2024-04-11 16:54:46 +01:00
Andy Wilkinson
45e9412d9b Merge branch '3.1.x' into 3.2.x
Closes gh-40323
2024-04-11 16:54:33 +01:00
Andy Wilkinson
a417c94805 Merge pull request #39837 from mstahv
* gh-39837:
  Make includes configurable via a property
  Polish "Make excludes configurable via property"
  Make excludes configurable via property

Closes gh-39837
2024-04-11 16:32:26 +01:00
Andy Wilkinson
baf5a7f130 Make includes configurable via a property
See gh-39837
2024-04-11 16:32:17 +01:00
Andy Wilkinson
2a6293940b Polish "Make excludes configurable via property"
See gh-39837
2024-04-11 16:31:24 +01:00
Matti Tahvonen
58fc8f8c01 Make excludes configurable via property
See gh-39837
2024-04-11 15:43:31 +01:00
Andy Wilkinson
d642d35547 Merge branch '3.2.x'
Closes gh-40322
2024-04-11 15:35:50 +01:00
Andy Wilkinson
aab748a431 Merge branch '3.1.x' into 3.2.x
Closes gh-40321
2024-04-11 15:35:18 +01:00
Andy Wilkinson
2f3cf56f03 Fix servlet component scanning in a mock web environment
Closes gh-39736
2024-04-11 15:22:45 +01:00
Andy Wilkinson
26ed6b219f Merge branch '3.2.x'
Closes gh-40313
2024-04-10 20:07:45 +01:00
Andy Wilkinson
54c6b7c3ea Merge branch '3.1.x' into 3.2.x
Closes gh-40312
2024-04-10 20:07:33 +01:00
Andy Wilkinson
b961662cf1 Merge pull request #40235 from ppkarwasz
* gh-40235:
  Polish "Replace custom filter with DenyAllFilter"
  Replace custom filter with DenyAllFilter

Closes gh-40235
2024-04-10 20:07:24 +01:00
Andy Wilkinson
ef9f1b41d7 Polish "Replace custom filter with DenyAllFilter"
See gh-40235
2024-04-10 19:44:45 +01:00
Piotr P. Karwasz
d194b7f3c0 Replace custom filter with DenyAllFilter
See gh-40235
2024-04-10 19:44:29 +01:00
Andy Wilkinson
d99c1157ef Merge branch '3.2.x' 2024-04-10 19:40:08 +01:00
Andy Wilkinson
9c7d8f96ea Upgrade to Tomcat 10.1.20
Closes gh-40311
2024-04-10 18:26:43 +01:00
Andy Wilkinson
d4799fa4b0 Upgrade to Spring GraphQL 1.2.6
Closes gh-40310
2024-04-10 18:26:42 +01:00
Andy Wilkinson
98a3a62c2c Upgrade to Reactor Bom 2023.0.5
Closes gh-40209
2024-04-10 18:26:42 +01:00
Andy Wilkinson
dac7727013 Upgrade to R2DBC Postgresql 1.0.5.RELEASE
Closes gh-40309
2024-04-10 18:26:41 +01:00
Andy Wilkinson
c8aabbaafb Upgrade to Netty 4.1.108.Final
Closes gh-40308
2024-04-10 18:26:41 +01:00
Andy Wilkinson
6c70cf2bd8 Upgrade to MongoDB 4.11.2
Closes gh-40307
2024-04-10 18:26:41 +01:00