Scott Frederick
47cc65d912
Merge branch '3.1.x'
...
Closes gh-36056
2023-06-23 16:12:58 -06:00
Scott Frederick
a03d32e0f3
Merge pull request #36038 from eddumelendez
...
* pr/36038:
Polish "Add SslAutoConfiguration to slice test annotations"
Add SslAutoConfiguration to slice test annotations
Closes gh-36038
2023-06-23 16:12:31 -06:00
Scott Frederick
c277517953
Polish "Add SslAutoConfiguration to slice test annotations"
...
See gh-36038
2023-06-23 16:11:49 -06:00
Eddú Meléndez
321c526bf7
Add SslAutoConfiguration to slice test annotations
...
`SslAutoConfiguration` has been added to `cassandra`, `couchbase`,
`elasticsearch`, `mongo` and `redis` slice test annotations.
See gh-36038
2023-06-23 15:51:42 -06:00
Scott Frederick
c32877493c
Merge branch '3.1.x'
...
Closes gh-36055
2023-06-23 15:47:00 -06:00
Scott Frederick
b9b314622f
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36054
2023-06-23 15:46:44 -06:00
Scott Frederick
4a3abdd7c3
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36053
2023-06-23 15:46:27 -06:00
Scott Frederick
a9d3acb12c
Merge pull request #36048 from izeye
...
* pr/36048:
Add Javadoc since to ImageReference.inTaglessForm()
Closes gh-36048
2023-06-23 15:45:56 -06:00
Johnny Lim
59d4bf97a1
Add Javadoc since to ImageReference.inTaglessForm()
...
See gh-36048
2023-06-23 15:45:29 -06:00
Scott Frederick
67725d4781
Merge branch '3.1.x'
...
Closes gh-36052
2023-06-23 15:26:53 -06:00
Scott Frederick
eba7b32bed
Merge pull request #36016 from jstansel
...
* gh-36016:
Fix typo in docker compose service connections note
Closes gh-36016
2023-06-23 15:26:32 -06:00
James Stansell
ea41a22284
Fix typo in docker compose service connections note
...
See gh-36016
2023-06-23 15:25:30 -06:00
Scott Frederick
90dd7449bb
Merge branch '3.1.x'
...
Closes gh-36051
2023-06-23 15:20:25 -06:00
Scott Frederick
92b2573a60
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36050
2023-06-23 15:20:06 -06:00
Scott Frederick
eeeb2ad72a
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36049
2023-06-23 15:19:44 -06:00
Scott Frederick
5ecca4be36
Merge pull request #35986 from izeye
...
* gh-35986:
Remove redundant Files.delete() calls in tests
Closes gh-35986
2023-06-23 15:19:16 -06:00
Johnny Lim
4a2c9d99dc
Remove redundant Files.delete() calls in tests
...
See gh-35986
2023-06-23 15:14:59 -06:00
Scott Frederick
493987fc1a
Allow key password to be set for a PemSslStoreBundle
...
Closes gh-35983
2023-06-23 14:40:42 -06:00
Andy Wilkinson
b645eb32ac
Remove deprecated code that was to be removed in 3.2
...
Closes gh-36034
2023-06-23 18:14:22 +01:00
Andy Wilkinson
50d8b20d6c
Re-enable forward merge issues for merges into main
2023-06-23 16:01:26 +01:00
Andy Wilkinson
357c67a999
Merge branch '3.1.x'
2023-06-23 15:58:51 +01:00
Andy Wilkinson
3f7fe25cb9
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36044
2023-06-23 15:58:36 +01:00
Andy Wilkinson
2fae5de245
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36043
2023-06-23 15:50:02 +01:00
Andy Wilkinson
7b0aa7dcbb
Merge pull request #35915 from ThomazPassarelli
...
* gh-35915:
Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
Replace calls to verifyComplete() to avoid indefinite blocking
Closes gh-35915
2023-06-23 14:44:44 +01:00
Andy Wilkinson
d2966e1cbf
Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
...
See gh-35915
2023-06-23 12:38:12 +01:00
ThomazPassarelli
f9da30faf1
Replace calls to verifyComplete() to avoid indefinite blocking
...
See gh-35915
2023-06-23 12:16:26 +01:00
Moritz Halbritter
8f7fdc507e
Polish CorrelationIdFormatter
2023-06-23 08:26:32 +02: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
Andy Wilkinson
89164ddf5f
Merge branch '3.1.x'
2023-06-22 14:12:54 +01:00
Andy Wilkinson
e33cec5488
Merge branch '3.0.x' into 3.1.x
2023-06-22 14:12:43 +01:00
Andy Wilkinson
de9f249ef9
Merge branch '2.7.x' into 3.0.x
2023-06-22 14:12:21 +01:00
Spring Builds
efd903b0a8
Next development version (v3.1.2-SNAPSHOT)
2023-06-22 12:40:55 +00:00
Spring Builds
dbd925e9db
Next development version (v3.0.9-SNAPSHOT)
2023-06-22 11:19:10 +00:00
Spring Builds
cee73cebd4
Next development version (v2.7.14-SNAPSHOT)
2023-06-22 10:00:16 +00:00
Andy Wilkinson
6f95900775
Merge branch '3.1.x'
2023-06-22 10:04:23 +01:00
Andy Wilkinson
5c53bda650
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36025
2023-06-22 10:04:11 +01:00
Andy Wilkinson
1596f69601
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36023
2023-06-22 10:03:46 +01:00
Andy Wilkinson
fff30efed5
Configure timeouts on staging builds
...
Closes gh-36022
2023-06-22 10:02:53 +01: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
b6120d504a
Replace LoggingSystemProperties constants with an Enum
...
Extract contants from `LoggingSystemProperty` and
`LogbackLoggingSystemProperties` in enum classes.
Closes gh-36015
2023-06-22 00:28:22 -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
Phillip Webb
16265e925d
Merge branch '3.1.x'
2023-06-21 23:44:18 -07:00
Phillip Webb
8ac5dc7ea3
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36017
2023-06-21 23:44:06 -07:00
Phillip Webb
f7af1bab5b
Upgrade to Spring WS 4.0.5
...
Closes gh-36010
2023-06-21 23:40:28 -07:00
Phillip Webb
64525fb566
Merge branch '3.1.x'
2023-06-21 16:49:32 -07:00
Phillip Webb
eb72d7e9f1
Merge branch '3.0.x' into 3.1.x
2023-06-21 16:49:24 -07:00
Phillip Webb
5c8ed944ca
Start building against Spring WS 4.0.5 snapshots
...
See gh-36010
2023-06-21 16:49:12 -07:00