314 Commits

Author SHA1 Message Date
Scott Frederick
67725d4781 Merge branch '3.1.x'
Closes gh-36052
2023-06-23 15:26:53 -06:00
James Stansell
ea41a22284 Fix typo in docker compose service connections note
See gh-36016
2023-06-23 15:25:30 -06:00
Phillip Webb
493777d3c9 Include the application name on each log line when it is available
Update Logback and Log4J2 so that they include the application name on
each log line. If `spring.application.name` had not been set, or if
`logging.include-application-name` is `false` then the name is not
logged.

Closes gh-35593
2023-06-22 00:40:51 -07:00
Jonatan Ivanov
c1b295fd71 Log correlation IDs when Micrometer tracing is being used
Add support for logging correlation IDs with Logback or Log4J2 whenever
Micrometer tracing is being used.

The `LoggingSystemProperties` class now accepts a defualt value resolver
which will be used whenever a value isn't in the environment. The
`AbstractLoggingSystem` provides a resolver that supports the
`logging.pattern.correlation` property and will return a value whenever
`LoggingSystem.EXPECT_CORRELATION_ID_PROPERTY` is set.

Using `LoggingSystem.EXPECT_CORRELATION_ID_PROPERTY` allows us to
provide a consistent width for the correlation ID, even when it's
missing from the MDC.

The exact correlation pattern returned will depend on the `LoggingSytem`
implementation. Currently Logback and Log4J2 are supported and both
make use of a custom converter which delegates to a new
`CorrelationIdFormatter` class.

Closes gh-33280
2023-06-22 00:28:45 -07:00
Andy Wilkinson
5b69580d5d Merge branch '3.0.x' into 3.1.x
Closes gh-36004
2023-06-21 12:43:48 +01:00
Andy Wilkinson
f584d6dbd9 Replace @EnableBatchProcessing in slice test examples
Using `@EnableBatchProcessing` is no longer necessary to enable
Batch's auto-configuration so it's no longer a good example when
discussing sliced tests and user configuration.

This commit replaces `@EnableBatchProcessing` with an alternative
annotation, `@EnableMongoAuditing` and updates the accompanying
text.

Closes gh-33435
2023-06-21 12:41:28 +01:00
Andy Wilkinson
251b5f2d0f Merge branch '3.0.x' into 3.1.x
Closes gh-35909
2023-06-15 14:38:31 +01:00
Andy Wilkinson
a5981a4dac Merge branch '2.7.x' into 3.0.x
Closes gh-35908
2023-06-15 14:38:13 +01:00
Andy Wilkinson
9feb84e234 Add DynmicPropertySource to ordered list of property sources
Closes gh-32901
2023-06-15 14:36:38 +01:00
Sungchan Cho
96d5f8641c Fix typo in Docker Compose documentation
See gh-35818
2023-06-13 10:18:16 +02:00
Moritz Halbritter
2e37c0da18 Merge branch '3.0.x'
Closes gh-35769
2023-06-07 09:32:14 +02:00
Moritz Halbritter
a9b4e9327c Merge branch '2.7.x' into 3.0.x
Closes gh-35768
2023-06-07 09:32:07 +02:00
twobiers
0dbc0fcf91 Move property notes up to external configuration section
See gh-35662
2023-06-07 09:29:23 +02:00
Yanming Zhou
e8659da59b Fix error in SSL bundle documentation
See gh-35665
2023-05-30 17:15:50 -05:00
Stephane Nicoll
7a9bb55fdf Merge branch '3.0.x'
Closes gh-35589
2023-05-22 16:24:56 +02:00
Phillip Webb
060581d078 Remove pluggable docker compose ReadinessCheck
Remove pluggable `ReadinessCheck` interface and only use the
`TcpConnectServiceReadinessCheck` implementation for now. We
may re-introduce pluggable checks in a future version.

See gh-35544
2023-05-17 16:26:59 -07:00
Phillip Webb
ae90add7c7 Polish 2023-05-16 14:04:48 -07:00
Scott Frederick
271cbb76c1 Improve documentation for including Docker Compose support in a build
Closes gh-35384
2023-05-10 13:42:36 -05:00
Moritz Halbritter
1504e3043d Document devtools when using testcontainers at dev time
See gh-35200
2023-05-09 08:31:24 +02:00
Moritz Halbritter
c4deae3906 Document that Spring Boot by default calls 'docker compose stop' 2023-05-05 10:21:09 +02:00
Andy Wilkinson
4f9616c2f9 Change DockerComposeProperties shut down default to stop
Closes gh-35239
2023-05-04 21:09:16 +01:00
Eddú Meléndez
ad4f6ffeb7 Add service connection from Testcontainers Zipkin
See gh-35107
2023-05-03 13:09:49 +02:00
Phillip Webb
8427e813af Support import of idomatic testcontainer declaration classes
Add an `@ImportTestcontainers` annotation which can be used to import
idomatic testcontainer declaration classes.

Closes gh-35245
2023-05-03 00:28:36 -07:00
Phillip Webb
26566d4a30 Allow testcontainer beans to also contribute properties
Allow `Container` bean definitions to inject a `DynamicPropertyRegistry`
so that they can contribute environment properties.

Closes gh-35201
2023-05-03 00:27:13 -07:00
Scott Frederick
d913472919 Add Kotlin samples and polish SSL bundle documentation
Closes gh-35105
2023-04-28 14:31:01 -05:00
Andy Wilkinson
d7da77bda8 Remove support for service connections to InfluxDB
Closes gh-35189
2023-04-28 09:49:39 +01:00
Andy Wilkinson
8bbe894665 Add Docker Compose service connection support for Oracle using JDBC
Closes gh-35145
2023-04-27 11:07:53 +01:00
Andy Wilkinson
1e785e81f8 Add Docker Compose support for Oracle Database using R2DBC
Closes gh-35143
2023-04-27 10:33:25 +01:00
Andy Wilkinson
b5178afa21 Add Docker Compose support for MS SQL Server using JDBC
Closes gh-35146
2023-04-27 09:31:24 +01:00
Scott Frederick
43b42eca49 Add Docker Compose service connection support for Cassandra
Closes gh-35136
2023-04-25 16:06:34 -05:00
Andy Wilkinson
dee5217cf0 Add Docker Compose support for MS SQL Server using R2DBC
Closes gh-35144
2023-04-24 16:47:58 -07:00
Phillip Webb
0f032c290a Allow for predicate based checking of image names
Update `DockerComposeConnectionDetailsFactory` to accept a `Predicate`
based check to determine if the source should be accepted.

The existing name based checks have also been improved to allow names
outside of official docker images. The `ImageReference` and `ImageName`
classes have been mainly copied from
`org.springframework.boot.buildpack.platform.docker.type`.

Closes gh-35154
2023-04-24 16:40:07 -07:00
Stephane Nicoll
363dc9368d Merge branch '3.0.x'
Closes gh-35130
2023-04-24 13:46:17 +02:00
Stephane Nicoll
7f0402f869 Merge branch '2.7.x' into 3.0.x
Closes gh-35129
2023-04-24 13:46:04 +02:00
Ivan Dimitrov
f4db73ead9 Harmonize references to application.yaml files in reference docs
See gh-34628
2023-04-24 13:42:05 +02:00
Lukasz Jernas
d38a68ebcd Fix typo in testing docs
See gh-35128
2023-04-24 13:26:19 +02:00
Phillip Webb
a0b854024b Add a 'Docker Compose Support' section to the reference docs
Update the reference documentation with details about the recently
introduced Docker Compose Support.

Closes gh-35026
2023-04-21 23:18:54 -07:00
Phillip Webb
e19aa81813 Polish formatting 2023-04-21 23:18:44 -07:00
Scott Frederick
a03f857059 Document update SSL support
Add a new SSL section to the reference documentation to describe SSL
bundles.

See gh-34814
2023-04-21 01:13:05 -07:00
Andy Wilkinson
0da209db08 Polish "Add support for Oracle R2DBC Service Connection"
See gh-34852
2023-04-18 13:47:46 +01:00
Andy Wilkinson
98d077c74c Polish "Add service connection from Testcontainers Redpanda"
See gh-34780
2023-04-18 12:49:25 +01:00
Phillip Webb
5ac48f5f15 Add testcontainers service connection auto-configuration
Add auto-configuration for `Container` beans that are also
annotated with `@ServiceConnection`. This commit allow
testcontainers to be used at development time and a new section
has been added to the documentation to describe the feature.

Closes gh-35022
2023-04-17 00:49:43 -07:00
Phillip Webb
91e6e4e391 Update documentation to note the spring-boot-testcontainers module
See gh-34757
2023-04-17 00:47:03 -07:00
Phillip Webb
1a0b9bdcd0 Move Testcontainers documentation from howto to features
Closes gh-35018
2023-04-17 00:46:11 -07:00
Scott Frederick
3d65be0e1c Merge branch '3.0.x'
Closes gh-34660
2023-03-20 18:39:26 -05:00
Scott Frederick
86a1cfff6f Merge branch '2.7.x' into 3.0.x
Closes gh-34659
2023-03-20 18:39:11 -05:00
Scott Frederick
6dc0f90e00 Polish "Disable embedded web auto-config when not using embedded web server"
See gh-34332
2023-03-20 18:38:04 -05:00
Guirong Hu
b2facecb12 Disable embedded web auto-config when not using embedded web server
See gh-34332
2023-03-20 18:14:58 -05:00
Andy Wilkinson
d51a042cb2 Merge branch '3.0.x'
Closes gh-34603
2023-03-14 14:52:57 +00:00
Andy Wilkinson
7f807dccb7 Merge branch '2.7.x' into 3.0.x
Closes gh-34602
2023-03-14 14:52:27 +00:00