Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,591 Commits 23 Branches 0 Tags
a149edcfd7c03dc3c5c3db3f57e5c25747205fb6
Commit Graph

27591 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
a149edcfd7 Merge branch '2.2.x' into 2.3.x 
Closes gh-23077
 2020-08-25 14:06:12 +02:00
Stephane Nicoll
066471b1d9 Merge branch '2.1.x' into 2.2.x 
Closes gh-23076
 2020-08-25 14:05:07 +02:00
Stephane Nicoll
de169ff8c9 Merge pull request #23071 from dreis2211 
* pr/23071:
  Disallow Apache Commons Lang & Lang3 imports

Closes gh-23071
 2020-08-25 14:03:56 +02:00
dreis2211
7bf32e9bb1 Disallow Apache Commons Lang & Lang3 imports 
See gh-23071
 2020-08-25 14:03:37 +02:00
Andy Wilkinson
e431010453 Merge branch '2.2.x' into 2.3.x 2020-08-25 12:02:08 +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
Andy Wilkinson
0b3a1310bd Align managed version of Nimbus JOSE JWT with Spring Security 
Closes gh-22996
 2020-08-25 09:53:50 +01:00
Andy Wilkinson
7a5392d6bd Polish 2020-08-25 09:45:40 +01:00
Andy Wilkinson
82e1eca0ad Merge pull request #22996 from ThomasKasene 
* gh-22996:
  Polish "Added dependency management for nimbus-jose-jwt"
  Added dependency management for nimbus-jose-jwt

Closes gh-22996
 2020-08-25 08:49:49 +01:00
Andy Wilkinson
858e1948dd Polish "Added dependency management for nimbus-jose-jwt" 
See gh-22996
 2020-08-25 08:49:36 +01:00
Thomas Kåsene
0277dce3da Added dependency management for nimbus-jose-jwt 
See gh-22996
 2020-08-25 08:49:36 +01:00
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
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
 2020-08-24 11:56:47 +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
Andy Wilkinson
1f7d8f2180 Merge branch '2.2.x' into 2.3.x 2020-08-24 09:23:00 +01:00
Andy Wilkinson
947ba7081a Merge branch '2.1.x' into 2.2.x 
Closes gh-23056
 2020-08-24 09:22:44 +01:00
Andy Wilkinson
7a14477ac6 Upgrade to Gradle Enterprise Maven Extension 1.6.2 
Closes gh-23055
 2020-08-24 09:22:12 +01: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
Stephane Nicoll
47e5db9e43 Merge pull request #23002 from dreis2211 
* pr/23002:
  Mention correct JUnit 5 annotations in Kotlin testing section

Closes gh-23002
 2020-08-19 10:08:11 +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
460fb3ccb8 Merge pull request #21134 from bendiscz 
* pr/21134:
  Polish 'Order metrics auto-configurations correctly'
  Order metrics auto-configurations correctly

Closes gh-21134
 2020-08-17 16:11:09 -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
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
 2020-08-17 12:34:20 -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
Stephane Nicoll
d452bbbea8 Merge pull request #22918 from jnizet 
* pr/22918:
  Fix custom image name example and documentation

Closes gh-22918
 2020-08-17 14:20:27 +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