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

10300 Commits

Author SHA1 Message Date
Stephane Nicoll
0374ed2a0c Merge branch '2.2.x' into 2.3.x 
Closes gh-23063
 2020-08-24 12:20:30 +02:00
Stephane Nicoll
5b0f22e8fe Fix unintended import on commons lang 
Closes gh-23059
 2020-08-24 12:12:33 +02:00
Stephane Nicoll
39dc2e7de4 Merge branch '2.2.x' into 2.3.x 
Closes gh-23060
 2020-08-24 11:57:22 +02:00
Stephane Nicoll
f1455b156a Polish "Add example of custom Actuator operations" 
See gh-23028
 2020-08-24 11:56:31 +02:00
Ivo Smid
e8de069e00 Add example of custom Actuator operations 
See gh-23028
 2020-08-24 11:37:00 +02: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
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
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
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
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
Stephane Nicoll
9a374f7d67 Merge branch '2.2.x' into 2.3.x 
Closes gh-23004
 2020-08-19 10:09:22 +02:00
dreis2211
06eb7e9777 Mention correct JUnit 5 annotations in Kotlin testing section 
See gh-23002
 2020-08-19 10:07:40 +02: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
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
15a0cbc96b Update copyright year of changed files 2020-08-18 15:39:23 -07:00
Phillip Webb
ba2ab3363b Merge branch '2.2.x' into 2.3.x 2020-08-18 15:38:53 -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
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
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
Phillip Webb
ff36f8bab8 Merge branch '2.2.x' into 2.3.x 
Closes gh-22989
 2020-08-17 16:17:47 -07:00
Phillip Webb
10da595302 Polish 'Order metrics auto-configurations correctly' 
See gh-21134
 2020-08-17 16:10:18 -07:00
Martin Benda
02b7ec787e Order metrics auto-configurations correctly 
Update metrics auto-configurations so that they are auto-configured
after `CompositeMeterRegistryAutoConfiguration` in order to ensure
the `MeterRegistry` bean has been defined.

Prior to this commit, metrics auto-configurations that depended on a
`MeterRegistry` has `@AutoConfigureAfter(MetricsAutoConfiguration.class)`
which is not sufficient since `MetricsAutoConfiguration` does not export
a `MeterRegistry`.

See gh-21134
 2020-08-17 16:03:27 -07:00
Scott Frederick
c2ec46c5b1 Polish "Fix include exception handling in DefaultErrorAttributes" 
See gh-22750
 2020-08-17 13:33:59 -05:00
Lopfest
c49605cd7b Fix include exception handling in DefaultErrorAttributes 
This commit fixes a problem with the handling of the includeException
field in DefaultErrorAttributes.

See gh-22750
 2020-08-17 13:33:59 -05: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
Stephane Nicoll
6b679b7d64 Polish 
See gh-22945
 2020-08-17 13:24:51 +02:00
Phillip Webb
f75e988450 Merge branch '2.2.x' into 2.3.x 
Closes gh-22966
 2020-08-14 17:12:41 -07:00
Phillip Webb
3271542d98 Add @Interited to @TypeExcludeFilters 
Update `@TypeExcludeFilters` so that it is also annotated with
`@Inherited`.

Closes gh-22939
 2020-08-14 17:12:31 -07:00
Phillip Webb
1675b47637 Merge branch '2.2.x' into 2.3.x 
Closes gh-22964
 2020-08-14 17:08:48 -07:00
Phillip Webb
89a6f83344 Fix and improve SpringApplicationBuilder javadoc 
Update SpringApplicationBuilder.properties method javadoc to fix
inaccuracies and apply more consistency.

Closes gh-22962
 2020-08-14 17:06:39 -07:00
Phillip Webb
3e939cbabd Polish method order 2020-08-14 17:02:13 -07:00
Phillip Webb
03d4b89c06 Merge branch '2.2.x' into 2.3.x 
Closes gh-22960
 2020-08-14 15:11:23 -07:00
Maciej Walkowiak
15de956566 Fix typo Assert4J -> AssertJ 
See gh-22948
 2020-08-14 15:09:56 -07:00
Andy Wilkinson
3e35fd480f Wait longer for server port and improve diagnostics on timeout 
See gh-22909
 2020-08-14 15:34:41 +01:00
Andy Wilkinson
8c4e6f766c Revert "Merge pull request #21060 from dsyer" 
This reverts commit 6547ea56f9a6e90ce886c4ba73ca852ccb648bec, reversing
changes made to e9e4a34e622ba3652d4f65e3a1433bed725907fc.

Fixes gh-22039
 2020-08-13 13:31:45 +01:00
Stephane Nicoll
2f5145b6a1 Upgrade to Micrometer 1.5.4 
Closes gh-22932
 2020-08-13 13:04:03 +02:00
Stephane Nicoll
df78105a3c Merge branch '2.2.x' into 2.3.x 
Closes gh-22930
 2020-08-13 11:48:43 +02:00
Stephane Nicoll
f61a632a37 Polish "Fix conditions that lead to auto-configure PushGateway" 
See gh-22919
 2020-08-13 11:47:43 +02:00
smlc
c355b95f6c Fix conditions that lead to auto-configure PushGateway 
See gh-22919
 2020-08-13 11:41:49 +02:00
Stephane Nicoll
d0662e824a Fix default value of server.jetty.accesslog.format 
Closes gh-22921
 2020-08-13 09:43:37 +02:00
Scott Frederick
4c6a722f18 Fix test for Java version in image building docs 
See gh-22916
 2020-08-12 17:43:37 -05:00
Scott Frederick
005ed8b8db Use Java version wildcard in image building docs 
Fixes gh-22916
 2020-08-12 17:04:17 -05:00
Andy Wilkinson
c59b48b690 Upgrade to Spring Kafka 2.5.5.RELEASE 
Closes gh-22843
 2020-08-12 19:19:57 +01:00
Andy Wilkinson
ce729b7188 Upgrade to Spring AMQP 2.2.10.RELEASE 
Closes gh-22842
 2020-08-12 19:19:18 +01:00