fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,703 Commits 22 Branches 339 Tags
Commit Graph

14328 Commits

Author SHA1 Message Date
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
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
7cc8668540 Merge branch '2.4.x' into 2.5.x 
Closes gh-27876
 2021-09-05 17:29:01 +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
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
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
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
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
6d8ba3e8b1 Merge branch '2.4.x' into 2.5.x 
Closes gh-27757
 2021-08-18 17:56:32 +01:00
Andy Wilkinson
ffbd28b60a Polish "Polish access modifiers for test classes" 
See gh-27736
 2021-08-18 17:52:42 +01:00
izeye
8a425dedfd Polish access modifiers for test classes 
See gh-27736
 2021-08-18 17:38:40 +01:00
Stephane Nicoll
0d44503980 Upgrade to Spring Session 2021.0.2 
Closes gh-27605
 2021-08-18 16:11:05 +02:00
Stephane Nicoll
2baee89971 Upgrade to Spring Session 2020.0.6 
Closes gh-27599
 2021-08-18 16:10:15 +02:00
Andy Wilkinson
0d904b8868 Merge branch '2.4.x' into 2.5.x 
Closes gh-27753
 2021-08-18 13:51:49 +01:00
Andy Wilkinson
0b7994a679 Polish "Use 2012 for copyright beginning year" 
See gh-27734
 2021-08-18 13:48:29 +01:00
Stephane Nicoll
e0dc55e865 Upgrade to Netty 4.1.67.Final 
Closes gh-27745
 2021-08-18 09:28:18 +02:00
Stephane Nicoll
e0fdddc658 Upgrade to Hazelcast 4.1.5 
Closes gh-27744
 2021-08-18 09:28:17 +02:00
Stephane Nicoll
42422c40da Upgrade to AppEngine SDK 1.9.91 
Closes gh-27743
 2021-08-18 09:28:16 +02:00
Stephane Nicoll
a97a566d01 Upgrade to ActiveMQ 5.16.3 
Closes gh-27742
 2021-08-18 09:28:14 +02:00
Stephane Nicoll
253e4b25b1 Upgrade to Netty 4.1.67.Final 
Closes gh-27741
 2021-08-18 08:56:04 +02:00
Stephane Nicoll
c9ec939127 Upgrade to AppEngine SDK 1.9.91 
Closes gh-27740
 2021-08-18 08:56:03 +02:00
Stephane Nicoll
a798288de1 Upgrade to ActiveMQ 5.16.3 
Closes gh-27739
 2021-08-18 08:56:02 +02:00
Stephane Nicoll
8f12295e9b Upgrade to Spring Integration 5.5.3 
Closes gh-27604
 2021-08-18 07:38:49 +02:00
Stephane Nicoll
3e47b6e2b1 Upgrade to Spring Integration 5.4.10 
Closes gh-27598
 2021-08-18 07:38:04 +02:00
Andy Wilkinson
b4f0f29bff Test our Gradle plugin against Gradle 7.2 
Closes gh-27732
 2021-08-17 15:58:40 +01:00
Andy Wilkinson
ea641d3aab Merge branch '2.4.x' into 2.5.x 
Closes gh-27730
 2021-08-17 15:42:05 +01:00
Andy Wilkinson
29f5570208 Stop s-b-configuration-metadata leaking enforced constraints 
Fixes gh-27726
 2021-08-17 15:34:29 +01:00
Stephane Nicoll
34c83d6016 Upgrade to Nimbus JOSE JWT 9.10.1 
Closes gh-27701
 2021-08-17 08:09:06 +02:00
Stephane Nicoll
37c9fb09e6 Upgrade to OAuth2 OIDC SDK 9.9.1 
Closes gh-27700
 2021-08-17 08:09:05 +02:00
Stephane Nicoll
d9cb1871fe Upgrade to Spring Security 5.5.2 
Closes gh-27603
 2021-08-17 08:02:09 +02:00
Stephane Nicoll
afaf4421d0 Upgrade to Nimbus JOSE JWT 8.22.1 
Closes gh-27699
 2021-08-17 08:01:21 +02:00
Stephane Nicoll
0abedb2547 Upgrade to Spring Security 5.4.8 
Closes gh-27597
 2021-08-17 08:00:15 +02:00