Commit Graph

50613 Commits

Author SHA1 Message Date
Moritz Halbritter
d59b385304 Merge branch '3.1.x'
Closes gh-38226
2023-11-06 10:27:50 +01:00
Moritz Halbritter
3560a13d57 Merge branch '3.0.x' into 3.1.x
Closes gh-38225
2023-11-06 10:27:42 +01:00
Moritz Halbritter
d126a948c3 Merge pull request #38217 from quaff
* pr/38217:
  Use switch expression where feasible

Closes gh-38217
2023-11-06 10:27:24 +01:00
Yanming Zhou
d7ab153559 Use switch expression where feasible
See gh-38217
2023-11-06 10:27:04 +01:00
Moritz Halbritter
0621288544 Merge branch '3.1.x'
Closes gh-38224
2023-11-06 09:02:03 +01:00
Moritz Halbritter
9cbc686499 Merge branch '3.0.x' into 3.1.x
Closes gh-38223
2023-11-06 09:01:56 +01:00
Moritz Halbritter
a006b26437 Merge branch '2.7.x' into 3.0.x
Closes gh-38222
2023-11-06 09:01:46 +01:00
Moritz Halbritter
30bd1f9ccb Merge pull request #38207 from dreis2211
* pr/38207:
  Remove obsolete spring-boot-deployment-tests directory

Closes gh-38207
2023-11-06 09:01:07 +01:00
Christoph Dreis
3f7ece5418 Remove obsolete spring-boot-deployment-tests directory
See gh-38207
2023-11-06 09:00:39 +01:00
Moritz Halbritter
a944815e3c Merge branch '3.1.x'
Closes gh-38221
2023-11-06 08:58:16 +01:00
Moritz Halbritter
e84ae78ff5 Merge pull request #38216 from eddumelendez
* pr/38216:
  Polish RabbitAutoConfiguration

Closes gh-38216
2023-11-06 08:58:05 +01:00
Eddú Meléndez
674f8fbb8d Polish RabbitAutoConfiguration
See gh-38216
2023-11-06 08:57:19 +01:00
Moritz Halbritter
9fc3ef7c93 Merge branch '3.1.x'
Closes gh-38220
2023-11-06 08:45:06 +01:00
Moritz Halbritter
7829e760da Switch JsonMapper in Docker JSON parsing to english locale
Closes gh-37648
2023-11-06 08:41:10 +01:00
Phillip Webb
4bc63b579a Merge branch '3.1.x'
Closes gh-38215
2023-11-05 13:37:02 -08:00
Phillip Webb
f6910bae16 Document that PEM content can be used directly in application.yaml
Closes gh-38210
2023-11-05 13:36:38 -08:00
Phillip Webb
06e196c4a6 Merge branch '3.1.x'
Closes gh-38214
2023-11-05 13:34:21 -08:00
Phillip Webb
4aba45d9fb Merge branch '3.0.x' into 3.1.x
Closes gh-38213
2023-11-05 13:33:59 -08:00
Phillip Webb
7f90364c78 Merge branch '2.7.x' into 3.0.x
Closes gh-38212
2023-11-05 13:33:44 -08:00
Phillip Webb
06434f050a Upgrade to Spring Asciidoctor Extensions 0.6.3
Closes gh-38211
2023-11-05 13:33:02 -08:00
Phillip Webb
f69ea372ea Merge branch '3.1.x' 2023-11-05 11:19:26 -08:00
Phillip Webb
0ea75f0f65 Polish 2023-11-05 10:53:25 -08:00
Phillip Webb
c0f8b90d31 Return getLastModified result from JarUrlConnection
Update `JarUrlConnection` and `NestedUrlConnection` so that calls
to `getLastModified()` and `getHeaderFieldDate("last-modified", 0)`
always return a result.

Fixes gh-38204
2023-11-04 19:43:54 -07:00
Moritz Halbritter
d6c28b3fc7 Merge branch '3.1.x'
Closes gh-38198
2023-11-03 12:28:38 +01:00
Moritz Halbritter
fb1a4ba470 Merge branch '3.0.x' into 3.1.x
Closes gh-38197
2023-11-03 12:28:22 +01:00
Moritz Halbritter
6b69525291 Merge branch '2.7.x' into 3.0.x
Closes gh-38196
2023-11-03 12:28:11 +01:00
Moritz Halbritter
18f9dc9b94 Document that customizers are not applied to additional connectors
Closes gh-38183
2023-11-03 12:27:55 +01:00
Andy Wilkinson
9eda564d06 Fix check for using CoordinatedRestoreAtCheckpointStartup
Closes gh-38186
2023-11-03 09:58:13 +00:00
Scott Frederick
4d0b50e967 Merge pull request #38057 from Wzy19930507
* pr/38057:
  Polish "Add observationEnabled properties for Apache Kafka"
  Add observationEnabled properties for Apache Kafka

Closes gh-38057
2023-11-02 17:17:45 -05:00
Scott Frederick
55ab56f8d9 Polish "Add observationEnabled properties for Apache Kafka"
See gh-38057
2023-11-02 17:05:17 -05:00
Zhiyang.Wang1
ff9d9de1ee Add observationEnabled properties for Apache Kafka
See gh-38057
2023-11-02 17:05:17 -05:00
Phillip Webb
9ba46f538b Polish 2023-11-02 14:24:05 -07:00
Phillip Webb
cc4ef32efe Merge branch '3.1.x' 2023-11-02 14:19:12 -07:00
Phillip Webb
47c1088111 Polish 2023-11-02 14:19:07 -07:00
Phillip Webb
77218a644e Merge branch '3.1.x' 2023-11-02 14:16:37 -07:00
Phillip Webb
afa4d274c2 Merge branch '3.0.x' into 3.1.x 2023-11-02 14:14:19 -07:00
Phillip Webb
8d53caa1c6 Merge branch '2.7.x' into 3.0.x 2023-11-02 14:13:47 -07:00
Phillip Webb
54313d1962 Update copyright year of changed files 2023-11-02 14:13:38 -07:00
Phillip Webb
e891a3e24c Polish adoc formatting 2023-11-02 14:12:56 -07:00
Scott Frederick
99986a2fdd Polish SSL internals 2023-11-02 14:41:06 -05:00
Moritz Halbritter
d3f177be71 Polish SSL 2023-11-02 09:36:06 +01:00
Phillip Webb
a35fb7505f Merge branch '3.1.x'
Closes gh-38179
2023-11-01 18:22:39 -07:00
Phillip Webb
683d791104 Merge branch '3.0.x' into 3.1.x
Closes gh-38178
2023-11-01 18:22:28 -07:00
Phillip Webb
e5c8723dda Merge branch '2.7.x' into 3.0.x
Closes gh-38177
2023-11-01 18:22:06 -07:00
Phillip Webb
eecb15d1ba Rename startDaemonAwaitThread() inside TomcatWebServer to match intent
Closes gh-38155
2023-11-01 18:21:36 -07:00
Phillip Webb
663243e60c Fix open telemetry container lifecycle issues
Mark test as `@DirtiesContext` so that the context is closed before
the container.

Closes gh-38176
2023-11-01 18:16:38 -07:00
Phillip Webb
9b71ef4114 Polish and refactor some SSL internals
Polish and refactor some of the internal SSL code to make it easier to
add additional functionality in the future.
2023-11-01 16:14:59 -07:00
Phillip Webb
30a7426e86 Apply key property to the keystore and not to the truststore
Update `PropertiesSslBundle` so that key properties are now
only applied to the keystore and not the truststore.

Closes gh-38125
2023-11-01 16:10:51 -07:00
Phillip Webb
5dc5c2a4bc Rename KeyVerifier to CertificateMatcher
Rename `KeyVerifier` to `CertificateMatcher` and refactor some
of the internals. This commit also adds test helper classes to
help simplify some of the tests.

See gh-38173
2023-11-01 16:10:31 -07:00
Phillip Webb
1b61bc1f20 Move PEM verification to spring-boot-autoconfigure
Move `KeyVerifier` to spring-boot-autoconfigure to reduce the
public API required in `PemSslStoreBundle`.

This commit also moves the verify property so that is can be set
per store.

Closes gh-38173
2023-11-01 16:10:16 -07:00