Phillip Webb
38af8cd362
Merge branch '3.1.x' into 3.2.x
2024-04-18 12:52:54 -07:00
Phillip Webb
20db2b54c7
Update copyright year of changed files
2024-04-18 12:52:29 -07:00
Moritz Halbritter
8df899b510
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40427
2024-04-18 11:59:50 +02:00
Moritz Halbritter
3479304e13
Disable creation time verification on Linux
...
Closes gh-40423
2024-04-18 11:58:46 +02:00
Andy Wilkinson
4bf8020292
Upgrade to Spring Integration 6.2.4
...
Closes gh-40214
2024-04-17 18:24:00 +01:00
Andy Wilkinson
f70cfb0b03
Upgrade to SLF4J 2.0.13
...
Closes gh-40397
2024-04-17 18:23:59 +01:00
Andy Wilkinson
49f7f79424
Upgrade to Pulsar Reactive 0.5.4
...
Closes gh-40396
2024-04-17 18:23:55 +01:00
Andy Wilkinson
369cadd70d
Upgrade to Netty 4.1.109.Final
...
Closes gh-40395
2024-04-17 18:23:50 +01:00
Andy Wilkinson
22ee684473
Upgrade to ActiveMQ 5.18.4
...
Closes gh-40394
2024-04-17 18:23:45 +01:00
Andy Wilkinson
e03d691db1
Upgrade to SLF4J 2.0.13
...
Closes gh-40391
2024-04-17 15:50:05 +01:00
Andy Wilkinson
c969cbbdba
Upgrade to R2DBC Postgresql 1.0.5.RELEASE
...
Closes gh-40390
2024-04-17 15:50:01 +01:00
Andy Wilkinson
031bebb144
Upgrade to Netty 4.1.109.Final
...
Closes gh-40389
2024-04-17 15:49:56 +01:00
Andy Wilkinson
eb0506eaed
Upgrade to ActiveMQ 5.18.4
...
Closes gh-40388
2024-04-17 15:49:50 +01:00
Moritz Halbritter
3db23624e0
Merge branch '3.1.x' into 3.2.x
...
Closes gh-40386
2024-04-17 16:40:50 +02:00
Spencer Gibb
6f3c30bf74
Fix javadoc for correct operation annotation
...
ReadOperation was the text for WriteOperation and DeleteOperation.
See gh-40385
2024-04-17 16:39:30 +02:00
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
Andy Wilkinson
594fa88ee0
Upgrade to Spring Security 6.1.9
...
Closes gh-40204
2024-04-16 19:44:42 +01:00
Andy Wilkinson
d5af9a41b9
Upgrade to Spring LDAP 3.1.5
...
Closes gh-40203
2024-04-16 19:44:42 +01:00
Andy Wilkinson
db7059c1f7
Upgrade to Spring Kafka 3.0.16
...
Closes gh-40375
2024-04-16 19:44:41 +01:00
Andy Wilkinson
bc79274f9e
Upgrade to Spring Integration 6.1.8
...
Closes gh-40202
2024-04-16 19:44:36 +01:00
Andy Wilkinson
59325d1626
Upgrade to Spring HATEOAS 2.1.5
...
Closes gh-40374
2024-04-16 19:44:35 +01:00
Andy Wilkinson
5da05e2037
Upgrade to Spring Data Bom 2023.0.11
...
Closes gh-40200
2024-04-16 19:44:29 +01:00
Andy Wilkinson
2a1268c597
Upgrade to Spring Authorization Server 1.1.7
...
Closes gh-40199
2024-04-16 19:44:28 +01:00
Andy Wilkinson
acfc5fe830
Upgrade to Spring AMQP 3.0.13
...
Closes gh-40373
2024-04-16 19:44:27 +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