Commit Graph

3436 Commits

Author SHA1 Message Date
Andy Wilkinson eb58ade3a2 Merge branch '3.1.x'
Closes gh-36216
2023-07-04 15:13:51 +01:00
Andy Wilkinson 215763bded Merge branch '3.0.x' into 3.1.x
Closes gh-36215
2023-07-04 15:13:35 +01:00
Andy Wilkinson b764b5beee Merge branch '2.7.x' into 3.0.x
Closes gh-36214
2023-07-04 15:13:19 +01:00
Andy Wilkinson 1f75ba557e Document HTTP client auto-detection for RestTemplate and WebClient
Closes gh-34136
2023-07-04 15:09:40 +01:00
Andy Wilkinson ec8e1e2c95 Start building against Spring Data Bom 2023.1.0 snapshots
See gh-36190
2023-07-04 09:44:53 +01:00
Phillip Webb 8c3f847bfe Merge branch '3.1.x' 2023-06-30 14:54:52 +01:00
Phillip Webb 7c63870305 Merge branch '3.0.x' into 3.1.x 2023-06-30 14:54:36 +01:00
Phillip Webb a14ddd6900 Polish adoc formatting 2023-06-30 14:54:21 +01:00
Andy Wilkinson 57ed2016b6 Merge branch '3.1.x'
Closes gh-36143
2023-06-30 14:07:08 +01:00
Andy Wilkinson 164bd7924e Merge branch '3.0.x' into 3.1.x
Closes gh-36142
2023-06-30 14:06:52 +01:00
Andy Wilkinson 3d1ca62a6f Merge branch '2.7.x' into 3.0.x
Closes gh-36141
2023-06-30 14:06:39 +01:00
Andy Wilkinson 362182efd8 Polish "Polish Kafka Properties Docs"
See gh-36032
2023-06-30 14:06:13 +01:00
Gary Russell 025063e708 Polish Kafka Properties Docs
There are 4 client types but there were a couple of places where not
all client types were mentioned (such as 'applies to producers,
consumers and admins').

See gh-36032
2023-06-30 14:01:26 +01:00
Andy Wilkinson 60553415d0 Merge branch '3.1.x'
Closes gh-36140
2023-06-30 13:00:50 +01:00
Andy Wilkinson d7da2d9eb2 Merge branch '3.0.x' into 3.1.x
Closes gh-36139
2023-06-30 13:00:37 +01:00
Andy Wilkinson 66aa55b65d Merge branch '2.7.x' into 3.0.x
Closes gh-36138
2023-06-30 13:00:25 +01:00
JuHyeong Ahn dbdb4d4e8d Fix typo in Using R2DBC
See gh-36019
2023-06-30 12:59:49 +01:00
Moritz Halbritter b655523ef9 Merge branch '3.1.x'
Closes gh-36132
2023-06-30 10:44:48 +02:00
Moritz Halbritter 3d15b02441 Merge branch '3.0.x' into 3.1.x
Closes gh-36131
2023-06-30 10:44:34 +02:00
Moritz Halbritter 606063589f Document trace propagation with RestTemplate and WebClient
Closes gh-34053
2023-06-30 10:44:14 +02:00
Moritz Halbritter cff26d9843 Merge branch '3.1.x'
Closes gh-36113
2023-06-29 11:42:12 +02:00
Moritz Halbritter 20321b5685 Merge branch '3.0.x' into 3.1.x
Closes gh-36112
2023-06-29 11:39:20 +02:00
Moritz Halbritter 2b398827de Add "baggage" section to tracing docs
Closes gh-34977
2023-06-29 11:30:58 +02:00
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
Jonatan Ivanov 228b8eb8e4
Polish log correlation docs
Docs related to gh-33280 (log correlation) and
gh-35593 (application name in each log line) need some polishing:
- Fix project names
- Show how to avoid having the application name duplicated in logs
- Call out that a trailing space is needed in the correlation pattern

Closes gh-36035
See gh-33280
See gh-35593
2023-06-22 14:51:02 -07: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
Phillip Webb 3a796aedea Merge branch '3.1.x' 2023-06-22 00:28:01 -07:00
Phillip Webb 31f218c4e0 Merge branch '3.0.x' into 3.1.x 2023-06-22 00:27:51 -07:00
Phillip Webb 9db3c5a2f7 Polish 2023-06-22 00:24:39 -07:00
Andy Wilkinson 68aec97ee7 Merge branch '3.1.x' 2023-06-21 12:44:06 +01: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 1f9ce508f7 Upgrade to SnakeYAML 2.0
Closes gh-35982
2023-06-19 18:18:31 +01:00
Phillip Webb 23eb7ec1f8 Merge branch '3.1.x' 2023-06-16 14:35:44 -07:00
Phillip Webb 5d6a507142 Merge branch '3.0.x' into 3.1.x 2023-06-16 14:35:23 -07:00
Phillip Webb 48e13af8c4 Merge branch '2.7.x' into 3.0.x 2023-06-16 14:34:54 -07:00
Jonatan Ivanov 85934c3919
Merge branch '3.1.x'
Closes gh-35930
2023-06-16 13:03:08 -07:00
Johnny Lim 06157837e5
Polish
See gh-35872
2023-06-16 12:39:03 -07:00
Andy Wilkinson 740815da03 Merge branch '3.1.x' 2023-06-15 14:38:43 +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
Moritz Halbritter c73315b4a3 Add property to prevent observations starting with a prefix
For example, setting management.observations.enable.denied.prefix=false
will prevent all observations starting with 'denied.prefix'

Closes gh-34802
2023-06-13 14:04:33 +02:00
Moritz Halbritter 491e12ab5e Add property to disable Spring Security observations
Setting 'management.observations.spring-security.enabled' installs an
ObservationPredicate, which prevents all observations starting with
'spring.security.' to be created.

Closes gh-34802
2023-06-13 11:18:05 +02:00
Moritz Halbritter 6eede829d2 Merge branch '3.1.x' 2023-06-13 10:21:06 +02:00
Sungchan Cho 96d5f8641c Fix typo in Docker Compose documentation
See gh-35818
2023-06-13 10:18:16 +02:00
Moritz Halbritter 5b06224af5 Add property for common key/values on observations
- Deprecates 'management.metrics.tags.*'

Closes gh-33241
2023-06-13 09:56:42 +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
Moritz Halbritter 0cf93f1aa4 Merge branch '3.0.x'
Closes gh-35767
2023-06-07 09:08:54 +02:00
Steve Riesenberg ba9f92fa86 Improve OAuth2 Client section of docs
* Add an OpenID Connect login client example
* Update redirect-uri examples to match Security docs and not require
  any customization
* Update client-authentication-method for Spring Security 6 usage
* Update provider configuration example to align with Spring
  Authorization Server
* Format Java DSL according to Spring Security docs
* Use Kotlin DSL
* Update redirection endpoint base uri example to use ant pattern

See gh-35679
2023-06-07 09:07:14 +02:00
Phillip Webb 1669b81af7 Add 'fromApplication' and 'with' Kotlin extension functions
Update `SpringApplicationExtensions.kt` with `fromApplication` and
`with` functions that make `SpringApplication.from(...)` easier to use
with Kotlin.

Fixes gh-35756
2023-06-05 21:49:41 -07:00
Yanming Zhou e8659da59b Fix error in SSL bundle documentation
See gh-35665
2023-05-30 17:15:50 -05:00
Moritz Halbritter eb9077df86 Document how to customize the JDBC parameters when using Docker Compose
Closes gh-35636
2023-05-26 13:28:40 +02:00
Andy Wilkinson 6a74f63143 Merge branch '3.0.x'
Closes gh-35634
2023-05-25 14:20:17 +01:00
Andy Wilkinson a9f89a1e3c Merge branch '2.7.x' into 3.0.x
Closes gh-35633
2023-05-25 14:19:58 +01:00
Andy Wilkinson f452a86175 Polish "Document audience support in Oauth2 resource server"
See gh-35286
2023-05-25 14:11:44 +01:00
Bikash Adhikari 13c5c6efb1 Document audience support in Oauth2 resource server
See gh-35286
2023-05-25 14:11:27 +01:00
Moritz Halbritter b82e7a72b1 Move @Testcontainers before @SpringBootTest in documentation
Closes gh-35572
2023-05-23 09:33:25 +02:00
Stephane Nicoll 9643dbeed2 Merge branch '3.0.x'
Closes gh-35590
2023-05-22 16:31:55 +02:00
Christoph Dreis b2b5728995 Remove unnecessary exclude from spring-restdocs-mockmvc
See gh-35568
2023-05-22 16:31:22 +02: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
Andy Wilkinson 1097164a0e Merge branch '3.0.x'
Closes gh-35457
2023-05-17 10:18:58 +01:00
Andy Wilkinson aabb164892 Merge branch '2.7.x' into 3.0.x
Closes gh-35456
2023-05-17 10:18:30 +01:00
Andy Wilkinson d66563d544 Polish "Improve formatting of Kotlin permitAll example"
See gh-35454
2023-05-17 10:12:05 +01:00
Junsu Park 11a1de1e64 Improve formatting of Kotlin permitAll example
See gh-35454
2023-05-17 10:11:29 +01:00
Phillip Webb ae90add7c7 Polish 2023-05-16 14:04:48 -07:00
Sébastien Deleuze becff01db1 Improve Kotlin Testcontainers samples
Make those code samples more idiomatic.

See gh-35446
2023-05-16 19:28:47 +01: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
Johnny Lim ff9fd1abeb Polish
See gh-35185
2023-05-10 08:31:36 +02:00
Yanming Zhou 1cddb2a55f Fix typo
See gh-35369
2023-05-10 08:27:33 +02: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 afa929cd6b Polish documentation 2023-05-05 13:38:27 +02:00
Moritz Halbritter 4d14d0e437 Merge branch '3.0.x'
Closes gh-35321
2023-05-05 11:31:54 +02:00
Moritz Halbritter 8a14f6d017 Clarify conditional support when using AOT
Closes gh-35262
2023-05-05 11:31:17 +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
Moritz Halbritter 243b337954 Remove copyright from the anchor-rewrite.properties 2023-05-03 16:11:53 +02:00
Moritz Halbritter 46fedfc4ef Move JAR unpacking section and add AOT on JVM section
Closes gh-32905
2023-05-03 16:01:19 +02:00
Moritz Halbritter bdca30e85b Polish 2023-05-03 14:33:07 +02:00
Moritz Halbritter 71f4247340 Improve headings
See gh-32779
2023-05-03 14:31:43 +02:00
Moritz Halbritter 56b8e419be Update getting started with alternative gradle instructions
Closes gh-32779
2023-05-03 14:29:02 +02: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
Phillip Webb a890323758 Merge branch '3.0.x' 2023-05-02 14:52:42 -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
Scott Frederick 226c3005d4 Add SSL bundle support to Redis auto-configuration
Update Redis auto-configuration with Lettuce and Jedis drivers to
allow SSL configuration with an SSL bundle.

Closes gh-34815
2023-04-27 15:24:55 -05: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