fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,796 Commits 22 Branches 339 Tags
Commit Graph

169 Commits

Author SHA1 Message Date
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
Andy Wilkinson
d380ada4b2 Merge branch '3.3.x' 
Closes gh-42387
 2024-09-19 19:06:23 +01:00
Andy Wilkinson
70d2907351 Merge branch '3.2.x' into 3.3.x 
Closes gh-42386
 2024-09-19 19:06:12 +01:00
Andy Wilkinson
319e33f786 Make a single scrape attempt, protected by Awaitility 
Using a single scrape attempt that is protected by Awaitility should
protect against instability of the OpenTelemetry Collector instance
running in the container and will hopefully stabilize the test.

This commit has also increased the timeout for a successful response
to 30 seconds and removed the configuration of the configuration of
the polling delay and interval as the values being set were the same
as the defaults.

Closes gh-42377
 2024-09-19 19:06:05 +01:00
Johnny Lim
a0d1c10d8a Polish 
See gh-42340
 2024-09-18 11:19:59 +02:00
Andy Wilkinson
2bfd784d7b Revert "Prevent duplicate DynamicPropertyRegistry beans" 
This partially reverts commit 4d4b189cce3af9328861038b7dae954744e4cef2.
The changes to main code are no longer needed as Framework's test
context framework no longer defines a DynamicPropertyRegistry bean. The
changes to test code have been kept to verify that @SpringBootTest and
TestcontainersPropertySourceAutoConfiguration continue to work in
combination.

Closes gh-42275
 2024-09-12 08:20:27 +01: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
Andy Wilkinson
f7ba5f1bbc Polish support for Testcontainers Redis 
- Add support for RedisStackContainer
- Update the docs

Closes gh-41450
 2024-09-05 14:25:51 +01:00
Phillip Webb
fa686bb593 Support Testcontainer Redis with custom image names 
Update `RedisContainerConnectionDetailsFactory` so that it can also
support `RedisContainer` with a custom name.

Closes gh-41450
 2024-08-29 19:26:20 -07: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
4d4b189cce Prevent duplicate DynamicPropertyRegistry beans 
Remove the Spring Framework registered `DynamicPropertyRegistry` when
using Testcontainers.

See gh-41839
 2024-08-21 21:04:13 -07:00
Andy Wilkinson
d56dd741d0 Merge branch '3.3.x' 
Closes gh-41860
 2024-08-14 19:04:18 +01:00
Andy Wilkinson
1bd9948485 Merge branch '3.2.x' into 3.3.x 
Closes gh-41859
 2024-08-14 19:03:52 +01:00
Andy Wilkinson
e7e5ed1508 Don't initialize containers during AOT processing 
Fixes gh-41838
 2024-08-14 18:56:00 +01:00
Moritz Halbritter
46150bae89 Merge branch '3.3.x' 
Closes gh-41858
 2024-08-14 17:20:59 +02:00
Moritz Halbritter
2a84fe5760 Merge branch '3.2.x' into 3.3.x 
Closes gh-41857
 2024-08-14 16:47:52 +02:00
Moritz Halbritter
1d45016d8c Upgrade to spring-javaformat 0.0.43 
Closes gh-41853
 2024-08-14 16:32:41 +02:00
Nikola Kološnjaji
2a123b3e27 Fix typo in Grafana ConnectionDetailsFactory javadoc 
See gh-41705
 2024-08-06 16:47:48 -05: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
Andy Wilkinson
e201b94d4f Merge branch '3.3.x' 
Closes gh-41616
 2024-07-25 16:17:52 +01:00
Andy Wilkinson
c642f6d268 Merge branch '3.2.x' into 3.3.x 
Closes gh-41613
 2024-07-25 16:16:35 +01:00
Phillip Webb
000600c68a Merge branch '3.3.x' 2024-07-22 18:41:53 +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
2216b48e64 Match one of multiple names in ContainerConnectionDetailsFactory 
Closes gh-41543

Co-Authored-By: Eddú Meléndez <eddu.melendez@gmail.com>
 2024-07-17 10:43:50 +01:00
Andy Wilkinson
375b3b16a0 Remove APIs that were deprecated for removal in 3.4.0 
Closes gh-41435
 2024-07-10 13:31:21 +01:00
Andy Wilkinson
6749ad674f Polish "Add support for org.testcontainers.kafka.KafkaContainer" 
See gh-40695
 2024-06-27 15:10:58 +01:00
Eddú Meléndez
769f3e9d14 Add support for org.testcontainers.kafka.KafkaContainer 
Testcontainers 1.19.8 provides `org.testcontainers.kafka.KafkaContainer`,
which relies on `apache/kafka` image.

See gh-40695
 2024-06-27 14:58:57 +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
Andy Wilkinson
3f1f801461 Update spring-boot-testcontainers to use docker-test plugin 
See gh-41228
 2024-06-26 19:45:52 +01:00
Phillip Webb
26ea4f9fb1 Merge branch '3.2.x' into 3.3.x 2024-06-25 22:16:10 -07:00
Phillip Webb
712d935c8e Fix checkstyle violation 
See gh-35786
 2024-06-25 22:16:03 -07:00
Phillip Webb
87e0262896 Merge branch '3.2.x' into 3.3.x 
Closes gh-41238
 2024-06-25 22:08:44 -07:00
Phillip Webb
eef4c3c2c0 Allow TestcontainersLifecycleBeanPostProcessor to detect scoped beans 
Update `TestcontainersLifecycleBeanPostProcessor` so that scoped beans
are included.

Fixes gh-35786
 2024-06-25 22:00:34 -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
Andy Wilkinson
e10066a83f Merge branch '3.2.x' 
Closes gh-41125
 2024-06-17 11:43:29 +01:00
Andy Wilkinson
138307c13c Disable test context cache in spring-boot-testcontainers 
Closes gh-41124
 2024-06-17 11:43:00 +01:00
Phillip Webb
147240aa0c Merge branch '3.2.x' 
Closes gh-41080
 2024-06-11 13:32:30 -07:00