Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
46,101 Commits 23 Branches 0 Tags
9fc3ef7c93b0462b3f1ec56d02ddd7e4d0c3e90a
Commit Graph

46101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Phillip Webb
5e5d2265f5 Introduce PemSslStore as an alternative to PemSslStoreDetails. 
Add a `PemSslStore` interface that can be used as an alternative
to `PemSslStoreDetails` when PEM content has already been loaded
and parsed.

Closes gh-38175
 2023-11-01 16:06:28 -07:00
Phillip Webb
2b39ec6f60 Introduce a public PemContent class 
Update `PemContent` so that it now holds PEM data and is public.
This update is required so that in the future we can make use of
our PEM parsing code in spring-boot-autoconfigure.

Closes gh-38174
 2023-11-01 16:02:51 -07:00
Phillip Webb
2c6fca8df7 Allow alias and password to be configured on a per PEM store basis 
Closes gh-38124
 2023-11-01 16:02:33 -07:00
Phillip Webb
8bf847e549 Rename keyAlias parameter to alias 
Rename the keyAlais parameter to alias since it may be used as either
the key alias or the certificate alias.

Also clarify the javadoc for keyPassword.

Closes gh-38099
 2023-11-01 16:01:46 -07:00
Scott Frederick
95e048c933 Merge branch '3.1.x' 
Closes gh-38172
 2023-11-01 17:11:22 -05:00
Scott Frederick
7611ce1f13 Merge branch '3.0.x' into 3.1.x 
Closes gh-38171
 2023-11-01 17:10:59 -05:00
Scott Frederick
b92ec494fb Merge branch '2.7.x' into 3.0.x 
Closes gh-38170
 2023-11-01 17:10:33 -05:00
Scott Frederick
1b32baaadc Upgrade CI to Docker 24.0.7 
Closes gh-38169
 2023-11-01 17:10:17 -05:00
Andy Wilkinson
890a3e72ac Repair file channel when it's closed by interruption 
When an interrupted that calls FileChannel.read, the channel is
closed and the read fails with a ClosedByInterruptException. The
closure of the channel makes it unusable by other threads. To
allow other threads to read from the data block, this commit
recreates the FileChannel when a read fails on an interrupted
thread with a ClosedByInterruptException. The exception is then
rethrown to continue the thread's interruption.

Closes gh-38154
 2023-11-01 17:12:43 +00:00
Andy Wilkinson
173e6543fd Merge branch '3.1.x' 
Closes gh-38168
 2023-11-01 15:06:20 +00:00
Andy Wilkinson
40ce6182a1 Merge branch '3.0.x' into 3.1.x 
Closes gh-38167
 2023-11-01 15:03:29 +00:00
Andy Wilkinson
b7f00c1087 Merge branch '2.7.x' into 3.0.x 
Closes gh-38166
 2023-11-01 15:02:54 +00:00