Commit Graph

24306 Commits

Author SHA1 Message Date
Moritz Halbritter 7ac0d0cde6 Merge branch '3.1.x' into 3.2.x
Closes gh-40564
2024-04-29 11:56:32 +02:00
Moritz Halbritter d716d99d1b Note that Docker Compose is excluded by default from packaged jars
Closes gh-40556
2024-04-29 11:54:17 +02:00
Moritz Halbritter be5039041c Defer creation of maps in MapBinder
Closes gh-39375
2024-04-29 10:07:40 +02:00
Moritz Halbritter 8a3b0cd221 Throw dedicated exception if bundle content is not watchable
This also adds a FailureAnalyzer which prints a helpful message how to
fix that problem.

Closes gh-38903
2024-04-29 09:46:19 +02:00
Andy Wilkinson 960f020a18 Merge branch '3.1.x' into 3.2.x
Closes gh-40534
2024-04-26 14:02:52 +01:00
Andy Wilkinson 95eb9bd7dc Allow s-b-dependencies to be used when ojdbc-bom is banned
Closes gh-39945
2024-04-26 14:02:00 +01:00
Andy Wilkinson eb7e7b6425 Merge branch '3.1.x' into 3.2.x
Closes gh-40532
2024-04-26 13:51:33 +01:00
Andy Wilkinson d2a5bb3b26 Add dependency management alignment infrastructure
Closes gh-40531
2024-04-26 13:51:16 +01:00
Moritz Halbritter 5707ca83e9 Merge branch '3.1.x' into 3.2.x
Closes gh-40529
2024-04-26 11:12:46 +02:00
chaewss d51282aff5 Remove unnecessary null check for expectedDeprecationMessages
See gh-40524
2024-04-26 11:12:20 +02:00
Andy Wilkinson 087e467387 Merge branch '3.1.x' into 3.2.x
Closes gh-40527
2024-04-26 09:33:12 +01:00
Andy Wilkinson 83f692237d Migrate to com.gradle.develocity plugin
Closes gh-40153
2024-04-26 09:30:48 +01:00
Moritz Halbritter f13e487724 Close streams in test before deleting file 2024-04-26 09:20:36 +02:00
Phillip Webb 9e40970280 Support gzip compressed image layers
Update buildpack support to allow gzip compressed image layers to be
used when returned by the Docker engine. This update is restores
buildpack support when using Docker Desktop with the "Use containerd
for pulling and storing images" option enabled.

This commit introduces a new `ExportedImageTar` class to deal with the
intricacies of determining the mimetype of a layer. The class deals with
the parsing of `index.json' and related manifest blobs in order to
obtain layer information. The legacy `manifest.json` format is also
supported should `index.json` be missing.

Tests have been added to ensure that export archives from Docker Engine,
Docker Desktop (with and without containerd), and Podman can be used.

Fixes gh-40100

Co-authored-by: Moritz Halbritter <moritz.halbritter@broadcom.com>
Co-authored-by: Scott Frederick <scott.frederick@broadcom.com>
2024-04-25 11:51:59 -07:00
Andy Wilkinson 79c3f0335b Merge branch '3.1.x' into 3.2.x
Closes gh-40522
2024-04-25 13:43:03 +01:00
Andy Wilkinson 27418edeb0 Remove references to s.j.generate-ddl in favor of s.j.hibernate.ddl-auto
Closes gh-40503
2024-04-25 13:39:28 +01:00
Andy Wilkinson f1d0bcda2f Revert "Remove references to s.j.generate-ddl in favor of s.j.hibernate.ddl-auto"
This reverts commit 273f8e20c2.
2024-04-25 12:44:51 +01:00
Andy Wilkinson 273f8e20c2 Remove references to s.j.generate-ddl in favor of s.j.hibernate.ddl-auto 2024-04-25 12:24:47 +01:00
Moritz Halbritter 26f1bbb634 Merge branch '3.1.x' into 3.2.x
Closes gh-40516
2024-04-25 11:07:25 +02:00
Moritz Halbritter 2e906c4720 Catch exceptions thrown during String format when collecting diagnostics
Registers the LoggingLinesWriter only if debug logging is actually
enabled.

Closes gh-40500
2024-04-25 11:06:31 +02:00
Moritz Halbritter 503d8c1273 Merge branch '3.1.x' into 3.2.x
Closes gh-40514
2024-04-25 09:44:51 +02:00
Moritz Halbritter 8be85611e0 Clarify the directory that's used by default to find Docker Compose file
Closes gh-40512
2024-04-25 09:44:35 +02:00
Scott Frederick 3e2d151c0e Merge branch '3.1.x' into 3.2.x
Closes gh-40508
2024-04-24 15:08:50 -05:00
Scott Frederick f210d83062 Don't reuse Testcontainers containers if reuse is globally disabled
Fixes gh-39609
2024-04-24 14:37:59 -05:00
Moritz Halbritter 00a25f5d89 Don't apply CookieSameSiteSupplier to session cookies when using Jetty
Closes gh-39766
2024-04-24 15:59:10 +02:00
Moritz Halbritter b416db4dee Merge branch '3.1.x' into 3.2.x
Closes gh-40498
2024-04-24 14:04:08 +02:00
Moritz Halbritter 2cb19f368e Polish "Remove unnecessary nesting of calls to String.format"
See gh-40494
2024-04-24 13:57:07 +02:00
Hyeon Sung 0cf15fcad0 Remove unnecessary nesting of calls to String.format
See gh-40494
2024-04-24 13:55:04 +02:00
Moritz Halbritter 35c9233007 Merge branch '3.1.x' into 3.2.x
Closes gh-40485
2024-04-23 09:24:32 +02:00
Moritz Halbritter b50b0e89c9 Remove detection of missing parameter information
There are some cases where false positives of the detection prevent
compiling an application to native which otherwise would run perfectly
fine in a native image.

Closes gh-40051
2024-04-23 09:10:46 +02:00
Phillip Webb 5c9d5e262f Merge branch '3.1.x' into 3.2.x
Closes gh-40482
2024-04-22 17:56:52 -07:00
Phillip Webb 3e5d6c9cce Register ServiceLevelObjectiveBoundary reflection hinds
Register hints for `ServiceLevelObjectiveBoundary` so that the `valueOf`
method can be used when binding in a native image.

Fixes gh-40480
2024-04-22 17:56:11 -07:00
Scott Frederick 08bc0460ed Document usage of Docker Compose support in tests
Closes gh-40171
2024-04-22 16:47:29 -05:00
Scott Frederick 3a9ee9f1a7 Merge branch '3.1.x' into 3.2.x
Closes gh-40478
2024-04-22 14:38:28 -05:00
Scott Frederick 362c0c1b4e Verify alignment of MongoDB UUID representation defaults
Closes gh-33532
2024-04-22 14:38:18 -05:00
Scott Frederick fc03fded39 Merge branch '3.1.x' into 3.2.x
Closes gh-40475
2024-04-22 13:27:57 -05:00
Scott Frederick cdf207cf74 Stop expecting deprecations in NativeImagePluginActionIntegrationTests
Closes gh-35709
2024-04-22 13:14:37 -05:00
Andy Wilkinson 82b218937c Polish "Consider HandlerMethodValidationException in DefaultErrorAttributes"
See gh-39865
2024-04-22 16:17:08 +01:00
Yanming Zhou 20e9ff9f3d Consider HandlerMethodValidationException in DefaultErrorAttributes
See gh-39865
2024-04-22 15:38:47 +01:00
Moritz Halbritter 4b61ae415b Merge branch '3.1.x' into 3.2.x
Closes gh-40470
2024-04-22 14:34:36 +02:00
Moritz Halbritter 5510c6f61b Clarify that all named properties must match for @ConditionalOnProperty to match
Closes gh-40110
2024-04-22 14:27:54 +02:00
Andy Wilkinson 3a6f83e2d6 Fix links to Batch's javadoc
Closes gh-40468
2024-04-22 12:39:56 +01:00
Andy Wilkinson 07bb1878cf Merge branch '3.1.x' into 3.2.x
Closes gh-40466
2024-04-22 12:10:52 +01:00
Andy Wilkinson 34f53d48b9 Polish "Fix handling of Redis nodes with IPv6 addresses"
See gh-39819
2024-04-22 11:51:31 +01:00
Tobias Laatsch 9b326d59fe Fix handling of Redis nodes with IPv6 addresses
See gh-39819
2024-04-22 11:33:09 +01:00
Andy Wilkinson deffda47f6 Merge branch '3.1.x' into 3.2.x
Closes gh-40464
2024-04-22 11:18:22 +01:00
Andy Wilkinson ca4d64ed16 Use absolute path when showing classpath where main class was not found
Closes gh-40463
2024-04-22 11:16:37 +01:00
Andy Wilkinson 2e114b6971 Merge branch '3.1.x' into 3.2.x
Closes gh-40450
2024-04-19 17:31:00 +01:00
Andy Wilkinson 172b3d5336 Improve diagnostics when native image fails before logging is set up
Closes gh-40429
2024-04-19 17:30:22 +01:00
Andy Wilkinson c55f136c2a Merge branch '3.1.x' into 3.2.x
Closes gh-40440
2024-04-19 10:57:47 +01:00
Andy Wilkinson 5e9161f785 Make DevToolsDataSourceAutoConfiguration back off without DataSource class
Manually tested as an automated test is prohibitively difficult as it
requires hiding one of the JDK's own classes.

Closes gh-40434
2024-04-19 10:54:23 +01:00
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