Commit Graph

33891 Commits

Author SHA1 Message Date
Stephane Nicoll 43a19c16a8 Merge branch '2.5.x'
Closes gh-27944
2021-09-12 09:02:50 +02:00
Stephane Nicoll 2327cda5c9 Merge branch '2.4.x' into 2.5.x
Closes gh-27943
2021-09-12 09:02:35 +02:00
Stephane Nicoll a0289d770e Merge pull request #27920 from cdalexndr
* pr/27920:
  Clarify Selenium auto-configuration requires HtmlUnit

Closes gh-27920
2021-09-12 09:01:41 +02:00
cdalexndr 60bc94e1d4 Clarify Selenium auto-configuration requires HtmlUnit
The auto-configuration requires `HtmlUnit`, so this auto-cofiguration
only works if both Selenium and HtmlUnit are used.

Prevents misinterpretation that WebDriver can be auto configured without
htmlunit.

See gh-27920
2021-09-12 09:00:18 +02:00
Stephane Nicoll 599cc1f696 Start building against Spring Data 2021.1.0-M3 snapshots
See gh-27932
2021-09-11 08:59:12 +02:00
Stephane Nicoll 726a2591fb Start building against Micrometer 1.8.0-M3 snapshots
See gh-27931
2021-09-11 08:35:48 +02:00
Stephane Nicoll 0b26ac213f Merge branch '2.5.x'
Closes gh-27939
2021-09-10 23:58:37 +02:00
Stephane Nicoll ad6018a109 Merge branch '2.4.x' into 2.5.x
Closes gh-27938
2021-09-10 23:58:30 +02:00
Stephane Nicoll 29a2321ee8 Fix bug fix icon in changelog configuration
Closes gh-27937
2021-09-10 23:57:57 +02:00
Stephane Nicoll 3bc5f7903b Start building against Spring Security 5.6.0-M3 snapshots
See gh-27935
2021-09-10 09:04:41 +02:00
Stephane Nicoll 157288e1e1 Start building against Spring Kafka 2.8.0-M3 snapshots
See gh-27934
2021-09-10 09:04:41 +02:00
Stephane Nicoll ef32e02df1 Start building against Spring AMQP 2.4.0-M3 snapshots
See gh-27933
2021-09-10 09:04:41 +02:00
Stephane Nicoll 4b4e5f9bf8 Start building against Spring Framework 5.3.10 snapshots
See gh-27930
2021-09-10 08:29:16 +02:00
Stephane Nicoll c58db8d828 Start building against Reactor 2020.0.11 snapshots
See gh-27929
2021-09-10 08:28:49 +02:00
Stephane Nicoll aa0329c24d Merge pull request #27927 from garyrussell
* pr/27927:
  Polish "Auto-Configure Kafka CommonErrorHandler"
  Auto-Configure Kafka CommonErrorHandler

Closes gh-27927
2021-09-10 08:22:32 +02:00
Stephane Nicoll 78d6c94a7e Polish "Auto-Configure Kafka CommonErrorHandler"
See gh-27927
2021-09-10 08:20:10 +02:00
Gary Russell c3583a4b06 Auto-Configure Kafka CommonErrorHandler
`ErrorHandler/BatchErrorHandler` will be deprecated in a future release
in favor of `CommonErrorHandler`. Currently, the legacy handlers are
adapted to a `CommonErrorHandler` or ignored if a `CommonErrorHandler`
is configured.

See gh-27927
2021-09-10 08:16:29 +02:00
Stephane Nicoll 657b8cea51 Merge pull request #27823 from quaff
* pr/27823:
  Include WebMvcRegistrations beans in WebMvcTest

Closes gh-27823
2021-09-10 08:06:15 +02:00
Yanming Zhou 6e9bdacc10 Include WebMvcRegistrations beans in WebMvcTest
See gh-27823
2021-09-10 07:55:26 +02:00
Stephane Nicoll 0fed29d440 Merge pull request #27925 from dreis2211
* pr/27925:
  Polish javadoc comments

Closes gh-27925
2021-09-10 07:54:14 +02:00
dreis2211 e1afc91ae2 Polish javadoc comments
See gh-27925
2021-09-10 07:53:49 +02:00
Stephane Nicoll 12c197df8e Merge pull request #27926 from dreis2211
* pr/27926:
  Deprecate DataSourceInitializationMode

Closes gh-27926
2021-09-10 07:52:03 +02:00
dreis2211 242d730f51 Deprecate DataSourceInitializationMode
See gh-27926
2021-09-10 07:51:32 +02:00
Andy Wilkinson bb11abef2c Merge branch '2.5.x'
Closes gh-27923
2021-09-09 16:12:45 +01:00
Andy Wilkinson 70b2b33f55 Merge branch '2.4.x' into 2.5.x
Closes gh-27922
2021-09-09 16:12:25 +01:00
Andy Wilkinson 206176425a Broaden testing of ReactiveElasticsearchRestClientAutoConfiguration
Closes gh-27919
2021-09-09 16:12:09 +01:00
Stephane Nicoll ee074d3af3 Merge branch '2.5.x' 2021-09-09 16:41:19 +02:00
Stephane Nicoll ef8f402942 Merge branch '2.4.x' into 2.5.x 2021-09-09 16:41:09 +02:00
Stephane Nicoll d93a8581d2 Start building against Spring Kafka 2.7.7 snapshots
See gh-27918
2021-09-09 15:57:20 +02:00
Stephane Nicoll 5d1ae23733 Start building against Spring Data 2021.0.5 snapshots
See gh-27917
2021-09-09 15:56:57 +02:00
Stephane Nicoll 2f33720101 Start building against Micrometer 1.7.4 snapshots
See gh-27916
2021-09-09 15:56:32 +02:00
Stephane Nicoll 229e61d3ea Start building against Spring Framework 5.3.10 snapshots
See gh-27915
2021-09-09 15:56:02 +02:00
Stephane Nicoll e918543ce9 Start building against Reactor 2020.0.11 snapshots
See gh-27914
2021-09-09 15:55:32 +02:00
Stephane Nicoll 08e79ee472 Start building against Spring Data 2020.0.13 snapshots
See gh-27912
2021-09-09 15:43:44 +02:00
Stephane Nicoll 348863c4ae Start building against Micrometer 1.6.11 snapshots
See gh-27910
2021-09-09 15:43:19 +02:00
Stephane Nicoll bcc4529cc5 Start building against Spring Framework 5.3.10 snapshots
See gh-27909
2021-09-09 15:42:54 +02:00
Stephane Nicoll f557a8a5d9 Start building against Reactor 2020.0.11 snapshots
See gh-27908
2021-09-09 15:42:22 +02:00
Andy Wilkinson 8ab9dbad7a Merge branch '2.5.x'
Closes gh-27913
2021-09-09 14:40:57 +01:00
Andy Wilkinson 128f54fbd0 Merge branch '2.4.x' into 2.5.x
Closes gh-27911
2021-09-09 14:40:40 +01:00
Andy Wilkinson 11c79ac650 Move Docker-based reactive Elasticsearch test into separate class
Closes gh-27907
2021-09-09 14:39:52 +01:00
Andy Wilkinson 010d201002 Merge branch '2.5.x'
Closes gh-27906
2021-09-09 13:38:38 +01:00
Andy Wilkinson 7afaffb80e Merge branch '2.4.x' into 2.5.x
Closes gh-27905
2021-09-09 13:38:09 +01:00
Andy Wilkinson 1f2035ae64 Move Docker-based Elasticsearch test into separate class
Closes gh-27904
2021-09-09 13:24:26 +01:00
Andy Wilkinson c65013f717 Merge branch '2.5.x'
Closes gh-27901
2021-09-09 10:14:03 +01:00
Andy Wilkinson 37240bda3f Merge branch '2.4.x' into 2.5.x
Closes gh-27900
2021-09-09 10:13:40 +01:00
Andy Wilkinson 47163af9b6 Fix handling of Zip64 jar files larger than 4,294,967,295 bytes
Previously, a Zip64 jar file was identified by the number of entries
in the central directory being 0xFFFF. This value indicates that
there the number of entries is too big for the 2-byte field. However,
a jar may be in Zip64 format due to it exceeding the Zip format's
maximum size rather than its maximum number of entries so this field
cannot be used as a reliable indicator. The Zip specification doesn't
require any of the fields of the end of central directory record to
have a value of 0xFFFF (2-byte fields) or 0xFFFFFFFF (4-byte fields)
when using Zip64 format so we need to take a different approach.

Additionally, a number of places in the code assumed that an entry's
offset would always be available from the central directory file
header directly. This assumption did not hold true when the jar was
a Zip64 archive due to its size as the offset's value would be
0xFFFFFFF indicating that it should be read from the Zip64 extended
information field within the header's extra field instead.

This commit updates the Zip64 detection to look for the Zip64 end of
central directory locator instead. If present, it begins 20 bytes
before the beginning of the end of central directory record. Its
first four bytes are always 0x07064b50. The code that reads the
local header offset has also been updated to refer to the Zip64
extended information field when the offset is too large to fit in
the 4-byte field in the central directory file header. To allow
greater-than-4-byte offsets to be handled, a number of fields,
method parameters, and local variables have had their type changed
from an int to a long.

Fixes gh-27822
2021-09-09 09:17:48 +01:00
Phillip Webb 56595c0027 Use consistent case for 'Servlet' and 'Filter' in documentation
Closes gh-27896
2021-09-08 17:56:44 -07:00
Phillip Webb 3884ec3f94 Merge pull request #27759 from Buzzardo
* pr/27759:
  Make editorial changes to actuator documentation
  Update actuator docs to prefer "You can..."
  Improve actuator example lead-in text
  Polish actuator docs markup and formatting

Closes gh-27759
2021-09-08 17:36:07 -07:00
Jay Bryant f7f5f9fb96 Make editorial changes to actuator documentation
See gh-27759
2021-09-08 17:33:07 -07:00
Jay Bryant 2691828d2b Update actuator docs to prefer "You can..."
Edit the actuator docs so that more "You can..." phrasing is used.

For example
	"Auditing can be enabled by providing"
becomes
	"You can enable auditing by providing"

See gh-27759
2021-09-08 17:33:07 -07:00