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

2974 Commits

Author SHA1 Message Date
Phillip Webb
ae6311ddda Prevent Logback from accidentally being used in Log4J2LoggingSystemTests 
Update `Log4J2LoggingSystemTests` to exclude Logback and include
'log4j-slf4j-impl'. The `ModifiedClassPathClassLoader` has also been
updated so that it no longer automatically excludes `log4j` artifacts,
instead we now use `@ClassPathExclusions` on the relevant tests.

Fixes gh-19365
 2022-06-16 15:35:32 -07:00
Andy Wilkinson
4f3180540c Use Framework's MockSpringFactoriesLoader 
Closes gh-31406
 2022-06-16 15:40:03 +01:00
Andy Wilkinson
d370d19e7a Merge branch '2.7.x' 
Closes gh-31403
 2022-06-16 12:14:52 +01:00
Andy Wilkinson
5e1cd28d3f Merge branch '2.6.x' into 2.7.x 
Closes gh-31402
 2022-06-16 12:14:28 +01:00
Lars Grefer
e8a1a0399a Upgrade to Bouncycastle 1.71 
Closes gh-31400
 2022-06-16 12:14:06 +01:00
Phillip Webb
d84557f1f9 Merge branch '2.7.x' 
Closes gh-31396
 2022-06-15 10:53:17 -07:00
Phillip Webb
bcbcc53a09 Merge branch '2.6.x' into 2.7.x 
Closes gh-31395
 2022-06-15 10:51:40 -07:00
Phillip Webb
b42f056ddb Don't close jar files early 
Update `JarFile` and related classes so that `close()` is not longer
called early.

Prior to this commit, we would always immediately close the underlying
jar file to prevent file locking issues with our build. This causes
issues on certain JVMs when they attempt to verify a signed jar.

The file lock issues have now been solved by returning a custom input
stream from `JarUrlConnection` which captures and delegates the close
method.

Fixes gh-29356
 2022-06-15 10:51:01 -07:00
Stephane Nicoll
d5695c1931 Add resource hints for configuration properties 
This commits introduces a RuntimeHintsRegistrar for configuration
properties. By default, it provides the necessary hint to load
application properties and yaml files in default locations.

Closes gh-31311
 2022-06-15 10:15:27 +02:00
Stephane Nicoll
99f71941cd Merge branch '2.7.x' 
Closes gh-31363
 2022-06-13 15:55:21 +02:00
Stephane Nicoll
499f54a335 Merge branch '2.6.x' into 2.7.x 
Closes gh-31362
 2022-06-13 15:51:45 +02:00
Lars Grefer
8c9557f552 Enable Links for the Javadoc of the Gradle Plugins 
See gh-31279
 2022-06-13 15:51:08 +02:00
Stephane Nicoll
e2c42e4bbf Merge branch '2.7.x' 
Closes gh-31262
 2022-06-07 09:16:19 +02:00
Stephane Nicoll
8e550933a8 Merge branch '2.6.x' into 2.7.x 
Closes gh-31261
 2022-06-07 09:16:10 +02:00
Stephane Nicoll
bbb5966bca Upgrade integration tests to Apache Maven 3.8.5 
Closes gh-31260
 2022-06-07 09:15:41 +02:00
Stephane Nicoll
1c94f835c7 Copy AOT-generated classes 
Closes gh-31245
 2022-06-07 08:59:57 +02:00
Stephane Nicoll
0dbcb5f6d3 Start building against Spring Framework 6.0.0-M5 snapshots 
See gh-31241
 2022-06-02 16:19:58 +02:00
Andy Wilkinson
1ba1eff63a Merge branch '2.7.x' 2022-05-30 19:22:45 +01:00
Andy Wilkinson
430040415b Merge branch '2.6.x' into 2.7.x 2022-05-30 19:22:37 +01:00
Andy Wilkinson
0b6c147a87 Polish 2022-05-30 19:22:30 +01:00
Andy Wilkinson
12465ea6b7 Merge branch '2.7.x' 
Closes gh-31214
 2022-05-30 18:24:12 +01:00
Andy Wilkinson
d1420b6abb Merge branch '2.6.x' into 2.7.x 
Closes gh-31213
 2022-05-30 18:24:00 +01:00
Andy Wilkinson
da8dafe138 Make afterResolve hook used by bootJar and bootWar more robust 
Previously, ResolvedDependencies used hasError on
ResolvedConfiguration to check that it was safe to work with all
of the resolved configuration's artifacts and their files. This
check is not sufficient as errors can still occur later on.

This commit updates ResolvedDependencies to use a lenient
configuration, thereby avoiding any problems that may be caused by
errors that occur after the hasError check.

Closes gh-30586
 2022-05-30 18:19:47 +01:00
Andy Wilkinson
d354c03e63 Merge branch '2.7.x' 
Closes gh-31191
 2022-05-27 15:58:57 +01:00
Andy Wilkinson
682ac53f32 Ensure that config processor runs with only AutoConfiguration 
Fixes gh-31186
 2022-05-27 15:58:00 +01:00
Andy Wilkinson
36a60d8e2e Merge branch '2.7.x' 
Closes gh-31181
 2022-05-26 19:49:53 +01:00
Andy Wilkinson
137318a845 Merge branch '2.6.x' into 2.7.x 
Closes gh-31180
 2022-05-26 19:49:35 +01:00
Damiano Albani
3f91ed037f Fix Custom Layers Configuration section title in Maven plugin docs 
See gh-31172
 2022-05-26 19:46:11 +01:00
Andy Wilkinson
4bb5ba2bd0 Merge branch '2.7.x' 2022-05-26 18:26:52 +01:00
Andy Wilkinson
935d1264e0 Merge branch '2.6.x' into 2.7.x 2022-05-26 18:13:08 +01:00
Andy Wilkinson
3d203d0215 Polish 2022-05-26 17:30:39 +01:00
Andy Wilkinson
14af1bb2dc Polish 2022-05-26 16:54:31 +01:00
Andy Wilkinson
26b89bfc80 Remove redundant throws declarations from public APIs 
Closes gh-31179
 2022-05-26 16:00:47 +01:00
Andy Wilkinson
5dfa5adb75 Merge branch '2.7.x' 
Closes gh-31178
 2022-05-26 15:54:58 +01:00
Andy Wilkinson
455ee0ce22 Merge branch '2.6.x' into 2.7.x 
Closes gh-31177
 2022-05-26 15:53:38 +01:00
Andy Wilkinson
ee45fd2fc8 Remove redundant throws declarations from internal APIs 
Closes gh-31176
 2022-05-26 15:47:35 +01:00
Andy Wilkinson
b3a4982f31 Merge branch '2.6.x' into 2.7.x 
Closes gh-31174
 2022-05-26 14:01:23 +01:00
Andy Wilkinson
cbf42dea14 Update deprecation messages to change removal version from 2.8 to 3.0 
Closes gh-30903
 2022-05-26 13:59:03 +01:00
Andy Wilkinson
003f747e77 Merge branch '2.7.x' 
Closes gh-31170
 2022-05-26 13:52:41 +01:00
Andy Wilkinson
e617035dba Merge branch '2.6.x' into 2.7.x 
Closes gh-31167
 2022-05-26 13:45:52 +01:00
Andy Wilkinson
3e7bd582a3 Upgrade to Spring Java Format 0.0.33 
Closes gh-31166
 2022-05-26 13:22:23 +01:00
Phillip Webb
68bd9d6b6d Merge branch '2.7.x' 2022-05-19 18:09:29 -07:00
Phillip Webb
06679a4c46 Merge branch '2.6.x' into 2.7.x 
Closes gh-31128
 2022-05-19 18:07:17 -07:00
Phillip Webb
9fa33e5645 Merge branch '2.5.x' into 2.6.x 
Closes gh-31127
 2022-05-19 18:04:54 -07:00
Phillip Webb
05a6447a8d Polish "Resolve errors in layers.xsd" 
Validate loaded `layer.xml` files against the XSD and additionally
update `<layers>` sub elements to have a 'minOccurs' of 0.

See gh-31126
 2022-05-19 18:01:55 -07:00
Liuzh
0d78323b60 Resolve errors in layers.xsd 
Update `layer-*.xsd` files with following fixes:

- Rename <includeProjectDependencies> to <includeModuleDependencies>
- Rename <excludeProjectDependencies> to <excludeModuleDependencies>

See gh-31126
 2022-05-19 18:00:25 -07:00
Andy Wilkinson
c4beca3e01 Fix Maven-based AOT generation on Windows 
Closes gh-30525
 2022-05-18 10:54:35 +01:00
Phillip Webb
f8a41d34aa Merge branch '2.7.x' 2022-05-17 22:22:08 -07:00
Phillip Webb
ea41e89c6c Merge branch '2.5.x' into 2.6.x 2022-05-17 22:21:10 -07:00
Phillip Webb
7d2f1bafc0 Update copyright year of changed files 2022-05-17 22:20:05 -07:00