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

290 Commits

Author SHA1 Message Date
Moritz Halbritter
607ed86edb Merge branch '3.0.x' into 3.1.x 2023-10-31 10:23:01 +01:00
Moritz Halbritter
f3c10ae97b Polish JsonStream 2023-10-31 09:49:01 +01:00
Ivo Smid
f2a4336ea1 Increase the socket timeout for remote connections to Docker daemon 
The default socket timeout with HttpClient 5 is not long enough
in some cases where Docker images are built that require the
GraalVM native image compiler to run in a buildpack. This commit
increases the timeout to 30 minutes.

Fixes gh-37665

Co-authored-by: Scott Frederick <sfrederick@vmware.com>"
 2023-10-03 11:52:48 -05:00
Phillip Webb
78eb8f90d1 Merge branch '3.0.x' into 3.1.x 2023-09-20 17:12:27 -07:00
Phillip Webb
9b5062e5bb Merge branch '2.7.x' into 3.0.x 2023-09-20 17:06:55 -07:00
Phillip Webb
e10ac76761 Polish 2023-09-20 16:05:30 -07:00
Moritz Halbritter
ea57988e2f Merge branch '3.0.x' into 3.1.x 
Closes gh-37460
 2023-09-19 16:02:07 +02:00
Moritz Halbritter
2b4afe974a Merge branch '2.7.x' into 3.0.x 
Closes gh-37459
 2023-09-19 16:01:55 +02:00
Moritz Halbritter
6805a3393b Close file handle on exceptions during connect 
Closes gh-32423
 2023-09-19 15:17:14 +02:00
Moritz Halbritter
ed4b6aaa7b Merge branch '3.0.x' into 3.1.x 
Closes gh-37422
 2023-09-15 15:18:08 +02:00
Moritz Halbritter
5be826dd4a Merge branch '2.7.x' into 3.0.x 
Closes gh-37413
 2023-09-15 14:47:57 +02:00
Moritz Halbritter
408fb8ae9d Add support for EdDSA, XDH and RSA-PSS key parsing 
This works with Java 17 and up. Also refactor the test for more
structure.

Closes gh-37237
 2023-09-15 14:15:02 +02:00
Andy Wilkinson
c562e8e01f Merge branch '3.0.x' into 3.1.x 
Closes gh-37183
 2023-09-04 08:25:46 +01:00
Andy Wilkinson
d6b04af512 Merge branch '2.7.x' into 3.0.x 
Closes gh-37182
 2023-09-04 08:25:33 +01:00
Andy Wilkinson
fadc58679d Speed up ImageReference.of when path contains upper-case chars 
Closes gh-35657
 2023-09-04 08:18:28 +01:00
Phillip Webb
37e67058b7 Merge branch '3.0.x' into 3.1.x 
Closes gh-37169
 2023-08-31 22:24:14 -07:00
Phillip Webb
71ed31343c Merge branch '2.7.x' into 3.0.x 
Closes gh-37168
 2023-08-31 22:01:06 -07:00
Phillip Webb
fd8cb74b46 Load algorithm parameters from PEM encoded 'EC PRIVATE KEY' files 
Update `PrivateKeyParser` implementations so that algorithm parameters
for PEM encoded 'EC PRIVATE KEY' files are loaded from the incoming
data.

Prior to this commit, the algorithm parameter was hard-coded to
'secp384r1' which could result in a mismatch to the actual file
content.

Fixes gh-34232
 2023-08-31 21:40:11 -07:00
Phillip Webb
3640491d5a Fix Timezone used for now in BuildRequestTests 2023-08-30 20:34:01 -07:00
Phillip Webb
848a61a3a8 Merge branch '3.0.x' into 3.1.x 2023-08-13 18:50:33 -07:00
Phillip Webb
a0089c5c76 Merge branch '2.7.x' into 3.0.x 2023-08-13 18:44:36 -07:00
Phillip Webb
46773dd5df Update copyright year of changed files 2023-08-13 18:19:05 -07:00
Scott Frederick
b9b314622f Merge branch '3.0.x' into 3.1.x 
Closes gh-36054
 2023-06-23 15:46:44 -06:00
Scott Frederick
4a3abdd7c3 Merge branch '2.7.x' into 3.0.x 
Closes gh-36053
 2023-06-23 15:46:27 -06:00
Johnny Lim
59d4bf97a1 Add Javadoc since to ImageReference.inTaglessForm() 
See gh-36048
 2023-06-23 15:45:29 -06:00
Scott Frederick
92b2573a60 Merge branch '3.0.x' into 3.1.x 
Closes gh-36050
 2023-06-23 15:20:06 -06:00
Scott Frederick
eeeb2ad72a Merge branch '2.7.x' into 3.0.x 
Closes gh-36049
 2023-06-23 15:19:44 -06:00
Johnny Lim
4a2c9d99dc Remove redundant Files.delete() calls in tests 
See gh-35986
 2023-06-23 15:14:59 -06:00
Phillip Webb
e3ed87d165 Merge branch '3.0.x' 2023-05-12 13:21:52 -07:00
Phillip Webb
92e420a098 Merge branch '2.7.x' into 3.0.x 2023-05-12 13:14:12 -07:00
Phillip Webb
57e45dfb21 Update copyright year of changed files 2023-05-12 13:01:43 -07:00
Phillip Webb
ef4b09718c Fix loading of PKCS#8 PEM encoded EC and DSA keys for buildpack 
Polish and port support for PKCS#8 PEM encoded EC and DSA keys to
the buildpack code.

See gh-35322
 2023-05-12 13:01:30 -07:00
Phillip Webb
e9c4a5d663 Polish 2023-05-12 13:01:30 -07:00
Moritz Halbritter
e930801eb1 Separate tag in the Docker API tag call 
Closes gh-35358
 2023-05-11 09:52:52 +02:00
Moritz Halbritter
d00e070cdb Separate tag in the Docker API tag call 
Closes gh-35358
 2023-05-11 09:52:45 +02:00
Moritz Halbritter
4eef8d5a53 Separate tag in the Docker API tag call 
Closes gh-35358
 2023-05-11 09:52:41 +02:00
Moritz Halbritter
441ed30ee4 Polish "Replace Mockito argument captors with assertArg" 
Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>

See gh-35015
 2023-05-05 15:41:31 +02:00
Marc Leroux
b61834c92d Replace Mockito argument captors with assertArg 
See gh-35015
 2023-05-05 11:34:55 +02:00
Andy Wilkinson
b8ec7d291d Upgrade to Jackson Bom 2.15.0-rc2 
Closes gh-34980
 2023-04-14 11:55:20 +01:00
Phillip Webb
e9a198a68f Merge branch '3.0.x' 2023-04-12 22:16:35 -07:00
Scott Frederick
56bc6d2fa0 Allow image application directory to be configurable 
An `applicationDirectory` option on the Maven
`spring-boot:build-image` goal and the Gradle `bootBuildImage` task
can be configured to set the location that will be used to upload
application contents to the builder image, and will contain the
application contents in the generated image.

Closes gh-34786
 2023-04-07 14:00:00 -05:00
Scott Frederick
5817c8441d Allow image Created date to be configurable 
A `createdDate` option on the Maven `spring-boot:build-image` goal
and the Gradle `bootBuildImage` task can be used to set the `Created`
metadata field on a generated OCI image to a specified date or to
the current date.

Closes gh-28798
 2023-04-06 15:08:34 -05:00
Andy Wilkinson
bfeeda6fbc Merge branch '3.0.x' 
Closes gh-34601
 2023-03-14 14:40:50 +00:00
Andy Wilkinson
220c4b671b Merge branch '2.7.x' into 3.0.x 
Closes gh-34600
 2023-03-14 14:40:26 +00:00
Johnny Lim
00f388fa6f Polish Javadoc since tags for gh-34324 
See gh-34587
 2023-03-14 14:39:10 +00:00
Scott Frederick
dab8b07302 Merge branch '3.0.x' 
Closes gh-34496
 2023-03-06 15:31:09 -06:00
Scott Frederick
29ad690d56 Merge branch '2.7.x' into 3.0.x 
Closes gh-34495
 2023-03-06 15:30:55 -06:00
Scott Frederick
7730eee439 Use image manifest when exporting layers 
A tar archive of a Docker image contains a `mainfest.json` file that
lists the path to each embedded tar file containing the contents of a
layer in the image. This manifest file should be used to identify the
layer files instead of relying on file naming conventions and
assumptions on the directory structure that are not consistent
between container engine implementations.

Fixes gh-34324
 2023-03-06 15:13:08 -06:00
Chintan Radia
a98760125c Add support for CNB platform API 0.11 
See gh-34383
 2023-03-01 09:24:42 +01:00
Phillip Webb
157091a811 Merge branch '3.0.x' 2023-02-22 18:36:57 -08:00