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

1459 Commits

Author SHA1 Message Date
Andy Wilkinson
b1a843279a Merge branch '2.3.x' 
Closes gh-23224
 2020-09-08 11:39:52 +01:00
Andy Wilkinson
3e0096e9b1 Use classpath normalizer on antlib's integration test classpath input 
Closes gh-23223
 2020-09-08 11:38:31 +01:00
Stephane Nicoll
defa7c47cd Merge branch '2.3.x' 
Closes gh-23201
 2020-09-07 12:42:48 +02:00
Stephane Nicoll
648789ef84 Document that buildpacks use non-root users 
Closes gh-21122
 2020-09-07 12:41:51 +02:00
EruDev
ffc577b499 Simplify code 
See gh-23111
 2020-09-01 10:04:31 +02:00
Stephane Nicoll
cc5f2537b1 Merge branch '2.3.x' 
Closes gh-23148
 2020-08-31 16:16:16 +02:00
Stephane Nicoll
ee914624e6 Document buildpacks are configured with target Java version 
Closes gh-21796
 2020-08-31 16:15:30 +02:00
Stephane Nicoll
e0b41f8192 Merge branch '2.3.x' 
Closes gh-23143
 2020-08-31 10:53:10 +02:00
Stephane Nicoll
b80314b44b Document how to customize the jmxPort for Maven integration tests 
Closes gh-22401
 2020-08-31 10:52:47 +02:00
Scott Frederick
b70d0dd5ac Merge branch '2.3.x' 
Closes gh-23134
 2020-08-28 17:04:57 -05:00
Scott Frederick
bc1834bfdf Ensure layer digest hashes contain 64 characters 
This commit ensures that encoded digest hashes for Docker image
layers are zero-padded to the required 64 characters length.

Fixes gh-23132
 2020-08-28 17:04:34 -05:00
Scott Frederick
ccabc1a4c9 Merge branch '2.3.x' 
Closes gh-23133
 2020-08-28 15:18:30 -05:00
Scott Frederick
4f1b4c98ae Fail on Docker image load with empty response 
In some cases, a call to the Docker image load API will fail but
return a 200 OK response status code and an empty response. This
commit detects that the response from this call is empty and
treats this condition as an error instead of a silent failure.

Fixes gh-23130
 2020-08-28 15:18:02 -05:00
Andy Wilkinson
9dc5b88949 Polish "Mark bootArchives configuration as unresolvable" 
See gh-22943
 2020-08-28 10:05:45 +01:00
Martin Chalupa
796307a78c Mark bootArchives configuration as unresolvable 
See gh-22943
 2020-08-28 10:05:44 +01:00
Johnny Lim
e48af31ced Polish 
See gh-23081
 2020-08-26 10:47:45 +02:00
Andy Wilkinson
56ded38f5d Generate default values from Duration and Period .ZERO 
Closes gh-23082
 2020-08-25 15:46:50 +01:00
Andy Wilkinson
b57b2f0b44 Test the Gradle Plugin against 6.5 and 6.6 
Closes gh-23075
 2020-08-25 12:01:25 +01:00
dreis2211
33cd875cb8 Simplify InputStream assertions 
See gh-23052
 2020-08-24 11:35:17 +02:00
Scott Frederick
ee41d71ea8 Merge branch '2.3.x' 
Closes gh-23016
 2020-08-19 16:12:44 -05:00
Scott Frederick
56bc0eb9e0 Use canonical path for CNB builder lifecycle binaries 
This commit changes the path used to invoke lifecycle binaries in
CNB builders from `/lifecycle` to `/cnb/lifecycle` to conform to
the CNB spec. This will ensure the build plugin image-building
goals and tasks are compatible with future versions of builders
that may not support both paths.

See gh-23009
 2020-08-19 16:11:59 -05:00
Phillip Webb
c302b72083 Merge branch '2.3.x' 
Closes gh-23015
 2020-08-19 13:24:10 -07:00
Phillip Webb
8fd9c685a2 Reduce HTTP debug logging when building image 
Update `BuildImageMojo` so that commons HTTP wire logging is configured
to ERROR. Without this update, running `mvn -X` will produce a great
deal of logging since by default HTTP Client logs all bytes transfered
at DEBUG and Maven will enable DEBUG for all logs.

Closes gh-22674
 2020-08-19 13:20:06 -07:00
Phillip Webb
ea8bd75ba1 Merge branch '2.3.x' 2020-08-19 10:34:17 -07:00
Phillip Webb
73038267a0 Merge branch '2.2.x' into 2.3.x 2020-08-19 10:34:06 -07:00
Phillip Webb
17e2d72bcb Fix Windows path issue in JarFileWrapperTests 
See gh-22991
 2020-08-19 10:33:23 -07:00
Phillip Webb
bb57c7eacf Merge branch '2.3.x' 2020-08-19 10:26:25 -07:00
Phillip Webb
8722c2c5de Close writer after use in ExtractCommandTests 
Update `ExtractCommandTests` so that the writer is closed after the
contents have been written.

See gh-22993
 2020-08-19 10:25:37 -07:00
Phillip Webb
bd5266b9b1 Merge branch '2.3.x' 2020-08-19 10:22:55 -07:00
Phillip Webb
0dd38a7264 Merge branch '2.2.x' into 2.3.x 2020-08-19 10:22:45 -07:00
Phillip Webb
3fe2005e06 Use @AfterEach to close the source jar file 
Update `JarFileWrapperTests` so that the jar files are closed after each
test.

See gh-22991
 2020-08-19 10:22:10 -07:00
Phillip Webb
899e8e189b Merge branch '2.3.x' 
Closes gh-23001
 2020-08-18 16:49:12 -07:00
Phillip Webb
f7452b9383 Ensure LayoutFactory is not passed an empty file 
Update `Repackager` to ensure that `getLayout` is called before we
backup the source file. This restores earlier behavior that some
custom `ModuleFactory` implementations were relying on.

Closes gh-22995
 2020-08-18 16:45:44 -07:00
Phillip Webb
cfc053d75e Merge branch '2.3.x' 2020-08-18 16:21:23 -07:00
Phillip Webb
c5b12effbf Merge branch '2.2.x' into 2.3.x 2020-08-18 16:21:03 -07:00
Phillip Webb
2a137a2d8a Remove Mockito from JarFileWrapperTests 
Remove Mockto from JarFileWrapperTests since it seems to be failing on
later versions of Java.

See gh-22991
 2020-08-18 16:20:05 -07:00
Phillip Webb
aa2580bb51 Merge branch '2.3.x' 2020-08-18 15:39:08 -07:00
Phillip Webb
ba2ab3363b Merge branch '2.2.x' into 2.3.x 2020-08-18 15:38:53 -07:00
Phillip Webb
60b5de192c Merge branch '2.2.x' into 2.3.x 2020-08-18 15:38:11 -07:00
Phillip Webb
4e76138ebc Update copyright year of changed files 2020-08-18 15:37:59 -07:00
Phillip Webb
5997cbd21f Refine AbstractJarFile method visibility 
Refine method visibility in an attempt to fix test issues on Java 11+.

See gh-22991
 2020-08-18 15:37:37 -07:00
Scott Frederick
341615d7d0 Merge branch '2.3.x' 
Closes gh-23000
 2020-08-18 17:07:25 -05:00
Scott Frederick
3f80638a36 Fail on layertools extract with launch script 
This commit adds a check to the `layertools extract` command to
ensure that the jar file being processed is readable and has a
valid directory.

Fixes gh-22993
 2020-08-18 17:06:31 -05:00
Phillip Webb
b60820564e Merge branch '2.3.x' 
Closes gh-22999
 2020-08-18 14:35:59 -07:00
Phillip Webb
2b1b096fac Merge branch '2.2.x' into 2.3.x 
Closes gh-22998
 2020-08-18 14:35:45 -07:00
Phillip Webb
aac367e9c5 Attempt to fix memory leak in JarFile class 
Create a new `JarFileWrapper` class so that we can wrap and existing
`JarFile` and offer a version that can be safely closed.

Prior to this commit, we provided wrapper functionality in the `JarFile`
class itself. Unfortunately, because we override `close` and also create
a lot of wrappers this caused memory issues when running on Java 11.

With Java 11 `java.util.zip.ZipFile` class uses `FinalizableResource`
for any implementation that overrides `close()`. This means that any
wrapper classes will not be garbage collected until the JVM finalizer
thread runs.

Closes gh-22991
 2020-08-18 14:07:03 -07:00
Stephane Nicoll
f8265e3e44 Merge branch '2.3.x' 
Closes gh-22980
 2020-08-17 14:20:50 +02:00
Jean-Baptiste Nizet
27528fdd07 Fix custom image name example and documentation 
There is no `artifactId` property in a gradle Project, and the default
value uses the project name.

See gh-22918
 2020-08-17 13:59:42 +02:00
Stephane Nicoll
b1e631e8a6 Remove trailing whitespaces 2020-08-17 13:59:08 +02:00
Scott Frederick
7c7079f91a Merge branch '2.3.x' 2020-08-12 17:44:52 -05:00