Commit Graph

24182 Commits

Author SHA1 Message Date
Phillip Webb
78e12251e9 Optimize VirtualZipDataBlock
Add some optimizations to `VirtualZipDataBlock` that help when
sequentially reading the block from a JarInputStream.

Closes gh-40125
2024-04-16 22:16:00 -07:00
Phillip Webb
9b0593efe3 Fallback to RandomAccessFile on ClosedByInterruptException
Refine the fix for gh-38611 so that `ClosedByInterruptException` no
longer retries in a loop.

Our previous fix was flawed due to the fact that another interrupt
could occur after we clear the first and whilst we are reading data.
If this happens 10 times in a row, we raise an exception and end up
causing NoClassDefFoundError errors.

Our new approach retains the use of `FileChannel` and a direct buffer
up to the point that a `ClosedByInterruptException` is raised or the
thread is detected as interrupted.  At that point, we temporarily
switch to using a `RandomAccessFile` to access the data. This will
block the thread until the data has been read.

Fixes gh-40096
2024-04-16 14:47:07 -07:00
Phillip Webb
4203e1f2fa Rename FileChannelDataBlock to FileDataBlock
Rename the internal `FileChannelDataBlock` to `FileDataBlock` since we
want to fallback to a `RandomAccessFile` when a thread is interrupted.

See gh-40096
2024-04-16 14:46:56 -07:00
Andy Wilkinson
778c528281 Upgrade to Spring Security 6.2.4
Closes gh-40217
2024-04-16 19:47:35 +01:00
Andy Wilkinson
bd825141b7 Upgrade to Spring Pulsar 1.0.5
Closes gh-40216
2024-04-16 19:47:34 +01:00
Andy Wilkinson
e731986d22 Upgrade to Spring LDAP 3.2.3
Closes gh-40215
2024-04-16 19:47:33 +01:00
Andy Wilkinson
2028d431cd Upgrade to Spring Kafka 3.1.4
Closes gh-40377
2024-04-16 19:47:32 +01:00
Andy Wilkinson
37e13bc7eb Upgrade to Spring HATEOAS 2.2.2
Closes gh-40376
2024-04-16 19:47:27 +01:00
Andy Wilkinson
00304fe5a7 Upgrade to Spring Data Bom 2023.1.5
Closes gh-40212
2024-04-16 19:47:21 +01:00
Andy Wilkinson
6dfcf44ffc Upgrade to Spring Authorization Server 1.2.4
Closes gh-40211
2024-04-16 19:47:20 +01:00
Andy Wilkinson
e91621cddf Upgrade to Spring AMQP 3.1.4
Closes gh-40210
2024-04-16 19:47:19 +01:00
Moritz Halbritter
5058719242 Merge branch '3.1.x' into 3.2.x
Closes gh-40364
2024-04-16 13:40:03 +02:00
Johnny Lim
201885a242 Fix target in BindValidationFailureAnalyzer
See gh-40035
2024-04-16 11:55:09 +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
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
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
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
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
45e9412d9b Merge branch '3.1.x' into 3.2.x
Closes gh-40323
2024-04-11 16:54:33 +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
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
54c6b7c3ea Merge branch '3.1.x' into 3.2.x
Closes gh-40312
2024-04-10 20:07:33 +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
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
Andy Wilkinson
9ff51a6364 Upgrade to Micrometer Tracing 1.2.5
Closes gh-40208
2024-04-10 18:26:40 +01:00
Andy Wilkinson
03ba263ce3 Upgrade to Micrometer 1.12.5
Closes gh-40207
2024-04-10 18:26:40 +01:00
Andy Wilkinson
2f4b4a32cd Upgrade to Maven Source Plugin 3.3.1
Closes gh-40306
2024-04-10 18:26:39 +01:00
Andy Wilkinson
76f1af2663 Upgrade to Maven Invoker Plugin 3.6.1
Closes gh-40305
2024-04-10 18:26:39 +01:00
Andy Wilkinson
ae57b3eae3 Upgrade to Lombok 1.18.32
Closes gh-40304
2024-04-10 18:26:39 +01:00
Andy Wilkinson
61eda8d2ef Upgrade to Kafka 3.6.2
Closes gh-40303
2024-04-10 18:26:38 +01:00
Andy Wilkinson
53878560fe Upgrade to Json-smart 2.5.1
Closes gh-40302
2024-04-10 18:26:38 +01:00
Andy Wilkinson
9310fdb584 Upgrade to jOOQ 3.18.14
Closes gh-40301
2024-04-10 18:26:37 +01:00
Andy Wilkinson
cdc95bb92a Upgrade to Jetty 12.0.8
Closes gh-40300
2024-04-10 18:26:37 +01:00
Andy Wilkinson
28b9f40126 Upgrade to Jersey 3.1.6
Closes gh-40299
2024-04-10 18:04:48 +01:00
Andy Wilkinson
9965654c46 Upgrade to Jakarta Json Bind 3.0.1
Closes gh-40298
2024-04-10 17:59:19 +01:00
Andy Wilkinson
21ad4ab1b1 Upgrade to Hazelcast 5.3.7
Closes gh-40297
2024-04-10 17:59:13 +01:00
Andy Wilkinson
14b5ab560a Upgrade to Groovy 4.0.21
Closes gh-40296
2024-04-10 17:59:06 +01:00
Andy Wilkinson
71fd84595a Upgrade to Byte Buddy 1.14.13
Closes gh-40295
2024-04-10 17:59:00 +01:00
Andy Wilkinson
162980fe6a Upgrade to Awaitility 4.2.1
Closes gh-40294
2024-04-10 17:58:54 +01:00
Andy Wilkinson
e947de1b23 Upgrade to AspectJ 1.9.22
Closes gh-40293
2024-04-10 17:58:48 +01:00