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

2147 Commits

Author SHA1 Message Date
Andy Wilkinson
00d22c9fc5 Merge branch '2.6.x' into 2.7.x 
Closes gh-33074
 2022-11-08 17:28:50 +00:00
Andy Wilkinson
eed86c0d0a Test Boot's Gradle plugin against Gradle 7.6-rc-2 
Closes gh-33073
 2022-11-08 16:46:22 +00:00
Andy Wilkinson
7c0f397129 Merge branch '2.6.x' into 2.7.x 
See gh-33015
 2022-11-07 13:36:11 +00:00
Andy Wilkinson
ac6ad7c0f1 Fix ModifiedClassPathExtension with parameterized tests 
Closes gh-33014
 2022-11-07 13:34:54 +00:00
Phillip Webb
b4283d45c5 Merge branch '2.6.x' into 2.7.x 2022-11-05 17:03:02 -07:00
Phillip Webb
d2cceb6b77 Polish 2022-11-05 17:02:57 -07:00
Phillip Webb
2ab1f49442 Merge branch '2.6.x' into 2.7.x 
Closes gh-33018
 2022-11-05 16:35:26 -07:00
Phillip Webb
caf46043c6 Add @DirtiesUrlFactories annotation 
Add `@DirtiesUrlFactories` annotation that can be used to reset URL
factories.

Closes gh-33017
 2022-11-05 16:30:27 -07:00
Phillip Webb
948893f36d Merge branch '2.6.x' into 2.7.x 
Closes gh-33015
 2022-11-05 16:04:40 -07:00
Phillip Webb
d4cc8fc3a6 Support modified classpath on methods and parameterized tests 
Update `ModifiedClassPathExtension` and related classes so that
annotations can be used directly on test methods, or on classes
passed into parameterized tests.

Closes gh-33014
 2022-11-05 16:04:19 -07:00
Andy Wilkinson
a3870f8da7 Merge branch '2.6.x' into 2.7.x 
Closes gh-32987
 2022-11-03 10:23:30 +00:00
Andy Wilkinson
beb62be843 Test Boot's Gradle plugin against Gradle 7.6-rc-1 
Closes gh-32933
 2022-11-03 10:22:14 +00:00
Phillip Webb
c8676a81de Merge branch '2.6.x' into 2.7.x 2022-10-25 15:48:04 -07:00
Phillip Webb
d7ac20cd6c Update copyright year of changed files 2022-10-25 15:47:30 -07:00
Phillip Webb
d8c4aec946 Merge branch '2.6.x' into 2.7.x 2022-10-20 17:04:37 -07:00
Phillip Webb
1a14f39f83 Polish 2022-10-20 17:04:29 -07:00
Andy Wilkinson
3d5c864bc9 Merge branch '2.6.x' into 2.7.x 
Closes gh-32758
 2022-10-17 17:11:59 +01:00
Andy Wilkinson
dade5ec3aa Test against Gradle 6.9.3 
Closes gh-32757
 2022-10-17 17:11:37 +01:00
Phillip Webb
ed01a77a99 Merge branch '2.6.x' into 2.7.x 
Closes gh-32681
 2022-10-11 23:19:34 -07:00
Phillip Webb
e0c79ce598 Support PEM formatted elliptic-curve TLS keys 
Update `PrivateKeyParser` to support loading PEM formatted
elliptic-curve keys. We need to do a similar trick to the PKCS1 keys
and convert them to a `PKCS8EncodedKeySpec`.

Fixes gh-32646
 2022-10-11 23:18:44 -07:00
Andy Wilkinson
1b604e30f7 Merge branch '2.6.x' into 2.7.x 
Closes gh-32678
 2022-10-11 19:15:33 +01:00
Andy Wilkinson
215eb96355 Improve error handling in SpringBootPlugin 
Closes gh-32677
 2022-10-11 19:15:23 +01:00
Andy Wilkinson
3ef633b096 Merge branch '2.6.x' into 2.7.x 
Closes gh-32543
 2022-09-29 11:39:42 +01:00
Andy Wilkinson
84a25c7dcf Configure Log4j2 classpath overrides consistently 
Closes gh-32537
 2022-09-29 11:25:21 +01:00
Andy Wilkinson
5124ae94ae Merge branch '2.6.x' into 2.7.x 
Closes gh-32499
 2022-09-26 13:15:11 +01:00
Andy Wilkinson
cfac7f55a4 Correct annotations on BootBuildImage's file-based inputs 
Closes gh-32495
 2022-09-26 13:13:16 +01:00
Andy Wilkinson
f17df7bf30 Merge branch '2.6.x' into 2.7.x 
Closes gh-32284
 2022-09-09 16:46:43 +01:00
Andy Wilkinson
23c2f73b3f Update tests to allow them to run on Java 19 
Closes gh-32280
 2022-09-09 16:46:14 +01:00
Andy Wilkinson
144fdaa703 Merge branch '2.6.x' into 2.7.x 
Closes gh-32283
 2022-09-09 15:14:40 +01:00
Andy Wilkinson
78f4242e46 Build with Gradle 7.5 while still supporting Gradle 6.8+ 
Closes gh-32281
 2022-09-09 15:13:43 +01:00
Phillip Webb
e88a682220 Merge branch '2.6.x' into 2.7.x 2022-09-08 19:37:52 -07:00
Phillip Webb
85697ac482 Update copyright year of changed files 2022-09-08 19:36:59 -07:00
Scott Frederick
257e236b06 Fix image-building unit tests on Windows 
See gh-32000
 2022-08-24 13:14:39 -05:00
Scott Frederick
c16094e04b Disable SELinux label security policy when building images 
When using the Gradle `bootBuildImage` task or Maven
`spring-boot:build-image` goal on a Linux distribution with SELinux
enabled, binding the Docker socket in the builder container might
fail. This commit disables the `label` security policy in the builder
container to prevent this type of failure.

Fixes gh-32000
 2022-08-19 13:56:34 -05:00
Phillip Webb
60e1cc510c Merge branch '2.6.x' into 2.7.x 
See gh-32085
 2022-08-17 12:48:21 -07:00
Phillip Webb
bd74344025 Revert "Don't close jar files early" 
This reverts commit b42f056ddbfd5041ef80d2d909dd2f5e51ec3ff0.
 2022-08-17 11:38:42 -07:00
Phillip Webb
674022d401 Revert "Don't close nested jars or wrapper when parent is closed" 
This reverts commit 360eb027befd51012614f5938fb9cdc9f557a577.
 2022-08-17 11:37:19 -07:00
Stephane Nicoll
1c6624db44 Merge branch '2.6.x' into 2.7.x 
Closes gh-32097
 2022-08-17 08:34:38 +02:00
Stephane Nicoll
e94ddfa589 Polish "Explicit error message if source is not an archive" 
See gh-31997
 2022-08-17 08:33:54 +02:00
Nils Hartmann
a0f273a041 Explicit error message if source is not an archive 
This commit split the existing assertion to provide an explicit error
message if the source file is not an archive.

See gh-31997
 2022-08-17 08:30:03 +02:00
Phillip Webb
ef7aac8c14 Merge branch '2.6.x' into 2.7.x 
Closes gh-32085
 2022-08-15 17:59:06 -07:00
Phillip Webb
360eb027be Don't close nested jars or wrapper when parent is closed 
Update `JarFile` so that the `close()` method no longer closes nested
jars or the wrapper. Prior to this commit it was possible for a parent
jar file to be garbage collected and closed even though references still
existed to the nested jars. When this happened the nested jars would get
closed and any access to entries would result in `JarFile.ensureOpen()`
throwing an `IllegalStateException`. The user would often not see this
exception directly, but rather find `ClassNotFoundException` being
thrown.

Fixes gh-31853
 2022-08-15 17:55:25 -07:00
Andy Wilkinson
9caad3d31b Merge branch '2.6.x' into 2.7.x 
Closes gh-32059
 2022-08-10 12:28:26 +01:00
Andy Wilkinson
c9e69f555e Test our Gradle plugin against Gradle 7.5.1 
Closes gh-32058
 2022-08-10 12:27:47 +01:00
Andy Wilkinson
012fbb3a57 Merge branch '2.6.x' into 2.7.x 
Closes gh-31949
 2022-08-01 20:51:18 +01:00
Andy Wilkinson
c0daede1aa Ensure that jarmode jar added to an app has same SHA as published jar 
Closes gh-31862
 2022-08-01 20:49:10 +01:00
Stephane Nicoll
6786659aae Merge branch '2.6.x' into 2.7.x 2022-07-28 16:07:18 +02:00
Stephane Nicoll
7d860df5f0 Polish 2022-07-28 16:05:16 +02:00
Phillip Webb
fd076ab9ef Merge branch '2.6.x' into 2.7.x 
Closes gh-31875
 2022-07-26 17:46:20 +01:00
aoyvx
8c93d2e8a7 Ensure PROTOCOL_HANDLER system property is reset 
See gh-31870
 2022-07-26 17:20:55 +01:00