Commit Graph

23099 Commits

Author SHA1 Message Date
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
Andy Wilkinson
331bf51332 Merge branch '2.7.x' into 3.0.x
Closes gh-38030
2023-10-25 14:07:57 +01:00
Andy Wilkinson
666f68ea60 Document configuration for building images with Colima
Closes gh-34522
2023-10-25 14:07:43 +01:00
Andy Wilkinson
fb1912149e Merge branch '3.1.x'
Closes gh-38028
2023-10-25 12:24:55 +01:00
Andy Wilkinson
581dfbfa33 Merge branch '3.0.x' into 3.1.x
Closes gh-38027
2023-10-25 12:24:42 +01:00
Andy Wilkinson
5b80dd87d3 Merge branch '2.7.x' into 3.0.x
Closes gh-38026
2023-10-25 12:18:41 +01:00
Andy Wilkinson
9a23e13894 Add some documentation for customizing the reactive web server
Closes gh-31917
2023-10-25 12:17:45 +01:00
Andy Wilkinson
6bcd1cf937 Merge branch '3.1.x'
Closes gh-38025
2023-10-25 11:10:35 +01:00
Andy Wilkinson
f8f60d1aae Merge branch '3.0.x' into 3.1.x
Closes gh-38024
2023-10-25 11:10:22 +01:00
Andy Wilkinson
5db85a818e Merge branch '2.7.x' into 3.0.x
Closes gh-38023
2023-10-25 11:09:56 +01:00
Andy Wilkinson
a20f81b995 Mention that classpath.idx is typically generated by build plugins
Closes gh-37125
2023-10-25 11:09:17 +01:00
Andy Wilkinson
edca4901dc Merge branch '3.1.x'
Closes gh-38022
2023-10-25 11:03:36 +01:00
Andy Wilkinson
56d31d47f1 Merge branch '3.0.x' into 3.1.x
Closes gh-38021
2023-10-25 11:03:24 +01:00
Andy Wilkinson
e742321dbb Merge branch '2.7.x' into 3.0.x
Closes gh-38020
2023-10-25 11:02:26 +01:00
Andy Wilkinson
fcdc638336 Mention what to do when use-hal-as-default-json-media-type is false
Closes gh-26814
2023-10-25 11:01:28 +01:00
Andy Wilkinson
4f7e4712dd Merge branch '3.1.x'
Closes gh-38019
2023-10-25 10:45:07 +01:00
Andy Wilkinson
4faabcfcdd Merge branch '3.0.x' into 3.1.x
Closes gh-38018
2023-10-25 10:44:38 +01:00