8b3070e027
Merge branch '3.1.x'
2023-07-05 21:00:12 +01:00
034803ee2f
Polish
2023-07-05 20:59:39 +01:00
fc8a8d363f
Polish
2023-07-05 15:50:32 +01:00
4feaa28fd1
Polish "Support custom token validators for OAuth2"
...
See gh-35874
2023-07-05 14:01:08 +01:00
7500dab321
Support custom token validators for OAuth2
...
See gh-35874
2023-07-05 11:48:48 +01:00
ce8253ea95
Merge branch '3.1.x'
...
Closes gh-36238
2023-07-05 09:51:35 +01:00
c9f8d92656
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36237
2023-07-05 09:47:43 +01:00
0fa58c04e7
Use Stream.toList()
...
See gh-36167
2023-07-05 09:38:19 +01:00
12cd753652
Merge branch '3.1.x'
...
Closes gh-36236
2023-07-05 09:20:19 +01:00
20cfc3c9d0
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36235
2023-07-05 09:19:49 +01:00
f57e6a1fa5
Use spring-amqp-bom
...
See gh-36168
2023-07-05 09:19:24 +01:00
62eb3d3051
Merge branch '3.1.x'
...
Closes gh-36234
2023-07-05 09:12:59 +01:00
0bfc3c3872
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36233
2023-07-05 09:12:47 +01:00
9439494923
Polish formatting in "Running Spring Batch Jobs on Startup"
...
See gh-36225
2023-07-05 09:12:07 +01:00
2de6447a79
Merge branch '3.1.x'
...
Closes gh-36232
2023-07-05 09:09:39 +01:00
bdb7fdc6fc
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36230
2023-07-05 09:09:26 +01:00
581c2633f8
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36229
2023-07-05 09:09:07 +01:00
f4c996b432
Polish "Check for Class and ResolvableType object type attributes"
...
See gh-36224
2023-07-05 09:04:58 +01:00
3a7185206e
Check for Class and ResolvableType object type attributes
...
See gh-36224
2023-07-05 09:04:04 +01:00
8ed160a144
Merge branch '3.1.x'
...
Closes gh-36228
2023-07-05 08:53:33 +01:00
480049ef5b
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36227
2023-07-05 08:53:15 +01:00
cbc0f7117f
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36226
2023-07-05 08:52:55 +01:00
fe08c70973
Test Gradle plugin against Gradle 8.2
...
Closes gh-36207
2023-07-05 08:13:24 +01:00
c3e2c9d684
Polish "Support Jetty in ClientHttpRequestFactories"
...
See gh-36116
2023-07-04 17:49:07 +01:00
7ceece3d3d
Support Jetty in ClientHttpRequestFactories
...
This commit introduces support for the JettyClientHttpRequestFactory
in ClientHttpRequestFactories.
See gh-36116
2023-07-04 17:49:07 +01:00
2cbd916cdb
Merge branch '3.1.x'
...
Closes gh-36221
2023-07-04 15:21:32 +01:00
e97c5a7118
Use kebab-case for property default values in metadata
...
See gh-36170
2023-07-04 15:20:42 +01:00
41cdfb891f
Merge branch '3.1.x'
...
Closes gh-36220
2023-07-04 15:18:42 +01:00
2e11349c93
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36219
2023-07-04 15:18:32 +01:00
9884abb379
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36218
2023-07-04 15:18:15 +01:00
fc31e14e72
Polish 'Improve Kubernetes probe customization documentation'
...
See gh-34978
2023-07-04 15:17:20 +01:00
028ff3a7be
Improve Kubernetes probe customization documentation
...
See gh-34978
2023-07-04 15:17:20 +01:00
eb58ade3a2
Merge branch '3.1.x'
...
Closes gh-36216
2023-07-04 15:13:51 +01:00
215763bded
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36215
2023-07-04 15:13:35 +01:00
b764b5beee
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36214
2023-07-04 15:13:19 +01:00
1f75ba557e
Document HTTP client auto-detection for RestTemplate and WebClient
...
Closes gh-34136
2023-07-04 15:09:40 +01:00
7c942679ad
Polish 'Switch ImportsContextCustomizer to use MergedAnnotations.search'
...
See gh-36211
2023-07-04 14:05:48 +01:00
4562189125
Switch ImportsContextCustomizer to use MergedAnnotations.search #36211
...
Use `MergedAnnotations.search` in `ImportsContextCustomizer` rather than
needing dedicated search logic.
See gh-36211
2023-07-04 13:58:53 +01:00
2350d9c870
Adapt to Data changes missed due to predictive test selection
...
See gh-36190
2023-07-04 12:39:52 +01:00
9985c845f2
Adapt to Framework changes missed due to predictive test selection
...
See gh-36198
2023-07-04 12:39:52 +01:00
b2985676aa
Merge branch '3.1.x'
...
Closes gh-36210
2023-07-04 12:19:47 +01:00
97ef8f38a4
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36209
2023-07-04 12:19:20 +01:00
ab7e4da703
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36208
2023-07-04 12:18:52 +01:00
5d0640a356
Use MergedAnnotations for `@AliasFor` support
...
Update `ImportsContextCustomizer` to use `MergedAnnotations` so
that `@AliasFor` can be supported.
See gh-34917
2023-07-04 12:17:58 +01:00
9baf23ccd5
Test that ImportsContextCustomizer can support @AliasFor
...
Add test to ensure that `ImportsContextCustomizer` can support
`@AliasFor` annotations.
See gh-34917
2023-07-04 12:17:58 +01:00
5a9ca67fba
Start building against Spring Framework 6.2.0-M2 snapshots
...
See gh-36198
2023-07-04 10:20:33 +01:00
1fa079d9b5
Start building against Micrometer Tracing 1.2.0 snapshots
...
See gh-36199
2023-07-04 09:44:55 +01:00
afdc133d6a
Start building against Spring Session 3.2.0 snapshots
...
See gh-36196
2023-07-04 09:44:54 +01:00
e1b5eb5040
Start building against Spring Security 6.2.0 snapshots
...
See gh-36195
2023-07-04 09:44:54 +01:00
32d8355191
Start building against Spring Kafka 3.0.9 snapshots
...
See gh-36194
2023-07-04 09:44:54 +01:00
1e0a572dfa
Start building against Spring Integration 6.2.0 snapshots
...
See gh-36193
2023-07-04 09:44:54 +01:00
c794f52085
Start building against Spring HATEOAS 2.2.0 snapshots
...
See gh-36192
2023-07-04 09:44:53 +01:00
f85ba2a37e
Start building against Spring GraphQL 1.2.2 snapshots
...
See gh-36191
2023-07-04 09:44:53 +01:00
ec8e1e2c95
Start building against Spring Data Bom 2023.1.0 snapshots
...
See gh-36190
2023-07-04 09:44:53 +01:00
e847e662c2
Start building against Spring Batch 5.1.0 snapshots
...
See gh-36189
2023-07-03 19:26:45 +01:00
dc1d458e64
Start building against Micrometer 1.12.0 snapshots
...
See gh-36188
2023-07-03 19:26:40 +01:00
d0a61c2e78
Start building against Spring Kafka 3.0.9 snapshots
...
See gh-36187
2023-07-03 17:52:53 +01:00
3c00a04211
Start building against Spring GraphQL 1.2.2 snapshots
...
See gh-36186
2023-07-03 17:52:48 +01:00
9d0e058352
Start building against Spring Data Bom 2023.0.2 snapshots
...
See gh-36184
2023-07-03 17:52:38 +01:00
ffd3944bc7
Start building against Micrometer 1.11.2 snapshots
...
See gh-36183
2023-07-03 17:52:33 +01:00
2b1189ff31
Start building against Spring Kafka 3.0.9 snapshots
...
See gh-36182
2023-07-03 16:50:09 +01:00
356504ade4
Start building against Spring HATEOAS 2.0.5 snapshots
...
See gh-36181
2023-07-03 16:50:04 +01:00
c6d0c15c57
Start building against Spring Data Bom 2022.0.8 snapshots
...
See gh-36179
2023-07-03 16:49:55 +01:00
fc7e9d277b
Start building against Micrometer 1.10.9 snapshots
...
See gh-36178
2023-07-03 16:49:50 +01:00
a3990f16b9
Start building against Spring Data Bom 2021.2.14 snapshots
...
See gh-36173
2023-07-03 15:41:15 +01:00
b9881fa6f0
Start building against Reactor Bom 2020.0.34 snapshots
...
See gh-36172
2023-07-03 15:41:10 +01:00
90760e834f
Start building against Micrometer 1.9.13 snapshots
...
See gh-36171
2023-07-03 15:41:05 +01:00
df107890c7
Fix metadata for logging.include-application-name
...
See gh-36157
2023-07-02 20:10:19 +01:00
7c77e1bb85
Polish 'Log correlation IDs when Micrometer tracing is being used'
...
See gh-36158
2023-07-02 20:08:45 +01:00
77245c3bd0
Merge branch '3.1.x'
...
Closes gh-36164
2023-07-02 19:47:24 +01:00
1f68db06ba
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36163
2023-07-02 19:47:17 +01:00
f1b0d76d9b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36162
2023-07-02 19:46:45 +01:00
b6990940b1
Polish 'Choose SAML party based on entity ID rather than always using first'
...
See gh-35902
2023-07-02 19:02:08 +01:00
864af59adc
Choose SAML party based on entity ID rather than always using first
...
Update `Saml2RelyingPartyRegistrationConfiguration` so that
`RelyingPartyRegistrations` uses `collectionFromMetadataLocation`
rather than `fromMetadataLocation` and searches candidates for a
matching entity ID.
Prior to this commit, it was possible for the wrong provider to be
used if multiple candidates existed in the returned metadata.
See gh-35902
2023-07-02 18:54:34 +01:00
1cced11ea3
Merge branch '3.1.x'
...
Closes gh-36161
2023-07-02 14:01:26 +01:00
dcde1fac7e
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36160
2023-07-02 14:01:08 +01:00
566549021b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36159
2023-07-02 14:00:47 +01:00
51ee702dac
Allow configprops endpoint stringify primitive wrappers
...
Update `ConfigurationPropertiesReportEndpoint` so that primitive
wrapper input values in the Environment are stringified for display.
Fixes gh-36076
2023-07-02 13:59:30 +01:00
1bf334ae0f
Polish config metadata changelog generator
...
See gh-21486
2023-07-01 00:30:26 +01:00
318198ae5d
Polish "Change WebServer log messages to use port or ports, not port(s)"
...
See gh-36103
2023-06-30 19:41:14 +01:00
298bfd96c2
Change WebServer log messages to use port or ports, not port(s)
...
See gh-36103
2023-06-30 16:28:21 +01:00
8c3f847bfe
Merge branch '3.1.x'
2023-06-30 14:54:52 +01:00
7c63870305
Merge branch '3.0.x' into 3.1.x
2023-06-30 14:54:36 +01:00
a14ddd6900
Polish adoc formatting
2023-06-30 14:54:21 +01:00
9d5cc11e16
Merge branch '3.1.x'
...
Closes gh-36146
2023-06-30 14:47:45 +01:00
ffad1b1dca
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36145
2023-06-30 14:47:34 +01:00
70406452df
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36144
2023-06-30 14:47:20 +01:00
b06e7e60f9
Polish "Fix asymmetry of equals when element has trailing dashes"
...
See gh-34804
2023-06-30 14:38:31 +01:00
a86429a62a
Fix asymmetry of equals when element has trailing dashes
...
See gh-34804
2023-06-30 14:37:47 +01:00
57ed2016b6
Merge branch '3.1.x'
...
Closes gh-36143
2023-06-30 14:07:08 +01:00
164bd7924e
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36142
2023-06-30 14:06:52 +01:00
3d1ca62a6f
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36141
2023-06-30 14:06:39 +01:00
362182efd8
Polish "Polish Kafka Properties Docs"
...
See gh-36032
2023-06-30 14:06:13 +01:00
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
b4bc7cebbc
Revert "Add property to specify the order of ServerHttpObservationFilter"
...
This reverts commit 7b90fbb0b2
2023-06-30 14:01:27 +02:00
849f65a0de
Revert "Apply filter order to ServerHttpObservationFilter"
...
This reverts commit efcc65bc5b
2023-06-30 14:01:26 +02:00
60553415d0
Merge branch '3.1.x'
...
Closes gh-36140
2023-06-30 13:00:50 +01:00
d7da2d9eb2
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36139
2023-06-30 13:00:37 +01:00
66aa55b65d
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36138
2023-06-30 13:00:25 +01:00
dbdb4d4e8d
Fix typo in Using R2DBC
...
See gh-36019
2023-06-30 12:59:49 +01:00
8fa80426b4
Merge branch '3.1.x'
...
Closes gh-36133
2023-06-30 11:26:49 +01:00
58a9961a31
Name methods consistently in KafkaConnectionDetails
...
See gh-35733
2023-06-30 11:26:25 +01:00
32b7b312f0
Add config metadata changelog generator to main build
...
Closes gh-21486
2023-06-30 10:26:33 +01:00
b655523ef9
Merge branch '3.1.x'
...
Closes gh-36132
2023-06-30 10:44:48 +02:00
3d15b02441
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36131
2023-06-30 10:44:34 +02:00
606063589f
Document trace propagation with RestTemplate and WebClient
...
Closes gh-34053
2023-06-30 10:44:14 +02:00
ea73203219
Merge branch '3.1.x'
...
Closes gh-36130
2023-06-30 08:48:51 +01:00
f0fee86b62
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36129
2023-06-30 08:48:40 +01:00
fa72f90a10
Avoid NPE when a PeriodicTrigger has no initial delay
...
Closes gh-36081
2023-06-30 08:47:34 +01:00
6d8ca7286a
Merge branch '3.1.x'
...
Closes gh-36128
2023-06-30 08:26:26 +01:00
a268c6433e
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36127
2023-06-30 08:26:12 +01:00
93f8bd2170
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36126
2023-06-30 08:25:53 +01:00
996252f929
Stop using deprecated classifier property
...
Closes gh-36125
2023-06-30 08:22:14 +01:00
c22cbb0e2d
Merge branch '3.1.x'
...
Closes gh-36124
2023-06-29 16:55:19 -06:00
0a51c466f4
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36123
2023-06-29 16:54:45 -06:00
884489e73a
Apply system properties to RestTemplate HttpClient
...
Fixes gh-35815
2023-06-29 16:31:09 -06:00
abaade28ea
Merge branch '3.1.x'
...
Closes gh-36122
2023-06-29 18:10:52 +01:00
e2f8fcf292
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36121
2023-06-29 18:10:33 +01:00
6effd6061c
Provide hints when template auto-config is excluded
...
Fixes gh-35682
2023-06-29 18:09:30 +01:00
b32697b3ce
Add support to @ClassPathExclusions for excluding packages
...
Closes gh-36120
2023-06-29 16:53:36 +01:00
cff26d9843
Merge branch '3.1.x'
...
Closes gh-36113
2023-06-29 11:42:12 +02:00
20321b5685
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36112
2023-06-29 11:39:20 +02:00
2b398827de
Add "baggage" section to tracing docs
...
Closes gh-34977
2023-06-29 11:30:58 +02:00
3ef1738a5e
Remove containers after use in Docker Compose integration tests
...
Closes gh-36104
2023-06-28 14:12:39 +01:00
0b39429f96
Remove containers after use in Docker Compose integration tests
...
Closes gh-36104
2023-06-28 14:11:37 +01:00
b5a131d966
Merge branch '3.1.x'
...
Closes gh-36100
2023-06-27 20:31:16 +01:00
ba8b1717fb
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36099
2023-06-27 20:30:47 +01:00
79cd3a027a
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36098
2023-06-27 20:30:24 +01:00
9e1f2c4257
Tolerate Flway 9.20
...
Closes gh-36029
2023-06-27 20:22:24 +01:00
28af839dff
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36097
2023-06-27 20:13:57 +01:00
b3c321e40c
Polish javadoc of RestTemplateBuilder.requestFactory(Function)
...
Closes gh-36046
2023-06-27 20:13:11 +01:00
a1a336ddd8
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36095
2023-06-27 20:08:39 +01:00
b2bc114d6f
Update javadoc to link to non-deprecated ConstructorBinding
...
Closes gh-36045
2023-06-27 20:08:03 +01:00
2011c95c75
Merge branch '3.1.x'
...
Closes gh-36093
2023-06-27 14:24:41 +01:00
29ebaab0cb
Use Selenium's bom
...
See gh-36077
2023-06-27 14:24:06 +01:00
98d459d76c
Revert "Merge branch '3.1.x'"
...
See gh-36092
2023-06-27 14:16:20 +01:00
6851904651
Merge branch '3.1.x'
...
Closes gh-36092
2023-06-27 14:03:09 +01:00
9a57611ef5
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36091
2023-06-27 14:02:57 +01:00
ffbef7bb80
Test server.max-http-request-header-size with Undertow
...
Closes gh-36047
2023-06-27 13:50:04 +01:00
dbb24286ff
Separate stopping and destruction so web server can be restarted
...
Previously, when a Servlet-based WebServer was stopped it would also
stop the ServletContext. This led to problems as Tomcat and Undertow
would then not allow a restart. Jetty would allow a restart but
duplicate servlet registrations would then be attempted.
This commit modifies the WebServer lifecycle to separate stopping
and destruction for both servlet and reactive web servers. This
allows a WebServer's stop() implementation to leave some components
running so that they can be restarted. To completely shut down a
WebServer destroy() must now be called.
Both Tomcat and Jetty WebServers have been updated to stop their
network connections when stop() is called but leave other components
running. This works with both servlet and reactive web servers.
Note that an Undertow-based Servlet web server does not support
stop and restart. Once stopped, a Servlet Deployment cannot be
restarted and it does not appear to be possible to separate the
lifecycle of its network connections and a Servlet deployment.
Reactor Netty and Undertow-based reactive web servers can now also
be stopped and then restarted. Calling stop() stops the whole server
but this does not cause a problem as there's no (application-exposed)
ServletContext involved. There may be room to optimize this in the
future if the need arises.
Closes gh-34955
2023-06-26 20:58:59 +01:00
47cc65d912
Merge branch '3.1.x'
...
Closes gh-36056
2023-06-23 16:12:58 -06:00
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
c32877493c
Merge branch '3.1.x'
...
Closes gh-36055
2023-06-23 15:47:00 -06:00
b9b314622f
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36054
2023-06-23 15:46:44 -06:00
4a3abdd7c3
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36053
2023-06-23 15:46:27 -06:00
59d4bf97a1
Add Javadoc since to ImageReference.inTaglessForm()
...
See gh-36048
2023-06-23 15:45:29 -06:00
67725d4781
Merge branch '3.1.x'
...
Closes gh-36052
2023-06-23 15:26:53 -06:00
ea41a22284
Fix typo in docker compose service connections note
...
See gh-36016
2023-06-23 15:25:30 -06:00
90dd7449bb
Merge branch '3.1.x'
...
Closes gh-36051
2023-06-23 15:20:25 -06:00
92b2573a60
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36050
2023-06-23 15:20:06 -06:00
eeeb2ad72a
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36049
2023-06-23 15:19:44 -06:00
4a2c9d99dc
Remove redundant Files.delete() calls in tests
...
See gh-35986
2023-06-23 15:14:59 -06:00
493987fc1a
Allow key password to be set for a PemSslStoreBundle
...
Closes gh-35983
2023-06-23 14:40:42 -06:00
b645eb32ac
Remove deprecated code that was to be removed in 3.2
...
Closes gh-36034
2023-06-23 18:14:22 +01:00
357c67a999
Merge branch '3.1.x'
2023-06-23 15:58:51 +01:00
3f7fe25cb9
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36044
2023-06-23 15:58:36 +01:00
2fae5de245
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36043
2023-06-23 15:50:02 +01:00
d2966e1cbf
Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
...
See gh-35915
2023-06-23 12:38:12 +01:00
f9da30faf1
Replace calls to verifyComplete() to avoid indefinite blocking
...
See gh-35915
2023-06-23 12:16:26 +01:00
8f7fdc507e
Polish CorrelationIdFormatter
2023-06-23 08:26:32 +02:00
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
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
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
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
3a796aedea
Merge branch '3.1.x'
2023-06-22 00:28:01 -07:00
31f218c4e0
Merge branch '3.0.x' into 3.1.x
2023-06-22 00:27:51 -07:00
9db3c5a2f7
Polish
2023-06-22 00:24:39 -07:00
16265e925d
Merge branch '3.1.x'
2023-06-21 23:44:18 -07:00
8ac5dc7ea3
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36017
2023-06-21 23:44:06 -07:00
f7af1bab5b
Upgrade to Spring WS 4.0.5
...
Closes gh-36010
2023-06-21 23:40:28 -07:00
64525fb566
Merge branch '3.1.x'
2023-06-21 16:49:32 -07:00
eb72d7e9f1
Merge branch '3.0.x' into 3.1.x
2023-06-21 16:49:24 -07:00
5c8ed944ca
Start building against Spring WS 4.0.5 snapshots
...
See gh-36010
2023-06-21 16:49:12 -07:00
f6841c3c16
Revert "Start building against Spring WS 3.1.7 snapshots"
...
This reverts commit 5e963b02a7
2023-06-21 20:55:10 +01:00
212acf44f7
Merge branch '3.1.x'
2023-06-21 12:28:20 -07:00
7a2fc9e636
Fix checkstyle violation
...
See gh-35914
2023-06-21 12:27:56 -07:00
2ce36b15b3
Merge branch '3.1.x'
2023-06-21 12:11:07 -07:00
3c7fbf3423
Polish 'Apply SslConfigurer in addition to configured mappers'
...
See gh-35914
2023-06-21 12:10:36 -07:00
e6b5322f3e
Apply SslConfigurer in addition to configured mappers
...
Update `ReactorClientHttpConnectorFactory` to that SSL configuration
is applied in addition to any configured mappers.
Prior to this commit, SSL configuration would prevent configured
mappers from being applied.
See gh-35914
2023-06-21 12:10:36 -07:00
7f5351c7b0
Merge branch '3.1.x'
2023-06-21 19:06:32 +01:00
b770ffc160
Fully prepare connection when using SSL bundle
...
Fixes gh-36007
2023-06-21 19:05:44 +01:00
295702003d
Merge branch '3.1.x'
2023-06-21 15:29:38 +01:00
7266d4863b
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36009
2023-06-21 15:29:23 +01:00
39c382713b
Initialize WebSocket infrastructure when using WebFlux and Jetty
...
In Spring Framework 5.x with Jetty 9, the reactive
JettyRequestUpgradeStrategy was able to initialize Jetty's WebSocket
infrastructure itself. With Jetty 10 this is no longer possible and
Boot must perform the initialization as part of preparing the
reactive JettyWebServer.
This commit updates the reactive WebSocket auto-configuration to
initialize Jetty's WebSocket infrastructure as part of creating the
reactive JettyWebServer.
Fixes gh-33347
2023-06-21 14:59:50 +01:00
fc403f4f18
Merge branch '3.1.x'
2023-06-21 13:15:06 +01:00
d3522a78a8
Merge branch '3.0.x' into 3.1.x
2023-06-21 13:14:46 +01:00
641f00f24c
Disable test when Java version is too high
...
Gradle 7.3.3 does not support Java 20 so the test that verifies that
the plugin fails fast when running on a version of Gradle that it
does not support needs to be disabled on Java 20 and later.
See gh-35931
2023-06-21 13:12:20 +01:00
68aec97ee7
Merge branch '3.1.x'
2023-06-21 12:44:06 +01:00
5b69580d5d
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36004
2023-06-21 12:43:48 +01:00
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
b394553b30
Merge branch '3.1.x'
2023-06-21 12:11:06 +01:00
660dbb9afd
Fix Maven-built native images with Docker Compose dependency
...
Previously, we tried to prevent spring-boot-docker-compose from
causing problems with AOT and native images by excluding it from
the AOT processing classpath. This allowed AOT processing to
succeed. We cannot apply the same exclusion to the native image
classpath so spring-boot-docker-compose was still included in the
native image. This results in a failure at runtime due to missing
reflection hints.
This commit reverts that changes that excluded
spring-boot-docker-compose from the AOT processing classpath. This
allows AOT processing to generate reflection hints but reintroduces
the failure caused by the connection details bean definitions using
an instance supplier callback. To overcome this problem we disable
DockerComposeLifecycleManager during AOT processing and in a native
image. This ensures that no attempt is made to call docker compose up
and no connection details beans are defined.
Fixes gh-35676
2023-06-21 11:44:30 +01:00
35ee52275e
Upgrade to Spring Integration 6.0.6
...
Closes gh-35740
2023-06-21 11:06:49 +01:00
e2b6384462
Merge branch '3.1.x'
2023-06-21 11:03:02 +01:00
5384872cbd
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36003
2023-06-21 11:02:47 +01:00
2fd5319eda
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36002
2023-06-21 11:02:34 +01:00
0fb4c9a095
Prohibit upgrades to RSocket 1.1.4
...
Closes gh-35798
2023-06-21 10:55:48 +01:00
5a70198880
Merge branch '3.1.x'
2023-06-21 10:52:45 +01:00
5cda56cc68
Upgrade to Spring Integration 6.1.1
...
Closes gh-35859
2023-06-21 10:51:42 +01:00
818f096890
Merge branch '3.1.x'
2023-06-21 10:46:35 +01:00
Phillip Webb
Andy Wilkinson
Roman Golovin
Johnny Lim
Eddú Meléndez
Yanming Zhou
Bernardo Bulgarelli
Arjen Poutsma
Ivo Smid
Laurent Martelli
Lasse Lindqvist
Ahmed Ashour
Eyðun Nielsen
Gary Russell
Moritz Halbritter
JuHyeong Ahn
Scott Frederick
James Stansell
ThomazPassarelli
Jonatan Ivanov
Fernando Cappi