Commit Graph

50613 Commits

Author SHA1 Message Date
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
Andy Wilkinson
48ef78bddd Merge pull request #38153 from dreis2211
* gh-38153:
  Fix typos in method names

Closes gh-38153
2023-11-01 15:00:24 +00:00
Christoph Dreis
990afd844f Fix typos in method names
See gh-38153
2023-11-01 14:59:49 +00:00
Andy Wilkinson
8f2ec22738 Merge branch '3.1.x'
Closes gh-38152
2023-10-31 11:50:42 +00:00
Andy Wilkinson
1fcf1fcc20 Merge branch '3.0.x' into 3.1.x
Closes gh-38151
2023-10-31 11:50:32 +00:00
Andy Wilkinson
8f4ea6834d Merge branch '2.7.x' into 3.0.x
Closes gh-38150
2023-10-31 11:50:18 +00:00
Andy Wilkinson
020c2b364e Fix handling of value that overflows an int
Closes gh-38146
2023-10-31 11:47:14 +00:00
Andy Wilkinson
5de0f82f64 Merge branch '3.1.x'
Closes gh-38149
2023-10-31 11:33:58 +00:00
Andy Wilkinson
cbcde9107b Merge branch '3.0.x' into 3.1.x
Closes gh-38148
2023-10-31 11:33:05 +00:00
Andy Wilkinson
cb18d87ac9 Merge branch '2.7.x' into 3.0.x
Closes gh-38147
2023-10-31 11:30:09 +00:00
Andy Wilkinson
747291c0b7 Clarify docs on when application.* banner properties will work
Closes gh-33489
2023-10-31 11:28:17 +00:00
Moritz Halbritter
bdc5c05a83 Merge branch '3.1.x'
Closes gh-38145
2023-10-31 11:21:56 +01:00
Moritz Halbritter
87d6d518c4 Explain what happens if docker compose is already running
Closes gh-36483
2023-10-31 11:21:48 +01:00
Moritz Halbritter
de1ca5e60f Polish DockerComposeLifecycleManager 2023-10-31 11:18:39 +01:00
Andy Wilkinson
1ef66d2e39 Upgrade to Spring WS 4.0.7
Closes gh-38144
2023-10-31 09:43:21 +00:00
Andy Wilkinson
e0169e7cf1 Upgrade to Spring Framework 6.1.0-RC2
Closes gh-37995
2023-10-31 09:43:20 +00:00
Andy Wilkinson
8a925b6858 Upgrade to SAAJ Impl 3.0.3
Closes gh-38143
2023-10-31 09:43:20 +00:00
Andy Wilkinson
8a2c0f18ac Upgrade to Pulsar 3.1.1
Closes gh-38142
2023-10-31 09:43:20 +00:00
Andy Wilkinson
2d67957cbb Upgrade to Native Build Tools Plugin 0.9.28
Closes gh-38141
2023-10-31 09:43:20 +00:00
Andy Wilkinson
719545d9ab Upgrade to MSSQL JDBC 12.4.2.jre11
Closes gh-38140
2023-10-31 09:43:19 +00:00
Andy Wilkinson
053edc04a5 Upgrade to Maven Dependency Plugin 3.6.1
Closes gh-38139
2023-10-31 09:43:19 +00:00
Andy Wilkinson
37a8fc3206 Upgrade to Maven Clean Plugin 3.3.2
Closes gh-38138
2023-10-31 09:43:19 +00:00
Andy Wilkinson
58be0ddf36 Upgrade to Log4j2 2.21.1
Closes gh-38137
2023-10-31 09:43:18 +00:00
Andy Wilkinson
20a6b7a9bc Upgrade to Kotlin 1.9.20
Closes gh-38136
2023-10-31 09:43:18 +00:00
Andy Wilkinson
f699e9b77d Upgrade to Jetty 12.0.3
Closes gh-38135
2023-10-31 09:43:18 +00:00
Andy Wilkinson
72450bfe95 Upgrade to Jetty Reactive HTTPClient 4.0.1
Closes gh-38134
2023-10-31 09:43:18 +00:00
Andy Wilkinson
6796be0939 Upgrade to Jedis 5.0.2
Closes gh-38133
2023-10-31 09:43:17 +00:00
Andy Wilkinson
7ee35a8378 Upgrade to Jakarta XML WS 4.0.1
Closes gh-38132
2023-10-31 09:43:17 +00:00
Andy Wilkinson
fd1fdafe31 Upgrade to Jakarta XML SOAP 3.0.1
Closes gh-38131
2023-10-31 09:43:17 +00:00
Andy Wilkinson
e0a50e1784 Upgrade to Jakarta Json 2.1.3
Closes gh-38130
2023-10-31 09:43:17 +00:00
Andy Wilkinson
7ee570a383 Upgrade to Hazelcast 5.3.5
Closes gh-38129
2023-10-31 09:43:16 +00:00
Andy Wilkinson
f7ccd00d79 Upgrade to Glassfish JAXB 4.0.4
Closes gh-38128
2023-10-31 09:43:16 +00:00
Andy Wilkinson
90d6b53a27 Upgrade to Artemis 2.31.2
Closes gh-38127
2023-10-31 09:43:16 +00:00
Andy Wilkinson
00987feb81 Upgrade to ActiveMQ 5.18.3
Closes gh-38126
2023-10-31 09:43:15 +00:00
Andy Wilkinson
9b7d8cacc3 Update upgrade policy for the RC phase 2023-10-31 09:43:15 +00:00
Moritz Halbritter
20edbb402f Merge branch '3.1.x' 2023-10-31 10:23:13 +01:00
Moritz Halbritter
607ed86edb Merge branch '3.0.x' into 3.1.x 2023-10-31 10:23:01 +01:00
Moritz Halbritter
dccf378d49 Polish CloudFoundryActuatorAutoConfiguration 2023-10-31 10:09:44 +01:00
Moritz Halbritter
e0985331c0 Polish ReactiveCloudFoundrySecurityService 2023-10-31 09:56:35 +01:00