Commit Graph

27580 Commits (0374ed2a0ccca3f05b97fda5d58eced9c42db22a)
 

Author SHA1 Message Date
Stephane Nicoll 0374ed2a0c Merge branch '2.2.x' into 2.3.x
Closes gh-23063
4 years ago
Stephane Nicoll 5b0f22e8fe Fix unintended import on commons lang
Closes gh-23059
4 years ago
Stephane Nicoll 39dc2e7de4 Merge branch '2.2.x' into 2.3.x
Closes gh-23060
4 years ago
Stephane Nicoll c2b69d560a Merge pull request #23028 from bedla
* pr/23028:
  Polish "Add example of custom Actuator operations"
  Add example of custom Actuator operations

Closes gh-23028
4 years ago
Stephane Nicoll f1455b156a Polish "Add example of custom Actuator operations"
See gh-23028
4 years ago
Ivo Smid e8de069e00 Add example of custom Actuator operations
See gh-23028
4 years ago
Andy Wilkinson 1f7d8f2180 Merge branch '2.2.x' into 2.3.x 4 years ago
Andy Wilkinson 947ba7081a Merge branch '2.1.x' into 2.2.x
Closes gh-23056
4 years ago
Andy Wilkinson 7a14477ac6 Upgrade to Gradle Enterprise Maven Extension 1.6.2
Closes gh-23055
4 years ago
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
4 years ago
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
4 years ago
Phillip Webb 73038267a0 Merge branch '2.2.x' into 2.3.x 4 years ago
Phillip Webb 17e2d72bcb Fix Windows path issue in JarFileWrapperTests
See gh-22991
4 years ago
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
4 years ago
Phillip Webb 0dd38a7264 Merge branch '2.2.x' into 2.3.x 4 years ago
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
4 years ago
Stephane Nicoll 9a374f7d67 Merge branch '2.2.x' into 2.3.x
Closes gh-23004
4 years ago
Stephane Nicoll 47e5db9e43 Merge pull request #23002 from dreis2211
* pr/23002:
  Mention correct JUnit 5 annotations in Kotlin testing section

Closes gh-23002
4 years ago
dreis2211 06eb7e9777 Mention correct JUnit 5 annotations in Kotlin testing section
See gh-23002
4 years ago
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
4 years ago
Phillip Webb c5b12effbf Merge branch '2.2.x' into 2.3.x 4 years ago
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
4 years ago
Phillip Webb 15a0cbc96b Update copyright year of changed files 4 years ago
Phillip Webb ba2ab3363b Merge branch '2.2.x' into 2.3.x 4 years ago
Phillip Webb 4e76138ebc Update copyright year of changed files 4 years ago
Phillip Webb 5997cbd21f Refine AbstractJarFile method visibility
Refine method visibility in an attempt to fix test issues on Java 11+.

See gh-22991
4 years ago
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
4 years ago
Phillip Webb 2b1b096fac Merge branch '2.2.x' into 2.3.x
Closes gh-22998
4 years ago
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
4 years ago
Phillip Webb ff36f8bab8 Merge branch '2.2.x' into 2.3.x
Closes gh-22989
4 years ago
Phillip Webb 460fb3ccb8 Merge pull request #21134 from bendiscz
* pr/21134:
  Polish 'Order metrics auto-configurations correctly'
  Order metrics auto-configurations correctly

Closes gh-21134
4 years ago
Phillip Webb 10da595302 Polish 'Order metrics auto-configurations correctly'
See gh-21134
4 years ago
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
4 years ago
Phillip Webb b8a8b85a58 Merge pull request #22750 from Lopfest
* pr/22750:
  Polish "Fix include exception handling in DefaultErrorAttributes"
  Fix include exception handling in DefaultErrorAttributes

Closes gh-22750
4 years ago
Scott Frederick c2ec46c5b1 Polish "Fix include exception handling in DefaultErrorAttributes"
See gh-22750
4 years ago
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
4 years ago
Stephane Nicoll d452bbbea8 Merge pull request #22918 from jnizet
* pr/22918:
  Fix custom image name example and documentation

Closes gh-22918
4 years ago
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
4 years ago
Stephane Nicoll b1e631e8a6 Remove trailing whitespaces 4 years ago
Stephane Nicoll 6b679b7d64 Polish
See gh-22945
4 years ago
Phillip Webb f75e988450 Merge branch '2.2.x' into 2.3.x
Closes gh-22966
4 years ago
Phillip Webb 3271542d98 Add @Interited to @TypeExcludeFilters
Update `@TypeExcludeFilters` so that it is also annotated with
`@Inherited`.

Closes gh-22939
4 years ago
Phillip Webb 1675b47637 Merge branch '2.2.x' into 2.3.x
Closes gh-22964
4 years ago
Phillip Webb 89a6f83344 Fix and improve SpringApplicationBuilder javadoc
Update SpringApplicationBuilder.properties method javadoc to fix
inaccuracies and apply more consistency.

Closes gh-22962
4 years ago
Phillip Webb 3e939cbabd Polish method order 4 years ago
Phillip Webb 03d4b89c06 Merge branch '2.2.x' into 2.3.x
Closes gh-22960
4 years ago
Phillip Webb 2fe446335a Merge pull request #22948 from maciejwalkowiak
* pr/22948:
  Fix typo `Assert4J` -> `AssertJ`

Closes gh-22948
4 years ago
Maciej Walkowiak 15de956566 Fix typo `Assert4J` -> `AssertJ`
See gh-22948
4 years ago
Andy Wilkinson 3e35fd480f Wait longer for server port and improve diagnostics on timeout
See gh-22909
4 years ago
Spring Buildmaster d0cd445aea Next development version (v2.3.4.BUILD-SNAPSHOT) 4 years ago