Commit Graph

23415 Commits

Author SHA1 Message Date
Andy Wilkinson 6d46c24db7 Merge branch '2.7.x' into 3.0.x
Closes gh-38266
2023-11-08 15:58:40 +00:00
Andy Wilkinson 7c73a034b6 Improve backwards- and forwards-compatibility of Flyway auto-config
Closes gh-38164
2023-11-08 15:17:49 +00:00
Phillip Webb dbbde18d41 Attempt to fix Windows build failure due to open files
See gh-38204
2023-11-08 07:04:46 -08:00
Moritz Halbritter 4a851c1c90 Merge branch '3.1.x' 2023-11-08 09:53:53 +01:00
Moritz Halbritter 357c2124c4 Merge branch '3.0.x' into 3.1.x 2023-11-08 09:53:40 +01:00
Moritz Halbritter 0a6b723098 Merge branch '2.7.x' into 3.0.x 2023-11-08 09:53:29 +01:00
Moritz Halbritter 66ed4fe519 Remove system property dependency from MockBeanContextCachingTests
Now this test can be run regardless of the
'spring.test.context.cache.maxSize' system property value.

See gh-38236
2023-11-08 09:49:35 +01:00
Phillip Webb 690cfa220a Provide a way to create custom ApplicationContextFactory
Update `SpringBootContextLoader` so that `getApplicationContextFactory`
is now a protected that may be overridden to provide a custom
`ApplicationContextFactory` instance.

Closes gh-38205
2023-11-07 11:53:10 -08:00
Andy Wilkinson 47cac96dfe Merge branch '3.1.x'
Closes gh-38253
2023-11-07 11:25:09 +00:00
Andy Wilkinson b2c5976920 Merge branch '3.0.x' into 3.1.x
Closes gh-38252
2023-11-07 11:23:06 +00:00
Andy Wilkinson 36161719e3 Merge branch '2.7.x' into 3.0.x
Closes gh-38251
2023-11-07 11:22:49 +00:00
Andy Wilkinson 8fc59e3367 Improve bom checking and address reported problems
Closes gh-38250
2023-11-07 11:18:19 +00:00
Moritz Halbritter b9a5bdc294 Merge branch '3.1.x'
Closes gh-38249
2023-11-07 11:28:52 +01:00
Moritz Halbritter e549380a59 Merge branch '3.0.x' into 3.1.x
Closes gh-38248
2023-11-07 11:28:20 +01:00
Moritz Halbritter 3664877d80 Merge branch '2.7.x' into 3.0.x
Closes gh-38247
2023-11-07 11:24:16 +01:00
Moritz Halbritter fc6d4ef2c0 Improve commandline help for encodepassword command in the CLI
Closes gh-38203
2023-11-07 11:22:22 +01:00
Moritz Halbritter e3210e72d5 Polish "Report friendly error when failing to find AOT initializer"
See gh-38188
2023-11-07 10:37:27 +01:00
Yanming Zhou 8126d2652d Report friendly error when failing to find AOT initializer
See gh-38188
2023-11-07 10:37:13 +01:00
Johnny Lim 1f22f6ed64 Remove obsolete prohibit for Undertow library
See gh-38228
2023-11-07 10:22:47 +01:00
Moritz Halbritter b9946bd029 Merge branch '3.1.x'
Closes gh-38243
2023-11-07 10:21:13 +01:00
Jake 8932de0fe2 Fix typo
See gh-38241
2023-11-07 10:07:14 +01:00
Andy Wilkinson 08a4a836aa Merge branch '3.1.x'
Closes gh-38233
2023-11-06 14:26:09 +00:00
Andy Wilkinson b01235e68d Copy attributes from runtimeClasspath to productionRuntimeClasspath
Fixes gh-38209
2023-11-06 11:50:27 +00:00
Moritz Halbritter dbe882aced Merge branch '3.1.x'
Closes gh-38231
2023-11-06 12:11:25 +01:00
Moritz Halbritter f381a9c69d Merge branch '3.0.x' into 3.1.x
Closes gh-38230
2023-11-06 12:11:17 +01:00
Moritz Halbritter 0d5a658932 Merge branch '2.7.x' into 3.0.x
Closes gh-38229
2023-11-06 12:11:07 +01:00
Moritz Halbritter 6c5cb57afd Document how to populate test data using Flyway and Liquibase
Closes gh-26796
2023-11-06 12:07:49 +01:00
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
Yanming Zhou d7ab153559 Use switch expression where feasible
See gh-38217
2023-11-06 10:27:04 +01:00
Moritz Halbritter a944815e3c Merge branch '3.1.x'
Closes gh-38221
2023-11-06 08:58:16 +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 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 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
Andy Wilkinson e1203b7e28 Document that WRITE_DURATIONS_AS_TIMESTAMPS is disabled by default
Closes gh-38083
2023-10-27 17:00:26 +01:00
Moritz Halbritter e3a36b7db5 Merge branch '3.1.x'
Closes gh-38082
2023-10-27 14:39:31 +02:00
Moritz Halbritter 02fae03e83 Merge branch '3.0.x' into 3.1.x
Closes gh-38081
2023-10-27 14:39:22 +02:00
Moritz Halbritter 07f7435b6a Document native image limitation of ApplicationContextRunner
Closes gh-34007
2023-10-27 14:39:10 +02:00
Moritz Halbritter 0e63326beb Merge branch '3.1.x'
Closes gh-38080
2023-10-27 14:21:26 +02:00
Moritz Halbritter 140ba4039d Merge branch '3.0.x' into 3.1.x
Closes gh-38079
2023-10-27 14:20:07 +02:00
Moritz Halbritter 43a3fbf449 Move "Sanitize Sensitive Values" in docs
Closes gh-35917
2023-10-27 14:16:48 +02:00
Moritz Halbritter f66c76e2a8 Merge branch '3.1.x'
Closes gh-38078
2023-10-27 13:47:23 +02:00
Moritz Halbritter 5ca7201fa5 Fix "Integrating with Actuator" code snippet
Closes gh-36114
2023-10-27 13:47:02 +02:00
Moritz Halbritter a0a56cb38b Merge branch '3.0.x' into 3.1.x
Closes gh-38076
2023-10-27 13:28:33 +02:00
Moritz Halbritter 8a27326ba6 Add warning when downgrading to Servlet 5.0 to docs
Closes gh-33044
2023-10-27 13:28:10 +02:00
Moritz Halbritter 10b392f38b Merge branch '3.1.x'
Closes gh-38075
2023-10-27 13:26:23 +02:00
Moritz Halbritter 1d767fc7b7 Merge branch '3.0.x' into 3.1.x
Closes gh-38074
2023-10-27 13:25:41 +02:00
Moritz Halbritter b4721c9d62 Update "Use Another Web Server" documentation
Closes gh-37238
2023-10-27 13:22:46 +02:00
Moritz Halbritter 79f8bfaeb7 Merge branch '3.1.x'
Closes gh-38073
2023-10-27 10:55:10 +02:00
Moritz Halbritter 790ee9afb5 Add FailureAnalyzer for NoSuchHealthContributorFailureExceptions
Closes gh-36489
2023-10-27 10:48:48 +02:00
Moritz Halbritter 7a767b90fe Merge branch '3.1.x'
Closes gh-38072
2023-10-27 10:18:46 +02:00
Moritz Halbritter 86a1fb0949 Merge branch '3.0.x' into 3.1.x
Closes gh-38071
2023-10-27 10:18:31 +02:00
Moritz Halbritter 87742e8ee1 Merge branch '2.7.x' into 3.0.x
Closes gh-38070
2023-10-27 10:18:20 +02:00
Moritz Halbritter 3872ec868b Mention ForwardedHeaderTransformer in the documentation
Closes gh-37282
2023-10-27 10:17:29 +02:00
Moritz Halbritter 35aa28485a Merge branch '3.1.x'
Closes gh-38069
2023-10-27 09:50:57 +02:00
Moritz Halbritter 8bb2228adf Document how to unset maven.compiler.release
Closes gh-37993
2023-10-27 09:50:12 +02:00
Phillip Webb beb49e1933 Add tests for DataBlockInputStream and fix implementation oddities
Fix issues with `DataBlockInputStream` including the fact that remain
bytes were not tracked correctly. Also add some tests and fix a few
other unusual details with the implementation.

Closes gh-38066
2023-10-26 23:00:20 -07:00
Phillip Webb 4af9ed4d1d Fix Tomcat TldScanner issues by returning raw zip data for nested jars
Update JarUrlConnection so that the full raw zip data is returned from
nested jars when no entry name is specified. This update allows
Tomcat's `WarURLConnection` to work with our nested connections since
they can parse the returned raw zip data.

Fixes gh-38047
2023-10-26 23:00:20 -07:00
Phillip Webb bba323ba5f Copy zip data descriptor records when creating virtual zip data
The zip specification states that when 'bit 3' of the general purpose
flags is set then a data descriptor record must be present. Prior to
this commit, our `VirtualZipDataBlock` ignored such records and would
create invalid data.

Although the generated data would work for zip parsers that read the
central directory records, it causes problems with streaming reader
implementations such as `JarInputStream`.

This commit updates the code so that it now copies the data descriptor
records. It support both blocks that have a signature and those that
don't. It also updates the generation logic to correctly deal with
any extra data bytes present after the local file header record.

Fixes gh-38063
2023-10-26 23:00:20 -07:00
Moritz Halbritter 5ff4a961b1 Polish 0fbb1f7890
See gh-38029
2023-10-26 15:18:02 +02:00
Moritz Halbritter 8095c2a94b Polish "Extract "server.ports" hardcoding into a constant"
See gh-38029
2023-10-26 14:35:02 +02:00
DevSeoRex 01e2f70c73 Extract "server.ports" hardcoding into a constant
See gh-38029
2023-10-26 14:31:57 +02:00
Andy Wilkinson 670adaa651 Merge branch '3.1.x'
Closes gh-38054
2023-10-26 08:45:15 +01:00
Andy Wilkinson 045a624bc7 Merge branch '3.0.x' into 3.1.x
Closes gh-38053
2023-10-26 08:44:30 +01:00
Andy Wilkinson ce1f8d49de Merge branch '2.7.x' into 3.0.x
Closes gh-38052
2023-10-26 08:44:16 +01:00
Andy Wilkinson 1498faaf7f Document auto-configuration packages and how to add to them
Closes gh-27549
2023-10-26 08:43:57 +01:00
Phillip Webb b35c4d6497 Open loader jar URLs by default using `runtimeVersion`
Update `UrlJarFileFactory` so that `runtimeVersion` is used by default
instead of `baseVersion`. Prior to this commit we tried to mirror the
JDK handler on look for a `#runtime` fragment. This unfortunately
doesn't work with the URLs produced by `URLClassPath`.

This commit also fixes a bug in `NestedJarFile` where we didn't return
the correct result from `hasEntry`.

Fixes gh-38050
2023-10-25 21:20:42 -07:00
Phillip Webb 464523ac04 Merge branch '3.1.x'
Closes gh-38048
2023-10-25 12:37:41 -07:00
Phillip Webb 6e65d9380b Add missing `@ServiceConnection` annotation to reference doc sample
Closes gh-38046
2023-10-25 12:36:59 -07:00
Phillip Webb 0c66db7b18 Refine container initialization and parallel startup logic
Update `TestcontainersLifecycleBeanPostProcessor` to restore early
container initialization logic and refine startup logic. Initial bean
access now again triggers the creation all container beans. In addition
the first access of a `Startable` bean now attempts to find and start
all other `Startable` beans.

Fixes gh-37989
2023-10-25 11:58:22 -07:00
Scott Frederick efb5cb0bcd Merge branch '3.1.x'
Closes gh-38044
2023-10-25 13:53:19 -05:00
Scott Frederick 16c975a9c7 Merge branch '3.0.x' into 3.1.x
Closes gh-38043
2023-10-25 13:53:06 -05:00
Scott Frederick 627c93adcf Merge branch '2.7.x' into 3.0.x
Closes gh-38042
2023-10-25 13:52:54 -05:00
Scott Frederick eae95f8d17 Handle null host value in MailHealthIndicator
If both the host and port are omitted from the mail properties, the
`location` field will be omitted from the health indicator details.

Fixes gh-38007
2023-10-25 13:52:36 -05:00
Andy Wilkinson d157000536 Merge branch '3.1.x'
Closes gh-38041
2023-10-25 15:23:04 +01:00
Andy Wilkinson bbe7415eb5 Merge branch '3.0.x' into 3.1.x
Closes gh-38040
2023-10-25 15:22:54 +01:00
Andy Wilkinson bded915f9b Merge branch '2.7.x' into 3.0.x
Closes gh-38039
2023-10-25 15:22:44 +01:00
Andy Wilkinson aaaafc6ede Add a note about TestConfiguration, Import, and ordering
Closes gh-30513
2023-10-25 15:19:04 +01:00
Andy Wilkinson edd94b9f8c Merge branch '3.1.x'
Closes gh-38038
2023-10-25 15:08:05 +01:00
Andy Wilkinson 56d9de673b Merge branch '3.0.x' into 3.1.x
Closes gh-38037
2023-10-25 15:07:53 +01:00
Andy Wilkinson e4a7fd037d Merge branch '2.7.x' into 3.0.x
Closes gh-38036
2023-10-25 15:07:39 +01:00
Andy Wilkinson dc645f09b7 Add a brief mention of ConfigurationPropertyCaching
Closes gh-34172
2023-10-25 15:05:25 +01:00
Andy Wilkinson b167eb3b02 Merge branch '3.1.x' 2023-10-25 14:50:30 +01:00
Andy Wilkinson 4dea11ef96 Merge branch '3.0.x' into 3.1.x 2023-10-25 14:50:21 +01:00
Andy Wilkinson ead0c77a5b Polish
See gh-38030
2023-10-25 14:50:07 +01:00
Andy Wilkinson e2444f196f Merge branch '3.1.x'
Closes gh-38035
2023-10-25 14:41:24 +01:00
Andy Wilkinson b934e2edb5 Merge branch '3.0.x' into 3.1.x
Closes gh-38034
2023-10-25 14:41:12 +01:00
Andy Wilkinson 5bd9b1725a Merge branch '2.7.x' into 3.0.x
Closes gh-38033
2023-10-25 14:41:00 +01:00
Andy Wilkinson ea39a33337 Document server.servlet.encoding.* configuration properties
Closes gh-32472
2023-10-25 14:40:29 +01:00
Andy Wilkinson 0d1a223fee Merge branch '3.1.x'
Closes gh-38032
2023-10-25 14:08:22 +01:00
Andy Wilkinson 649117de35 Merge branch '3.0.x' into 3.1.x
Closes gh-38031
2023-10-25 14:08:10 +01:00