root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity
55,715 Commits 23 Branches 353 Tags 301 MiB
Commit Graph

266 Commits

Author SHA1 Message Date
Moritz Halbritter 6567609cbc 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
2025-03-19 09:49:43 +01:00
Moritz Halbritter 80b6c59669 Improve debuggability of DockerComposeTestExtension
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
2025-03-19 09:42:22 +01:00
Moritz Halbritter 6b9cd873ca Use gvenzl/oracle-free:23.6-slim which has ARM64 support 
See gh-35249
 2025-03-19 09:22:58 +01:00
Andy Wilkinson 3a6e4e9e58 Add checks for factories files 
META-INF/spring.factories and META-INF/spring/aot.factories in the
main source set are now checked. The checks verify that:

- Each class listed in the values exists in the source set's output
- The classes are listed alphabetically
- Nested classes are identified using their binary name

Closes gh-44676
 2025-03-12 12:44:18 +00:00
Eddú Meléndez 5fac1011d6 Add ServiceConnection support for lldap/lldap (Compose) 
See gh-44389

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>
 2025-02-28 13:54:55 +01:00
Moritz Halbritter 7cf9cc74a2 Add SSL service connection support for Redis 
See gh-41137
 2025-02-17 13:23:16 +01:00
Moritz Halbritter b773dcd356 Add ability to copy additional files when running Docker Compose tests 
See gh-41137
 2025-02-17 13:23:16 +01:00
Moritz Halbritter b62a0c1ae0 Add SSL support to Docker Compose and Testcontainers infrastructure 
See gh-41137

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
 2025-02-17 13:23:15 +01:00
Andy Wilkinson 1e43b0003f Merge branch '3.4.x' 
Closes gh-43951
 2025-01-24 08:54:50 +00:00
Andy Wilkinson c7b54dcbb3 Merge branch '3.3.x' into 3.4.x 
Closes gh-43950
 2025-01-24 08:53:03 +00:00
Johnny Lim 6c8d41935f Polish 
See gh-43879

Signed-off-by: Johnny Lim <izeye@naver.com>
 2025-01-24 08:45:41 +00:00
Andy Wilkinson b601282b57 Polish "Add support for empty password in bitnami/postgresql" 
See gh-43771
 2025-01-15 11:32:27 +00:00
He Zean 2f178188d1 Add support for empty password in bitnami/postgresql 
See gh-43771

Signed-off-by: He Zean <realhezean@gmail.com>
 2025-01-15 11:32:09 +00:00
Andy Wilkinson 21161bc42e Merge branch '3.4.x' 
Closes gh-43831
 2025-01-15 11:18:17 +00:00
He Zean ab8d2ebc8a Make handling of ALLOW_EMPTY_PASSWORD consistent 
See gh-43790

Signed-off-by: He Zean <realhezean@gmail.com>
 2025-01-15 10:57:42 +00:00
Andy Wilkinson 579be1cea8 Merge branch '3.4.x' 
Closes gh-43824
 2025-01-14 20:14:23 +00:00
Andy Wilkinson 1a99ade66c Merge branch '3.3.x' into 3.4.x 
Closes gh-43823
 2025-01-14 20:13:57 +00:00
Andy Wilkinson d4f497d90d Polish "Fix handling of env vars in Bitnami's Postgres image" 
See gh-43783
 2025-01-14 19:53:30 +00:00
He Zean c8f2fb0d94 Fix handling of env vars in Bitnami's Postgres image 
See gh-43783

Signed-off-by: He Zean <realhezean@gmail.com>
 2025-01-14 17:49:59 +00:00
Phillip Webb a49719d73e Use consistent exception messages in Assert calls 
Update `Assert` calls to consistently use messages of the form
"'item' must [not] ...".

Closes gh-43780
 2025-01-11 21:18:47 -08:00
Phillip Webb f08188d5cf Change relevant Assert calls to throw IllegalStateException 
Change certain Assert class from `assert...` to `assertState`
so that a more appropriate `IllegalStateException` is thrown.

Fixes gh-43779
 2025-01-11 21:16:36 -08:00
Phillip Webb b48ce96746 Update copyright year of changed files 2025-01-08 15:46:10 -08:00
Phillip Webb af2d176588 Merge branch '3.4.x' 2025-01-08 15:45:59 -08:00
Phillip Webb d44f4b56d3 Merge branch '3.3.x' into 3.4.x 2025-01-08 15:45:54 -08:00
Phillip Webb c2d8218f6d Update copyright year of changed files 2025-01-08 15:45:34 -08:00
Phillip Webb 879d664bd5 Merge branch '3.4.x' 
Closes gh-43718
 2025-01-07 19:23:01 -08:00
Phillip Webb d998720f75 Merge branch '3.3.x' into 3.4.x 
Closes gh-43717
 2025-01-07 19:22:22 -08:00
Phillip Webb 962514601f Restore support for docker compose versions earlier than 2.24 
Fixes gh-43710
 2025-01-07 19:13:58 -08:00
Stéphane Nicoll 5b5ba2e65b Polish "Configure Postgres' application_name from the environment" 
This commit configure the 'application_name' property of the Postgres
container from the standard 'spring.application.name'.

See gh-42460
 2025-01-07 16:32:31 +01:00
Dmytro Nosan ce0bcf3493 Configure Postgres' application_name from the environment 
This commit configure the 'application_name' property of the Postgres
container from the standard 'spring.application.name'.

See gh-42460
 2025-01-07 16:32:31 +01:00
Stéphane Nicoll f65336ca56 Fix compilation failure on merge 2024-12-10 16:28:34 +01:00
Moritz Halbritter ce9878a7d0 Merge branch '3.3.x' 
Closes gh-43472
 2024-12-10 15:43:46 +01:00
Moritz Halbritter e2cf9e105c Respect profiles when listing running Docker Compose containers 
Closes gh-40139
 2024-12-10 14:24:44 +01:00
Johnny Lim 859c235a95 Polish 
See gh-43316
 2024-11-29 10:35:11 +01:00
Stéphane Nicoll 27e8f14c31 Polish "Add container support for ClickHouse" 
See gh-42837
 2024-10-23 18:15:43 +02:00
Phillip Webb 2f5f224559 Merge branch '3.3.x' 2024-10-18 10:49:15 -07:00
Phillip Webb 223886ff37 Merge branch '3.2.x' into 3.3.x 2024-10-18 10:48:51 -07:00
Phillip Webb 3481107ff7 Update copyright year of changed files 2024-10-18 10:48:29 -07:00
Stéphane Nicoll b7979cf443 Use AbstractAotProcessor.AOT_PROCESSING instead of duplicate constant 
Closes gh-42461
 2024-10-18 10:12:01 +02:00
Moritz Halbritter c018c43886 Merge branch '3.3.x' 
Closes gh-42736
 2024-10-17 13:44:25 +02:00
Moritz Halbritter 8efe6e02d9 Merge branch '3.2.x' into 3.3.x 
Closes gh-42735
 2024-10-17 13:38:03 +02:00
Moritz Halbritter a3060652f8 Call String.toLowerCase and .toUppercase with explicit locale 
Closes gh-42719
 2024-10-17 13:20:39 +02:00
Stéphane Nicoll f3d86b65a1 Merge branch '3.3.x' 
Closes gh-42686
 2024-10-15 09:32:39 +02:00
Stéphane Nicoll e291e120f7 Merge branch '3.2.x' into 3.3.x 
Closes gh-42685
 2024-10-15 09:32:33 +02:00
Stéphane Nicoll d98ed306d2 Polish "Fix links to CNCF resources in Javadoc" 
See gh-42645
 2024-10-15 09:28:02 +02:00
Dmytro Nosan 43a1145e75 Fix links to CNCF resources in Javadoc 
See gh-42645
 2024-10-15 09:26:27 +02:00
Moritz Halbritter dd9a998cfe Polish "Add property to specify Docker Compose flags" 
See gh-42571
 2024-10-10 08:56:02 +02:00
Dmytro Nosan 2bee29c2fd Add property to specify Docker Compose flags 
See gh-42571
 2024-10-10 08:56:02 +02:00
Moritz Halbritter e6165b0311 Add transport and connect timeout properties for OTLP logging 
Closes gh-42528
Closes gh-42527
 2024-10-08 16:01:09 +02:00
Moritz Halbritter 40bb81419d Rename OtlpAutoConfiguration to OtlpTracingAutoConfiguration 
Closes gh-42529
 2024-10-08 15:56:18 +02:00
Moritz Halbritter 33def6d6b4 Polish "Add service connection support for Hazelcast" 
See gh-42416
 2024-09-26 16:45:26 +02:00
Dmytro Nosan cee7439dbe Add service connection support for Hazelcast 
See gh-42416
 2024-09-26 14:34:12 +02:00
Phillip Webb 7b3077280c Merge branch '3.3.x' 
Closes gh-42441
 2024-09-24 14:32:48 -07:00
Phillip Webb 100bedc07d Merge branch '3.2.x' into 3.3.x 
Closes gh-42440
 2024-09-24 14:29:09 -07:00
Phillip Webb ad72411e2b Apply conventions plugin to all subprojects 
Closes gh-42438
 2024-09-24 14:26:32 -07:00
Moritz Halbritter ee322d69f1 Merge branch '3.3.x' 
Closes gh-42394
 2024-09-20 10:25:54 +02:00
Yanming Zhou 7c8a6740c1 Remove redundant @Test annotation 
See gh-42393
 2024-09-20 10:22:47 +02:00
Phillip Webb 8628f7334f Ensure `@AutoConfigureTestDatabase` does not replace test databases 
Update `@AutoConfigureTestDatabase` support so that by default test
databases are not replaced.

Fixes gh-35253
 2024-09-11 21:01:54 -07:00
Eddú Meléndez 793e9a8795 Add OpenTelemetry Logging Service Connection from LgtmStackContainer and Docker Compose 
See gh-42174
 2024-09-09 08:37:39 +02:00
Moritz Halbritter 861e5209ef Add transport selection to OtlpLoggingConnectionDetails 
Closes gh-42171
 2024-09-06 14:26:03 +02:00
Moritz Halbritter bac330354b Polish "Support Otlp Tracing's GRPC port from service connections" 
See gh-41333
 2024-09-06 13:18:26 +02:00
Eddú Meléndez 7baa553760 Support Otlp Tracing's GRPC port from service connections 
Otlp Tracing's exporter is configured using Transport. Current support
for service connections read the mapped port for HTTP transport 4318.
This commits adds support to read port for GRPC transport 4317.

See gh-41333
 2024-09-06 13:18:26 +02:00
Moritz Halbritter 8fc1bca56c Polish "Add service connection from Opentelemetry Collector for Logging" 
See gh-41324
 2024-09-06 10:20:41 +02:00
Eddú Meléndez 7adf843bfd Add service connection from Opentelemetry Collector for Logging 
Adds ConnectionDetails from Docker Compose and Testcontainers.

See gh-41324
 2024-09-06 10:10:17 +02:00
Scott Frederick e7faca3bbb Add support for Testcontainer Redis 
Add support for the official `com.redis:testcontainers-redis` container.

See gh-41450
 2024-08-29 19:23:40 -07:00
Phillip Webb 450e31b42e Merge branch '3.3.x' 2024-08-19 16:47:31 -07:00
Moritz Halbritter 6031d04837 Fix property description of spring.docker.compose.file 
Also fixes the casing of 'Docker Compose' so that it's now spelled
consistently.
 2024-08-12 13:52:53 +02:00
Moritz Halbritter 0261784443 Fix DockerComposeFileTests on Windows 2024-08-06 09:37:53 +02:00
Moritz Halbritter 4eebb8e629 Support multiple Docker Compose files 
Closes gh-41691
 2024-08-05 12:26:37 +02:00
Stéphane Nicoll 788417df7f Remove duplicate metadata for Enum default values 
See gh-7562
 2024-08-01 15:43:22 +02:00
Stéphane Nicoll dabc83338b Polish "Add support for Grafana LGTM stack" 
See gh-41551
 2024-07-29 10:43:56 +02:00
Eddú Meléndez 9eff627eb2 Add support for Grafana LGTM stack 
See gh-41551
 2024-07-29 10:33:08 +02:00
Phillip Webb 88480664d7 Polish 2024-07-22 19:59:27 +01:00
Andy Wilkinson 46ec3e3a07 Polish "Support service connections for redis-stack and redis-stack-server" 
See gh-41327
 2024-07-17 11:08:52 +01:00
Eddú Meléndez 2634d0c6b1 Support service connections for redis-stack and redis-stack-server 
See gh-41327
 2024-07-17 10:54:06 +01:00
Andy Wilkinson 3b13490689 Polish "Add support for Postgres trust host auth method with Docker Compose" 
See gh-41511
 2024-07-16 19:16:59 +01:00
sid af89924582 Add support for Postgres trust host auth method with Docker Compose 
See gh-41511
 2024-07-16 19:16:23 +01:00
Andy Wilkinson 2ce36f9141 Merge branch '3.3.x' 
Closes gh-41261
 2024-06-27 14:35:23 +01:00
Andy Wilkinson abb3ff0377 Combine tests for standard and Bitnami images into single classes 
Closes gh-41259
 2024-06-27 14:34:55 +01:00
Andy Wilkinson 7e01e78b7f Merge branch '3.3.x' 2024-06-27 13:58:14 +01:00
Andy Wilkinson 7b65176180 Move Redis Bitname compose file into correct directory 
See gh-41257
 2024-06-27 13:57:40 +01:00
Andy Wilkinson b28ed2f8fb Merge branch '3.3.x' 2024-06-27 10:59:18 +01:00
Andy Wilkinson adad8a3515 More LDAP compose file into correct source set 
See gh-41257
 2024-06-27 10:59:03 +01:00
Andy Wilkinson 5b7365b63b Merge branch '3.3.x' 
Closes gh-41258
 2024-06-27 10:25:32 +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 6fbf08fa9a Update spring-boot-docker-compose to use docker-test plugin 
See gh-41228
 2024-06-26 19:46:03 +01:00
Moritz Halbritter 6c0c9b9a80 Add properties to specify arguments to Docker Compose commands 
These new properties take a List<String>:

- spring.docker.compose.start.arguments
- spring.docker.compose.stop.arguments

Closes gh-38763
 2024-06-21 08:54:14 +02:00
Moritz Halbritter 8e405c0224 Merge branch '3.2.x' 
Closes gh-41172
 2024-06-20 08:48:11 +02:00
Moritz Halbritter c2f21e9fcd Don't execute @DockerComposeTests if docker is not running 
Closes gh-41171
 2024-06-20 08:47:56 +02:00
Phillip Webb 9ab086d2b4 Merge branch '3.2.x' 
Closes gh-41169
 2024-06-19 22:53:38 -07:00
Andy Wilkinson 126e87e44d Fix appending of JDBC parameters to SQL Server JDBC URL 
Fixes gh-41146
 2024-06-19 22:51:40 -07: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
Phillip Webb 905d6b96d0 Merge branch '3.2.x' 
Closes gh-41166
 2024-06-19 22:30:58 -07:00
Andy Wilkinson 491f34d25c Improve container test code 
Replace `DockerImageNames` with a enum and relocate it from the
`testcontainers` to `container` package. The enum now also
becomes a common location that we can use to apply container
configuration such as timeouts.

Closes gh-41164

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
 2024-06-19 20:10:03 -07:00
Scott Frederick 7d96789869 Fix Bitnami MongoDB environment variables for Docker Compose 
Fixes gh-41097
 2024-06-13 15:20:36 -05:00
Phillip Webb 147240aa0c Merge branch '3.2.x' 
Closes gh-41080
 2024-06-11 13:32:30 -07:00
Phillip Webb bcbcafaab2 Polish "Use method references when possible in test code" 
See gh-40974
 2024-06-11 12:58:04 -07:00
Ahmed Ashour 207327d97c Use method references when possible in test code 
See gh-40974
 2024-06-11 12:58:00 -07:00