Commit Graph

24627 Commits

Author SHA1 Message Date
Andy Wilkinson 70a12d79ec Start building against Spring Pulsar 1.0.7 snapshots
See gh-41024
2024-06-10 10:26:36 +01:00
Andy Wilkinson a253ede0c1 Start building against Spring LDAP 3.2.4 snapshots
See gh-41023
2024-06-10 10:26:36 +01:00
Andy Wilkinson a09e0e00b8 Start building against Spring Kafka 3.1.6 snapshots
See gh-41022
2024-06-10 10:26:35 +01:00
Andy Wilkinson 5f185df451 Start building against Spring Integration 6.2.6 snapshots
See gh-41021
2024-06-10 10:26:35 +01:00
Andy Wilkinson be33a3579c Start building against Spring GraphQL 1.2.7 snapshots
See gh-41020
2024-06-10 10:26:35 +01:00
Andy Wilkinson 26692a7f26 Upgrade to Neo4j Java Driver 5.21.0
Closes gh-41028
2024-06-10 10:26:34 +01:00
Andy Wilkinson 34b99bd6be Start building against Spring Data Bom 2023.1.7 snapshots
See gh-41018
2024-06-10 10:26:33 +01:00
Andy Wilkinson a2b1638d77 Start building against Spring Authorization Server 1.2.5 snapshots
See gh-41017
2024-06-10 10:26:33 +01:00
Andy Wilkinson a620bb4201 Start building against Reactor Bom 2023.0.7 snapshots
See gh-41016
2024-06-10 10:26:32 +01:00
Andy Wilkinson 1eb1dade94 Start building against Micrometer Tracing 1.2.7 snapshots
See gh-41027
2024-06-10 10:26:32 +01:00
Andy Wilkinson 73315b607f Start building against Micrometer 1.12.7 snapshots
See gh-41015
2024-06-10 10:21:26 +01:00
Andy Wilkinson fe536bf075 Allow SSL to be used with Tomcat's Http11Nio2Protocol
Fixes gh-41007
2024-06-07 12:46:19 +01:00
Andy Wilkinson 217c2c862b Ignore file entries in META-INF/versions of multi-release jar
Fixes gh-41001
2024-06-06 13:28:36 +01:00
Andy Wilkinson d4e9f458a3 Fix path handling and wrapping in LoaderHidingResource
Closes gh-39472
2024-06-05 12:33:21 +01:00
Andy Wilkinson 2ceb7b4217 Extract LoaderHidingResource as a top-level type
See gh-39472
2024-06-05 12:33:20 +01:00
Yanming Zhou 5cfd079c55 Remove unnecessary null check
See gh-40963
2024-06-04 08:39:26 +02:00
Khan, C M Abdullah 570522d876 Fix typos in method names and javadoc
See gh-40971
2024-06-03 14:05:52 +02:00
Andy Wilkinson dd6f516d66 Test Gradle Plugin against 8.8
Closes gh-40573
2024-06-03 08:29:02 +01:00
Ahmed Ashour f000af6a12 Remove unused parameter and polish javadoc
See gh-40955
2024-05-30 14:42:46 -05:00
Mateus Scheper 6c5ae329f3 Fix typo in Dev Services reference docs
See gh-40951
2024-05-30 14:27:27 -05:00
Andy Wilkinson 211bf95f45 Revert "Adapt to Spring Data Neo4j now requiring a transaction manager"
This reverts commit b6467ed826. Changes
in Spring Data Neo4j mean that these changes are no longer necessary.
They also caused a problem with multiple transaction managers being
present when mixing Neo4j and, say, Data JPA.

Closes gh-40895
2024-05-30 08:00:11 +01:00
Andy Wilkinson 10e23b8f35 Polish "Fix Flyway 10 in a GraalVM native image"
See gh-40821
2024-05-29 14:21:17 +01:00
Maziz 345edb1301 Fix Flyway 10 in a GraalVM native image
See gh-40821
2024-05-29 14:18:10 +01:00
erie0210 2e1ad6bdcc Add Kotlin example for @Testcontainers
See gh-40905
2024-05-29 14:28:11 +02:00
Khan, C M Abdullah ab2ba674b6 Fix various minor inconsistencies in the documentation
See gh-40900
2024-05-29 14:12:04 +02:00
vsanna 3ae1c111a0 Warn in the documentation that spring.profiles.group can only be used in non-profile-specific documents
See gh-40918
2024-05-29 14:02:14 +02:00
Andy Wilkinson 5ee0580339 Upgrade to the latest Framework 6.0.x release
Closes gh-40929
2024-05-28 16:52:00 +01:00
Andy Wilkinson d80cf05406 Remove unnecessary use of SingletonSupplier
As of Framework 6.1, it contains a field of a type that's
incompatible with Gradle's configuration cache.

Fixes gh-40911
2024-05-28 10:50:33 +01:00
Andy Wilkinson 477cdcae21 Upgrade to Spring Batch 5.1.2
Closes gh-40657
2024-05-22 19:14:48 +01:00
Andy Wilkinson 6ca3db067d Upgrade to Netty 4.1.110.Final
Closes gh-40878
2024-05-22 19:14:47 +01:00
Andy Wilkinson 0ffd7e6910 Upgrade to Byte Buddy 1.14.16
Closes gh-40877
2024-05-22 19:14:42 +01:00
Andy Wilkinson 35fb54a4d3 Polish deprecation notice 2024-05-22 17:02:29 +01:00
Scott Frederick 4e5cd2c2fd Fix default security options for bootBuildImage task
Fixes gh-39830
2024-05-22 07:56:15 -05:00
Chris Bono 7a7bcd07da Encode JSON string in Pulsar auth params
The values in the `spring.pulsar.client.authentication.param`
config props map are not currently JSON encoded. For simple
values this is fine. However, some custom auth modules may
require more complex parameter values that may contain special
characters that results in invalid JSON. This commmit encodes
the parameter values using a very simple hand-rolled escape
function.

See gh-40493
2024-05-22 13:49:05 +02:00
Andy Wilkinson d340f87c22 Disable test when Docker is not available
See gh-40585
2024-05-22 09:58:23 +01:00
Andy Wilkinson de75283f36 Upgrade to Spring Session 3.2.3
Closes gh-40663
2024-05-22 09:57:24 +01:00
Andy Wilkinson 7a60bbbba4 Upgrade to Spring Pulsar 1.0.6
Closes gh-40662
2024-05-22 09:57:23 +01:00
Andy Wilkinson 814f01551d Upgrade to Spring Integration 6.2.5
Closes gh-40660
2024-05-22 09:57:21 +01:00
Andy Wilkinson 468e246dbb Make sure container's started before connection details use it
Prior to this commit, a Testcontainer that was managed as a bean
would not have been started in time if it was accessed before
the bean factory's configuration had been frozen. A common way
for this to occur is when using JPA. The entity manager factory
bean is LoadTimeWeaverAware which causes it to be created before
configuration is frozen. Creating this bean requires the DataSource
which in turn requires the JdbcConnectionDetails and its JDBC URL.
Getting the JDBC URL From the connection details requires the
container hosting the SQL database to have been started.

This commit updates ContainerConnectionDetails, the super-class for
all Testcontainer-based ConnectionDetails implementations, to publish
an event when the Container is retrieved from the details. When this
event is published, TestcontainersLifecycleBeanPostProcessor
initializes all containers that are defined as beans.

Closes gh-40585
2024-05-22 09:15:21 +01:00
Andy Wilkinson 486ceecc9a Use the bean factory to get the type produced by a factory bean
Previously, we only looked at the OBJECT_TYPE_ATTRIBUTE on the
factory bean's definition. This did not work for situations
where the information's provided by the definition's target type
rather than the attribute.

Rather than manually considering the target type in addition to
the existing consideration of the attribute, we now ask the bean
factory for the type that will be produced by the factory bean
instead. This should insulate us from any changes and
enhancements in Framework in the future.

Fixes gh-40234
2024-05-21 15:27:59 +01:00
Andy Wilkinson a894879085 Use DefaultDbRefResolver whenever MongoDatabaseFactory is available
Fixes gh-39405
2024-05-21 10:29:39 +01:00
Andy Wilkinson 823cc90b46 Merge branch '3.1.x' into 3.2.x
Closes gh-40849
2024-05-21 10:28:59 +01:00
Andy Wilkinson f692fb1471 Ensure that Hazelcast binds to localhost for client tests
Closes gh-40848
2024-05-21 10:28:49 +01:00
Phillip Webb 39ab959af8 Merge branch '3.1.x' into 3.2.x
Closes gh-40845
2024-05-20 21:06:59 -07:00
Phillip Webb f743dc82fc Improve graceful shutdown documentation to remove ambiguity
Closes gh-40108
2024-05-20 21:06:22 -07:00
Phillip Webb 44619a9eef Merge branch '3.1.x' into 3.2.x
Closes gh-40843
2024-05-20 18:58:09 -07:00
Phillip Webb f5f02d6df1 Document that a private constructor opts-out of constructor binding
Closes gh-34820
2024-05-20 18:56:46 -07:00
Andy Wilkinson dda74cab94 Upgrade to Spring Kafka 3.1.5
Closes gh-40661
2024-05-20 20:33:14 +01:00
Andy Wilkinson 64ba92e29a Upgrade to Spring Kafka 3.0.17
Closes gh-40651
2024-05-20 20:31:25 +01:00
Andy Wilkinson 9d44468d44 Upgrade to Spring AMQP 3.1.5
Closes gh-40827
2024-05-20 18:00:50 +01:00
Andy Wilkinson 7c59dfb782 Upgrade to Spring AMQP 3.0.14
Closes gh-40824
2024-05-20 17:58:55 +01:00
Andy Wilkinson b718e5806f Merge branch '3.1.x' into 3.2.x
Closes gh-40838
2024-05-20 15:55:00 +01:00
Andy Wilkinson 1d91757061 Document that HttpMessageConverters can be used for reordering/removal
Closes gh-40767
2024-05-20 15:54:12 +01:00
Andy Wilkinson f440f2c3ac Merge branch '3.1.x' into 3.2.x
Closes gh-40834
2024-05-20 13:12:03 +01:00
Andy Wilkinson f5262d89df Add missing Testcontainers service connection tests
Closes gh-35039
2024-05-20 13:02:24 +01:00
Andy Wilkinson 75976713fe Polish "Fix typo in CertificateMatchingTestSource class"
See gh-40822
2024-05-20 10:14:45 +01:00
Piyal Ahmed 092e921433 Fix typo in CertificateMatchingTestSource class
See gh-40822
2024-05-20 10:13:39 +01:00
Andy Wilkinson 5b892b163f Start building against Spring AMQP 3.1.5 snapshots
See gh-40827
2024-05-20 09:58:09 +01:00
Andy Wilkinson b9fcd575ff Start building against Spring Integration 6.1.9 snapshots
See gh-40826
2024-05-20 09:56:59 +01:00
Andy Wilkinson 7ddbcac384 Start building against Spring AMQP 3.0.14 snapshots
See gh-40824
2024-05-20 09:56:48 +01:00
Scott Frederick 7f2b917851 Merge branch '3.1.x' into 3.2.x
Closes gh-40818
2024-05-17 11:41:23 -05:00
Scott Frederick 70aceb21eb Relocate test CNB builder and buildpack
The test CNB builder and buildpack used in integration tests have moved
from a projects.registry.vmware.com registry to ghcr.io/spring-io. This
commit modifies tests to use the new location.

Closes gh-40800
2024-05-17 10:59:41 -05:00
Andy Wilkinson bc854b14a1 Upgrade to Spring WS 4.0.11
Closes gh-40664
2024-05-17 12:27:02 +01:00
Andy Wilkinson 7a523b5f6e Upgrade to Spring Data Bom 2023.1.6
Closes gh-40658
2024-05-17 12:27:01 +01:00
Andy Wilkinson 04ebddc4ba Upgrade to Pulsar Reactive 0.5.5
Closes gh-40810
2024-05-17 12:27:00 +01:00
Andy Wilkinson a33fb25c4e Upgrade to Jetty Reactive HTTPClient 4.0.4
Closes gh-40809
2024-05-17 12:26:55 +01:00
Andy Wilkinson 7f5329fa4b Upgrade to Spring WS 4.0.11
Closes gh-40653
2024-05-17 12:24:21 +01:00
Andy Wilkinson 12a04c01d4 Upgrade to Spring Retry 2.0.6
Closes gh-40808
2024-05-17 12:24:20 +01:00
Andy Wilkinson 29a7bb2c7f Upgrade to Spring Data Bom 2023.0.12
Closes gh-40649
2024-05-17 12:24:16 +01:00
Andy Wilkinson f5d68e7b9f Upgrade to Jetty Reactive HTTPClient 3.0.13
Closes gh-40807
2024-05-17 12:24:15 +01:00
Scott Frederick d38c1e06b3 Ignore exceptions when deleting caches in bind cache tests
See gh-40760
2024-05-16 22:19:04 -05:00
Scott Frederick bdc6508b62 Catch any exception when deleting image building workspace
See gh-40760
2024-05-16 21:19:51 -05:00
Scott Frederick cd441130bd Warn when image building workspace directories cannot be deleted
When the `buildWorkspace` location in the
`spring-boot:build-image` Maven goal or `bootBuildImage` Gradle
task is configured to use a local bind source, the location
is passed to the CNB lifecycle without further processing by
Spring Boot. The lifecycle is in control of creating any files
in the specified location. Spring Boot tries to remove the
directories at the specified location after an image is
successfully created, but should not fail the image build
if the lifecycle has created files or directories with
permissions that keep them from being deleted successfully.

Fixes gh-40760
2024-05-16 17:37:44 -05:00
Andy Wilkinson 524424bc98 Merge branch '3.1.x' into 3.2.x
Closes gh-40795
2024-05-16 18:20:52 +01:00
Andy Wilkinson a1d5369a9c Limit configuration cache testing to the latest version of Gradle
Closes gh-40794
2024-05-16 18:20:13 +01:00
Andy Wilkinson 493efd6798 Merge branch '3.1.x' into 3.2.x
Closes gh-40792
2024-05-16 18:06:32 +01:00
Andy Wilkinson f35ecfbdca Reduce and update the versions of Maven that we test against
Closes gh-40791
2024-05-16 18:05:24 +01:00
Andy Wilkinson feaccef3a4 Temporarily disable tests for image building with bind caches
See gh-40760
2024-05-16 17:22:02 +01:00
Andy Wilkinson f24d4e4a06 Upgrade to Tomcat 10.1.24
Closes gh-40785
2024-05-16 15:05:48 +01:00
Andy Wilkinson bb8cf46a29 Upgrade to Spring Retry 2.0.6
Closes gh-40784
2024-05-16 15:05:15 +01:00
Andy Wilkinson 50c6df99b5 Upgrade to SAAJ Impl 3.0.4
Closes gh-40783
2024-05-16 15:05:09 +01:00
Andy Wilkinson 5dcd9799af Upgrade to Reactor Bom 2023.0.6
Closes gh-40656
2024-05-16 15:05:04 +01:00
Andy Wilkinson d2b067ea3d Upgrade to Jakarta XML WS 4.0.2
Closes gh-40782
2024-05-16 15:05:03 +01:00
Andy Wilkinson de17b6c3a1 Upgrade to Jakarta XML SOAP 3.0.2
Closes gh-40781
2024-05-16 15:04:58 +01:00
Andy Wilkinson edd45de17f Upgrade to Tomcat 10.1.24
Closes gh-40780
2024-05-16 14:18:50 +01:00
Andy Wilkinson 219fc8a159 Upgrade to SAAJ Impl 3.0.4
Closes gh-40779
2024-05-16 14:18:21 +01:00
Andy Wilkinson 347295c081 Upgrade to Reactor Bom 2022.0.19
Closes gh-40647
2024-05-16 14:18:17 +01:00
Andy Wilkinson d0cac7d736 Upgrade to Jetty 11.0.21
Closes gh-40778
2024-05-16 14:18:16 +01:00
Andy Wilkinson 237b288c78 Upgrade to Jakarta XML WS 4.0.2
Closes gh-40777
2024-05-16 14:18:11 +01:00
Andy Wilkinson 5469250968 Upgrade to Jakarta XML SOAP 3.0.2
Closes gh-40776
2024-05-16 14:18:07 +01:00
Andy Wilkinson 5db9f59094 Rework Jetty graceful shutdown to address race condition with 12.0.9
See gh-40724
2024-05-13 20:29:28 +01:00
Andy Wilkinson c0296c28bb Fully-qualify KafkaContainer to make it clear which one we support
Testcontainers now has org.testcontainers.containers.KafkaContainer
(that we support) and org.testcontainers.kafka.KafkaContainer (that
we don't yet support). This commit fully-qualifies the name so that
it's clear which KafkaContainer we're referring to.

Closes gh-40699
2024-05-13 17:13:37 +01:00
Andy Wilkinson 341035903a Upgrade to Undertow 2.3.13.Final
Closes gh-40735
2024-05-13 14:57:18 +01:00
Andy Wilkinson 6f096c0b5f Upgrade to Tomcat 10.1.23
Closes gh-40734
2024-05-13 14:57:18 +01:00
Andy Wilkinson f9d0a6dd04 Upgrade to Testcontainers 1.19.8
Closes gh-40733
2024-05-13 14:57:17 +01:00
Andy Wilkinson 29be3e1723 Upgrade to R2DBC Proxy 1.1.5.RELEASE
Closes gh-40732
2024-05-13 14:57:17 +01:00
Andy Wilkinson e1e29432e8 Upgrade to Pooled JMS 3.1.6
Closes gh-40731
2024-05-13 14:57:16 +01:00
Andy Wilkinson 4e1fd41b95 Upgrade to Micrometer Tracing 1.2.6
Closes gh-40730
2024-05-13 14:57:16 +01:00
Andy Wilkinson 9d018a27fa Upgrade to Micrometer 1.12.6
Closes gh-40655
2024-05-13 14:57:15 +01:00
Andy Wilkinson 1f0b5fba4d Upgrade to Maven Shade Plugin 3.5.3
Closes gh-40729
2024-05-13 14:57:15 +01:00
Andy Wilkinson 3a34a38f97 Upgrade to Maven Install Plugin 3.1.2
Closes gh-40728
2024-05-13 14:57:14 +01:00
Andy Wilkinson 4662009596 Upgrade to Maven Deploy Plugin 3.1.2
Closes gh-40727
2024-05-13 14:57:14 +01:00
Andy Wilkinson a21831bc03 Upgrade to jOOQ 3.18.15
Closes gh-40725
2024-05-13 14:57:13 +01:00
Andy Wilkinson e0f93448f6 Upgrade to Jetty 12.0.9
Closes gh-40724
2024-05-13 14:57:13 +01:00
Andy Wilkinson 96bdf1a8fc Upgrade to Infinispan 14.0.28.Final
Closes gh-40723
2024-05-13 13:33:05 +01:00
Andy Wilkinson 436ae02ee9 Upgrade to Hibernate 6.4.8.Final
Closes gh-40722
2024-05-13 13:33:00 +01:00
Andy Wilkinson 9130030ec8 Upgrade to Dependency Management Plugin 1.1.5
Closes gh-40721
2024-05-13 13:32:55 +01:00
Andy Wilkinson d7410acbe5 Upgrade to Byte Buddy 1.14.15
Closes gh-40720
2024-05-13 13:32:50 +01:00
Andy Wilkinson e14caf3d32 Upgrade to Undertow 2.3.13.Final
Closes gh-40719
2024-05-13 12:30:00 +01:00
Andy Wilkinson c35da125a4 Upgrade to Tomcat 10.1.23
Closes gh-40718
2024-05-13 12:29:59 +01:00
Andy Wilkinson f633d25626 Upgrade to R2DBC Proxy 1.1.5.RELEASE
Closes gh-40717
2024-05-13 12:28:03 +01:00
Andy Wilkinson 9a0a34082c Upgrade to Pooled JMS 3.1.6
Closes gh-40716
2024-05-13 12:27:58 +01:00
Andy Wilkinson 0b292ca0d1 Upgrade to Micrometer Tracing 1.1.13
Closes gh-40715
2024-05-13 12:27:53 +01:00
Andy Wilkinson 8064a962c2 Upgrade to Micrometer 1.11.12
Closes gh-40646
2024-05-13 12:27:48 +01:00
Andy Wilkinson 8ddfc4029a Upgrade to Maven Install Plugin 3.1.2
Closes gh-40714
2024-05-13 12:27:47 +01:00
Andy Wilkinson 6ee06de5bf Upgrade to Maven Deploy Plugin 3.1.2
Closes gh-40713
2024-05-13 12:27:42 +01:00
Andy Wilkinson cec0c93a7b Upgrade to jOOQ 3.18.15
Closes gh-40712
2024-05-13 12:27:37 +01:00
Andy Wilkinson e5944a7b11 Upgrade to Infinispan 14.0.28.Final
Closes gh-40711
2024-05-13 12:27:32 +01:00
Andy Wilkinson 98ea21d1f2 Upgrade to Hibernate 6.2.25.Final
Closes gh-40710
2024-05-13 12:27:27 +01:00
Andy Wilkinson 9e3cb34927 Upgrade to Dependency Management Plugin 1.1.5
Closes gh-40709
2024-05-13 12:27:22 +01:00
Andy Wilkinson af4e3984c7 Upgrade to Byte Buddy 1.14.15
Closes gh-40708
2024-05-13 12:27:17 +01:00
Moritz Halbritter 364af04377 Merge branch '3.1.x' into 3.2.x
Closes gh-40700
2024-05-13 11:30:42 +02:00
Yanming Zhou 0e450d602d Use CollectionUtils.isEmpty() and StringUtils.hasLength()
See gh-40645
2024-05-13 11:26:56 +02:00
Andy Wilkinson e55773d14e Merge branch '3.1.x' into 3.2.x
Closes gh-40690
2024-05-10 12:37:29 +01:00
Andy Wilkinson a67c8e4bbd Perform analysis even when property is not in the environment
Closes gh-33261
2024-05-10 12:36:59 +01:00
Andy Wilkinson 207ea098e9 Start building against Spring WS 4.0.11 snapshots
See gh-40664
2024-05-09 12:19:30 +01:00
Andy Wilkinson d0550d8441 Start building against Spring Session 3.2.3 snapshots
See gh-40663
2024-05-09 12:19:29 +01:00
Andy Wilkinson da1226822c Start building against Spring Pulsar 1.0.6 snapshots
See gh-40662
2024-05-09 12:19:29 +01:00
Andy Wilkinson ef503323d8 Start building against Spring Kafka 3.1.5 snapshots
See gh-40661
2024-05-09 12:19:28 +01:00
Andy Wilkinson 30ef19c422 Start building against Spring Integration 6.2.5 snapshots
See gh-40660
2024-05-09 12:19:28 +01:00
Andy Wilkinson 0a212dac4c Upgrade to Neo4j Java Driver 5.20.0
Closes gh-40665
2024-05-09 12:19:27 +01:00
Andy Wilkinson 5f6fb96931 Start building against Spring Data Bom 2023.1.6 snapshots
See gh-40658
2024-05-09 12:16:07 +01:00
Andy Wilkinson b6135c564c Start building against Spring Batch 5.1.2 snapshots
See gh-40657
2024-05-09 12:16:03 +01:00
Andy Wilkinson 077e29eb8c Start building against Reactor Bom 2023.0.6 snapshots
See gh-40656
2024-05-09 12:15:58 +01:00
Andy Wilkinson 36bf25da9c Start building against Micrometer 1.12.6 snapshots
See gh-40655
2024-05-09 12:15:52 +01:00
Andy Wilkinson dcae376a3b Start building against Spring WS 4.0.11 snapshots
See gh-40653
2024-05-09 11:25:49 +01:00
Andy Wilkinson b4dedd73c9 Start building against Spring Session 3.1.6 snapshots
See gh-40652
2024-05-09 11:25:49 +01:00
Andy Wilkinson a9df5b3d05 Start building against Spring Kafka 3.0.17 snapshots
See gh-40651
2024-05-09 11:25:48 +01:00
Andy Wilkinson 23f136d606 Upgrade to Neo4j Java Driver 5.20.0
Closes gh-40654
2024-05-09 11:25:47 +01:00
Andy Wilkinson d3116124b9 Start building against Spring Data Bom 2023.0.12 snapshots
See gh-40649
2024-05-09 11:21:44 +01:00
Andy Wilkinson 02e390f05d Start building against Spring Batch 5.0.6 snapshots
See gh-40648
2024-05-09 11:21:39 +01:00
Andy Wilkinson a7ac7bda4b Start building against Reactor Bom 2022.0.19 snapshots
See gh-40647
2024-05-09 11:21:35 +01:00
Andy Wilkinson 7a6a58174e Start building against Micrometer 1.11.12 snapshots
See gh-40646
2024-05-09 11:21:30 +01:00
Phillip Webb 24bfe5087f Fix checkstyle violation
See gh-40549
2024-05-08 18:28:09 -07:00
Phillip Webb 8457fc333f Adapt Windows path handling fix to deal with Jetty
Update `NestedLocation` to deal with the fact that Jetty attempts
to fix URLs.

See gh-40549
2024-05-08 18:04:17 -07:00
Phillip Webb 7708ec7592 Fix Windows path handling for nested jars
Update `Path` creation for nested locations to allow both UNC and classic
file references to be used. This commit attempts to align our URL
handling with that of standard file URLs. The `NestedLocation` class
no longer attempts to remove leading all `\` characters and instead
only removes the first `\` when the second char is `:`. This duplicates
the logic found in Java's own internal `WindowsUriSupport` class which
is used when calling `Path.of(url)` with a `file:` URL.

Fixes gh-40549
2024-05-08 15:44:03 -07:00
Moritz Halbritter 92f7414fad Favor Duration accepting timeout method over int method
Closes gh-40635
2024-05-08 14:01:09 +02:00
Moritz Halbritter c47cdda824 Merge branch '3.1.x' into 3.2.x
Closes gh-40624
2024-05-06 09:51:39 +02:00
Moritz Halbritter d18fb9ce65 Upgrade to bcprov-jdk18on 1.78.1
Closes gh-40621
2024-05-06 09:49:32 +02:00
Phillip Webb 8a72e55106 Fix UriPathEncoder bug to improve performance
Fix `isAllowed` check and write test to ensure that additional object
instances are not created unnecessarily.

See gh-40615
2024-05-03 12:29:41 -07:00
Phillip Webb d0ce4daec1 Use URI encoded values when creating NestedPath URIs
Update `NestedPath.toUri()` so that the URI is constructed using encoded
strings.

Fixes gh-40615
2024-05-02 15:53:01 -07:00
Moritz Halbritter 75dac1435f Merge branch '3.1.x' into 3.2.x 2024-05-02 14:48:04 +02:00
Moritz Halbritter 68a63a7797 Polish 2024-05-02 14:47:53 +02:00
Moritz Halbritter 516d3b1294 Test ANSI disabled in logging tests instead of integration tests
See gh-40172
2024-05-02 13:59:48 +02:00
Moritz Halbritter 2183b47e62 Merge branch '3.1.x' into 3.2.x
Closes gh-40612
2024-05-02 11:53:21 +02:00
Moritz Halbritter 1534bc8ad2 Polish "Avoid using OkHttp3ClientHttpRequestFactory in test"
See gh-40611
2024-05-02 11:45:23 +02:00
Stéphane Nicoll 20042576e9 Avoid using OkHttp3ClientHttpRequestFactory in test
See gh-40611
2024-05-02 11:45:20 +02:00
Andy Wilkinson c7ec6080ce Publish a runtime variant that supports Java 22
In order to support Java 22, we must use spring-core 6.1.x.
spring-core 6.1.x is a multi-release jar so, in order to support Java
22, a version of Gradle that supports multi-release jars must be
used.

This commit adds a new variant to spring-boot-gradle-plugin for
modern versions of Gradle. When Gradle's plugin API version is 8.7 or
later, we use spring-core 6.1.x. spring-core 6.0.x is used at all
other times.

Closes gh-40074
2024-05-02 10:45:18 +01:00
Moritz Halbritter 713f4f2292 Polish "Fix broken AnsiOutput.detectIfAnsiCapable on JDK22"
See gh-40172
2024-05-02 11:27:55 +02:00
facewise 1f9b62b122 Fix broken AnsiOutput.detectIfAnsiCapable on JDK22
See gh-40172
2024-05-02 11:03:06 +02:00
Moritz Halbritter 46ab60cc43 Merge branch '3.1.x' into 3.2.x
Closes gh-40607
2024-05-02 10:59:43 +02:00
Dave Syer 421b8e23c4 Clarify devtools restart class loader documentation
See gh-40604
2024-05-02 10:58:30 +02:00
Moritz Halbritter 888ae040e4 Merge branch '3.1.x' into 3.2.x
Closes gh-40605
2024-05-02 10:51:10 +02:00
Moritz Halbritter 64b302032c Polish "Change Spring Boot CLI init command docs default build system to gradle"
See gh-40603
2024-05-02 10:49:51 +02:00
coursar 1a786fc788 Change Spring Boot CLI init command docs default build system to gradle
See gh-40603
2024-05-02 10:44:33 +02:00
Phillip Webb 93728cdfb1 Merge branch '3.1.x' into 3.2.x
Closes gh-40600
2024-05-01 22:55:30 -07:00
Johnny Lim f0fcc92b49 Remove reassignments for builders in GraphQL auto-configurations
See gh-40590
2024-05-01 22:51:19 -07:00
yokotaso 5b4bd61720 Fix possible NullPointerException from getPermission()
Fix regression in `JarUrlConnection` where a NullPointerException could
be thrown internally causing performance issues.

When the SecurityManager is present, the following stack trace is
thrown:

java.lang.NullPointerException: Cannot invoke "java.net.URLConnection.getPermission()" because "this.jarFileConnection" is null
        at org.springframework.boot.loader.net.protocol.jar.JarUrlConnection.getPermission(JarUrlConnection.java:175)
        at java.base/jdk.internal.loader.URLClassPath.check(URLClassPath.java:553)
        at java.base/jdk.internal.loader.URLClassPath$Loader.findResource(URLClassPath.java:612)
        at java.base/jdk.internal.loader.URLClassPath.findResource(URLClassPath.java:296)
        at java.base/java.net.URLClassLoader$2.run(URLClassLoader.java:629)
        at java.base/java.net.URLClassLoader$2.run(URLClassLoader.java:627)
        at java.base/java.security.AccessController.doPrivileged(AccessController.java:399)
        at java.base/java.net.URLClassLoader.findResource(URLClassLoader.java:626)
        at org.springframework.boot.loader.net.protocol.jar.JarUrlClassLoader.findResource(JarUrlClassLoader.java:70)
        at java.base/java.lang.ClassLoader.getResource(ClassLoader.java:1403)
        at java.base/java.net.URLClassLoader.getResourceAsStream(URLClassLoader.java:290)
        at java.base/java.lang.Class.getResourceAsStream(Class.java:2850)

See gh-39856
2024-05-01 22:42:52 -07:00
Moritz Halbritter a6dd8b71bd Add exception and failure analyzer for missing AOT initializer
The diagnostics text include the name of the AOT initializer class and
the main class name. It also tells the user how to switch of the AOT
mode.

Closes gh-38645
2024-04-30 15:11:32 +02:00
Scott Frederick 21a0bc7fee Merge branch '3.1.x' into 3.2.x
Closes gh-40576
2024-04-29 16:42:53 -05:00
Johnny Lim e2973a90a8 Use ConcurrentHashMap.newKeySet where feasible
See gh-40567
2024-04-29 15:41:37 -05:00
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