Commit Graph

273 Commits

Author SHA1 Message Date
Stéphane Nicoll 9d205e21c4 Merge branch '3.4.x' into 3.5.x
Closes gh-46930
2025-08-21 07:34:22 +02:00
Stéphane Nicoll 8b71458025 Adapt checkstyle rules for 3.4.x
See gh-46927
2025-08-21 07:31:40 +02:00
Johnny Lim fb99badf16 Remove redundant suppressions from Checkstyle configuration
See gh-46927

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-08-21 07:31:23 +02:00
Andy Wilkinson 21d4c9b69b Merge branch '3.4.x' into 3.5.x
Closes gh-46921
2025-08-20 08:44:34 +01:00
Andy Wilkinson 25c29b52b8 Remove redundant suppressions
See gh-46914
2025-08-20 08:44:13 +01:00
Nicolas Garea 4c76392255 Remove duplicate suppression in Checkstyle configuration
See gh-46914

Signed-off-by: Nicolas Garea <nicogareacidre@gmail.com>
2025-08-20 08:44:04 +01:00
Stéphane Nicoll f3aa428b68 Merge branch '3.4.x' into 3.5.x
Closes gh-46612
2025-07-31 08:19:18 +02:00
Dmytro Nosan 6df1b88c7a Update checkstyle configuration to use a checkstyle-header.txt file
See gh-46604

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-07-31 08:18:24 +02:00
Stéphane Nicoll 3a7496eeff Merge branch '3.4.x' into 3.5.x
Closes gh-46561
2025-07-28 12:53:21 +02:00
Stéphane Nicoll 079bf986f2 Polish "Do not set primitive default value for unsupported expressions"
See gh-46551
2025-07-28 12:49:34 +02:00
Stéphane Nicoll 5ad1c78929 Merge branch '3.4.x' into 3.5.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
Run CodeQL Analysis / run-analysis (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Has been cancelled Details
Build and Deploy Snapshot / Trigger Docs Build (push) Has been cancelled Details
Build and Deploy Snapshot / Verify (push) Has been cancelled Details
Closes gh-46543
2025-07-25 16:30:05 +02:00
Johnny Lim 62f379cbbb Add SpringHeaderCheck to enforce using "2012-present"
This commit also fixes copyright headers that don't follow it.

See gh-46527

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-07-25 16:27:36 +02:00
Phillip Webb b0350a52c2 Add additional ECS fields using nested structure
Update ECS structured logging so that additional fields are written
using a nested structure. A new `Builder` interface has been added to
`StructuredLoggingJsonMembersCustomizer` which can be injected into
formatters and allows `nested` settings to be specified.

Fixes gh-46351
2025-07-22 10:52:27 +01:00
Phillip Webb d3c55740e1 Merge branch '3.4.x' into 3.5.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Has been cancelled Details
Build and Deploy Snapshot / Trigger Docs Build (push) Has been cancelled Details
Build and Deploy Snapshot / Verify (push) Has been cancelled Details
Closes gh-46066
2025-06-20 17:23:52 -07:00
Phillip Webb ab41199880 Update copyright year for checkstyle and eclipse
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Has been cancelled Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Has been cancelled Details
Build and Deploy Snapshot / Trigger Docs Build (push) Has been cancelled Details
Build and Deploy Snapshot / Verify (push) Has been cancelled Details
Closes gh-46065
2025-06-20 17:23:16 -07:00
Stéphane Nicoll 83e3b04c59 Merge branch '3.4.x'
Closes gh-45989
2025-06-17 14:21:06 +02:00
Stéphane Nicoll 5e65e929b7 Merge branch '3.3.x' into 3.4.x
Closes gh-45988
2025-06-17 14:20:59 +02:00
Nicolas Garea 120aab0693 Remove double comma in Checkstyle configuration
See gh-45975

Signed-off-by: Nicolas Garea <nicogareacidre@gmail.com>
2025-06-17 14:19:22 +02:00
Andy Wilkinson 5141620615 Merge branch '3.4.x'
Closes gh-45913
2025-06-12 10:07:30 +01:00
Andy Wilkinson ec3eeb7185 Merge branch '3.3.x' into 3.4.x
Closes gh-45912
2025-06-12 10:06:22 +01:00
Andy Wilkinson ca21600fae Use Framework's StreamUtils instead of Commons Compress's IOUtils
Closes gh-45911
2025-06-12 10:00:30 +01:00
Stéphane Nicoll db9504a2d6 Merge branch '3.4.x'
Closes gh-45738
2025-06-02 16:24:56 +02:00
Stéphane Nicoll 1bf356f056 Merge branch '3.3.x' into 3.4.x
Closes gh-45737
2025-06-02 16:24:13 +02:00
Stéphane Nicoll 43e040e5b4 Fix order of illegal classes
See gh-45635
2025-06-02 16:23:39 +02:00
Yanming Zhou 9ccd1f0726 Prevent that only org.springframework.core.ResolvableType is used
See gh-45635

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-06-02 16:19:03 +02:00
Andy Wilkinson a9cc83dc8f Merge branch '3.4.x'
Closes gh-45646
2025-05-23 09:32:09 +01:00
Andy Wilkinson 492a4abd70 Merge branch '3.3.x' into 3.4.x
Closes gh-45645
2025-05-23 09:29:23 +01:00
Andy Wilkinson 7628ae8503 Check Kotlin code using Detekt
Closes gh-45583
2025-05-23 09:22:08 +01:00
Phillip Webb abe89eeb37 Merge branch '3.4.x'
Closes gh-45367
2025-05-05 22:10:24 -07:00
Phillip Webb 19ae4fbba7 Merge branch '3.3.x' into 3.4.x
Closes gh-45366
2025-05-05 22:10:17 -07:00
Vanio Begic 4a98b1787f Document methods of starting Testcontainer containers
Update the reference documentation to provide more details about the
three supported methods of starting Testcontainer containers.

See gh-44187

Signed-off-by: Vanio Begic <vanio.begic123@gmail.com>
2025-05-05 22:08:06 -07:00
Andy Wilkinson 5e8812abb1 Merge branch '3.4.x'
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-44969
2025-04-01 10:33:23 +01:00
Andy Wilkinson b1fb36bf4b Merge branch '3.3.x' into 3.4.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-44968
2025-04-01 10:31:59 +01:00
Andy Wilkinson a8381e7cbd Ensure that only spring-core's ReflectionUtils is used
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:22], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:22], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details
Closes gh-44837
2025-04-01 10:30:58 +01:00
Phillip Webb 189d84d49d Add ConfigurationPropertyCaching override support
Add `ConfigurationPropertyCaching.override()` method which can be
used to temporarily enable caching for the duration of an
operation.

The `Binder` now uses this method to ensure that caching is
enabled whilst a set of related binding operations are performed.

Closes gh-44860
2025-03-24 13:44:35 -07:00
Andy Wilkinson 19c386040b Merge branch '3.4.x'
Closes gh-44698
2025-03-12 15:49:41 +00:00
Andy Wilkinson 59ddba1063 Merge branch '3.3.x' into 3.4.x
Closes gh-44697
2025-03-12 15:48:36 +00:00
Andy Wilkinson 9b15b4bce9 Consolidate mock web server factories
Closes gh-44674
2025-03-12 15:26:47 +00:00
Phillip Webb 7433b93769 Add stack trace printer support for structured logging
Introduce a new `StackTracePrinter` interface (and a standard
implementation) that can be used to print stack traces in a custom
form. The existing `StructuredLoggingJsonProperties` have been updated
with a nested `StackTrace` record that supports common customization
options or allows a custom `StackTracePrinter` to be used.

Closes gh-43864
2025-02-10 22:34:28 -08:00
Moritz Halbritter cce509c7df Add configuration property to specify jOOQ settings file
The property is named 'spring.jooq.config' and is of type Resource,
so that it supports classpath: and all the other common prefixes.

The config is loaded through JAXB. If JAXB is not on the classpath,
an exception is thrown. Also adds a failure analyzer for this exception.

Closes gh-38778
2025-01-27 14:21:12 +01:00
Stéphane Nicoll b7979cf443 Use AbstractAotProcessor.AOT_PROCESSING instead of duplicate constant
Closes gh-42461
2024-10-18 10:12:01 +02:00
Andy Wilkinson ef09753fcb Merge branch '3.2.x' into 3.3.x
See gh-41857
2024-08-15 10:26:29 +01:00
Andy Wilkinson 80115abe81 Remove suppressions that are no longer needed
See gh-41853
2024-08-15 10:25:14 +01:00
Andy Wilkinson b0d4f1d356 Merge branch '3.2.x' into 3.3.x
Closes gh-41257
2024-06-27 10:16:36 +01:00
Andy Wilkinson 654016af7f Move Docker-related test support into a separate module
See gh-41228
2024-06-26 19:47:35 +01:00
Andy Wilkinson d78c7b541a Introduce docker-test plugin for running tests that require Docker
See gh-41228
2024-06-26 19:45:21 +01:00
Phillip Webb f2c778a5a0 Merge branch '3.2.x'
Closes gh-41168
2024-06-19 22:44:12 -07:00
Andy Wilkinson 43cd24102f Rework Docker Compose integration tests
This commit introduces a new annotation, `@DockerComposeTest`,
that allows a test class to have multiple tests, each of which
uses a different Docker Compose YAML file.

Closes gh-41154
2024-06-19 22:34:38 -07:00
Andy Wilkinson 2d979bf06e Merge branch '3.2.x'
Closes gh-40863
2024-05-22 09:16:57 +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