Commit Graph

33297 Commits

Author SHA1 Message Date
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
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
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
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
Andy Wilkinson
ba19577646 Merge branch '2.4.x' into 2.5.x
Closes gh-27885
2021-09-07 17:00:09 +01:00
Andy Wilkinson
93ac6455d3 Document that starter parent enables compilation with -parameters
Closes gh-27762
2021-09-07 16:57:56 +01:00
Andy Wilkinson
4c8cafe731 Merge branch '2.4.x' into 2.5.x
Closes gh-27883
2021-09-07 09:46:33 +01:00
Andy Wilkinson
6e6a6c059c Upgrade to Testcontainers 1.16
Closes gh-27882
2021-09-07 09:46:05 +01:00
Stephane Nicoll
222a5705ab Merge pull request #27819 from jdubois
* pr/27819:
  Polish "Use more precise variables to detect Azure App Service"
  Use more precise variables to detect Azure App Service

Closes gh-27819
2021-09-06 08:32:53 +02:00
Stephane Nicoll
d6cc1f6d7d Polish "Use more precise variables to detect Azure App Service"
See gh-27819
2021-09-06 08:28:58 +02:00
Julien Dubois
69b23470c7 Use more precise variables to detect Azure App Service
See gh-27819
2021-09-06 08:12:22 +02:00
Stephane Nicoll
b82da0a8de Upgrade Java 17 version in CI image
Closes gh-27849
2021-09-06 08:02:22 +02:00
Stephane Nicoll
4d019c02ac Upgrade Ubuntu version in CI images
Closes gh-27850
2021-09-06 08:01:38 +02:00
Stephane Nicoll
aaff78fb6c Merge branch '2.4.x' into 2.5.x 2021-09-06 08:00:46 +02:00
Stephane Nicoll
4ca39534bc Upgrade Ubuntu version in CI images
Closes gh-27848
2021-09-06 08:00:29 +02:00
Stephane Nicoll
7cc8668540 Merge branch '2.4.x' into 2.5.x
Closes gh-27876
2021-09-05 17:29:01 +02:00
Stephane Nicoll
58e9992db9 Merge pull request #27812 from quaff
* pr/27812:
  Fix inconsistent devtools doc

Closes gh-27812
2021-09-05 17:28:19 +02:00
Yanming Zhou
6bf92f06e9 Fix inconsistent devtools doc
See gh-27812
2021-09-05 17:28:02 +02:00
Stephane Nicoll
3dab5ff2c0 Merge branch '2.4.x' into 2.5.x
Closes gh-27873
2021-09-05 17:02:17 +02:00
Stephane Nicoll
319f75e90c Merge pull request #27856 from hpoettker
* pr/27856:
  Fix typo in javadoc

Closes gh-27856
2021-09-05 17:02:09 +02:00
Henning Pöttker
831e28b001 Fix typo in javadoc
See gh-27856
2021-09-05 17:01:31 +02:00
Phillip Webb
1215bbc10b Merge branch '2.4.x' into 2.5.x
Closes gh-27859
2021-09-02 11:16:42 -07:00
Phillip Webb
61764389c2 Merge branch '2.3.x' into 2.4.x
Closes gh-27858
2021-09-02 11:15:32 -07:00
Phillip Webb
44eb8c39d2 Align ApplicationTemp with Files.createTempDirectory
Update `ApplicationTemp` to align the way that it creates temp folders
with the way that `Files.createTempDirectory` works.

Closes gh-27857
2021-09-02 11:13:26 -07:00
Phillip Webb
15d0078eca Merge branch '2.4.x' into 2.5.x
Closes gh-27830
2021-08-27 22:40:56 -07:00
Phillip Webb
87dbda2339 Ensure TypeConverterConverter is thread safe
Update `TypeConverterConverter` do that a new `SimpleTypeConverter` is
obtained for each `convert` operation. Prior to this commit the same
`SimpleTypeConverter` could be accessed concurrently from multiple
threads which is not allowed.

Fixes gh-27829
2021-08-27 22:08:40 -07:00
Stephane Nicoll
90da6778a1 Merge branch '2.4.x' into 2.5.x
Closes gh-27817
2021-08-25 18:21:38 +02:00
Stephane Nicoll
69be1c872e Rename Spring Buildmaster account to Spring Builds
Closes gh-27816
2021-08-25 18:20:13 +02:00
Stephane Nicoll
4420afe217 Merge branch '2.4.x' into 2.5.x 2021-08-25 08:47:20 +02:00
Stephane Nicoll
8b5d7b0bc0 Polish 2021-08-25 08:47:09 +02:00
Andy Wilkinson
b508d77a4e Merge branch '2.4.x' into 2.5.x
Closes gh-27803
2021-08-23 15:45:33 +01:00
Andy Wilkinson
a8652a89b2 Merge pull request #27755 from brneto
* gh-27755:
  Polish "Document how to parameterize REST Docs' output dir with WebTestClient"
  Document how to parameterize REST Docs' output dir with WebTestClient

Closes gh-27755
2021-08-23 15:37:11 +01:00
Andy Wilkinson
990b766847 Polish "Document how to parameterize REST Docs' output dir with WebTestClient"
See gh-27755
2021-08-23 15:36:16 +01:00
Berchris Requiao
c83f6ebaa2 Document how to parameterize REST Docs' output dir with WebTestClient
See gh-27755
2021-08-23 15:30:21 +01:00
Andy Wilkinson
ca655b639f Merge pull request #27698 from thegeekyasian
* gh-27698:
  Polish "Avoid NPE when routing DataSource has target with null key"
  Avoid NPE when routing DataSource has target with null key

Closes gh-27698
2021-08-23 14:28:39 +01:00
Andy Wilkinson
24c88ab80b Polish "Avoid NPE when routing DataSource has target with null key"
See gh-27698
2021-08-23 13:53:34 +01:00
Safeer A
efdc19647c Avoid NPE when routing DataSource has target with null key
See gh-27698
2021-08-23 13:40:33 +01:00
Andy Wilkinson
e409489859 Merge branch '2.4.x' into 2.5.x
Closes gh-27798
2021-08-23 13:26:37 +01:00
Andy Wilkinson
f8ef90813f Allow @MockBean to be used with Framework's @Repeat
Fixes gh-27693
2021-08-23 12:38:15 +01:00
Andy Wilkinson
56438cf274 Merge branch '2.4.x' into 2.5.x
Closes gh-27791
2021-08-20 15:23:16 +01:00
Andy Wilkinson
02a988e055 Make secrets available to publish_gradle_plugin
Fixes gh-27774
2021-08-20 15:20:35 +01:00
Andy Wilkinson
e0e6e45523 Merge branch '2.4.x' into 2.5.x
Closes gh-27789
2021-08-20 15:18:20 +01:00
Andy Wilkinson
29c187fda9 Upgrade to Gradle 6.9.1
Closes gh-27788
2021-08-20 15:17:59 +01:00
Andy Wilkinson
3566e5881b Merge branch '2.4.x' into 2.5.x
Closes gh-27786
2021-08-20 13:54:02 +01:00
Andy Wilkinson
9f402f0428 Use snapshot rather than libs-snapshot when generating effective bom
Closes gh-27785
2021-08-20 13:53:34 +01:00