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
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
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
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
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
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
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
Moritz Halbritter
3d4a9dd059
Polish StandardConfigDataResource
2023-10-31 09:49:01 +01:00
Moritz Halbritter
e7c26b9410
Polish BeanDefinitionLoader
2023-10-31 09:49:01 +01:00
Moritz Halbritter
f3c10ae97b
Polish JsonStream
2023-10-31 09:49:01 +01:00
Moritz Halbritter
1f41179a88
Polish SpringBootMockMvcBuilderCustomizer
2023-10-31 09:49:01 +01:00
Moritz Halbritter
d095a5e47d
Polish RestartApplicationListenerTests
2023-10-31 09:49:01 +01:00
Moritz Halbritter
9152217c96
Fix JUnit's @Nested usage
2023-10-31 09:49:01 +01:00
Moritz Halbritter
627a821d5f
Polish ReactiveTokenValidator
2023-10-31 09:49:01 +01:00
Andy Wilkinson
d2325d1110
Upgrade to Oracle Database 23.3.0.23.09
...
Closes gh-38121
2023-10-30 20:42:24 +00:00
Andy Wilkinson
5765f9410c
Upgrade to Liquibase 4.24.0
...
Closes gh-38120
2023-10-30 20:41:49 +00:00
Andy Wilkinson
94e810201e
Fix test for incremental build of renamed properties class
...
Previously, the .class file for the renamed properties class was
on the class path of the compilation in two places:
1. The output directory of the test's previous compilation
2. The output directory of the compilation of src/test/java of
spring-boot-configuration-processor
The first of these locations is addressed by updating TestProject.
The .class file is now deleted from the project's output location
at the same time as the .java file is deleted from its source
location.
The second of these locations is addressed by configuring the class
path of the compiler to include a copy of the result of compiling
src/test/java of spring-boot-configuration-processor. From this copy
entries can then be deleted as needed without destabilizing other tests.
Closes gh-26271
2023-10-30 15:17:28 +00:00
Andy Wilkinson
aa16c2aa5b
Merge branch '3.1.x'
...
Closes gh-38117
2023-10-30 12:07:37 +00:00
Andy Wilkinson
f6b6f7aa5a
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38116
2023-10-30 12:07:26 +00:00
Andy Wilkinson
9aae29b60b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38115
2023-10-30 12:07:09 +00:00
Andy Wilkinson
c999d987a9
Improve systemd configuration documentation
...
Closes gh-28453
2023-10-30 12:06:04 +00:00
Andy Wilkinson
97c2311dee
Merge branch '3.1.x'
...
Closes gh-38114
2023-10-30 11:14:01 +00:00
Andy Wilkinson
3be8475089
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38113
2023-10-30 11:13:43 +00:00
Andy Wilkinson
aaa26c90a8
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38112
2023-10-30 11:13:25 +00:00
Andy Wilkinson
f78dcac56f
Clarify that @AutoConfigureWebTestClient uses mock infrastructure
...
Closes gh-29890
2023-10-30 11:13:03 +00:00
Moritz Halbritter
da078d11bb
Merge branch '3.1.x'
...
Closes gh-38111
2023-10-30 10:09:10 +01:00
Moritz Halbritter
d84808e436
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38110
2023-10-30 10:09:00 +01:00
Moritz Halbritter
633ce644e2
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38109
2023-10-30 10:08:48 +01:00
Moritz Halbritter
0d8ea44f5b
Fix MyErrorWebExceptionHandler in documentation
...
Closes gh-38104
2023-10-30 10:07:49 +01:00
Johnny Lim
1b6431c219
Fix shouldStopKeepAliveThreadIfContextIsClosed()
...
See gh-38103
2023-10-30 09:26:16 +01:00
Moritz Halbritter
4ac654717a
Merge branch '3.1.x'
...
Closes gh-38108
2023-10-30 09:21:55 +01:00
Moritz Halbritter
b5dab09142
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38107
2023-10-30 09:21:47 +01:00
Moritz Halbritter
57ddb20cc9
Clarify that Spring AOT imposes further restrictions
...
Closes gh-35032
2023-10-30 09:14:57 +01:00
Andy Wilkinson
399281716b
Merge branch '3.1.x'
...
Closes gh-38097
2023-10-27 18:34:24 +01:00
Andy Wilkinson
b37164c4fd
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38096
2023-10-27 18:34:10 +01:00
Andy Wilkinson
bf195798ce
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38095
2023-10-27 18:24:33 +01:00
Andy Wilkinson
d9e71f7a67
Add documentation section on AOP
...
Closes gh-32642
2023-10-27 17:50:24 +01:00
Andy Wilkinson
4e0dd34bbb
Merge branch '3.1.x'
...
Closes gh-38090
2023-10-27 17:01:27 +01:00
Andy Wilkinson
9703ab717d
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38089
2023-10-27 17:01:10 +01:00
Andy Wilkinson
dc31ee1184
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38088
2023-10-27 17:00:52 +01:00