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

2195 Commits

Author SHA1 Message Date
dreis2211
458f989cf3 Use switch expressions where appropriate 
See gh-31527
 2022-06-24 16:19:28 +01:00
Andy Wilkinson
836b08f49d Merge branch '2.7.x' 2022-06-24 15:03:41 +01:00
Andy Wilkinson
dfb8979456 Merge branch '2.6.x' into 2.7.x 2022-06-24 15:03:25 +01:00
Andy Wilkinson
c87340e5c1 Remove unnecessary throws 2022-06-24 15:02:58 +01:00
Andy Wilkinson
631b1e0d76 Merge branch '2.7.x' 
Closes gh-31526
 2022-06-24 13:10:10 +01:00
Andy Wilkinson
1e08f545d0 Merge branch '2.6.x' into 2.7.x 
Closes gh-31525
 2022-06-24 13:05:06 +01:00
Andy Wilkinson
f49b16c645 Upgrade to Spring Java Format 0.0.34 
Closes gh-31524
 2022-06-24 12:57:52 +01:00
Stephane Nicoll
03b742c655 Merge branch '2.7.x' 2022-06-22 08:17:13 +02:00
Stephane Nicoll
e967d0383b Merge branch '2.6.x' into 2.7.x 2022-06-22 08:16:18 +02:00
Stephane Nicoll
79d3e3080f Polish 2022-06-22 08:15:04 +02:00
Phillip Webb
e77f137a32 Merge branch '2.7.x' 
Closes gh-31485
 2022-06-21 19:10:37 -07:00
Phillip Webb
13b2de3bb8 Merge branch '2.6.x' into 2.7.x 
Closes gh-31484
 2022-06-21 19:10:23 -07:00
Phillip Webb
7fc9debf2a Consider super classes when detecting nested property classes 
Update `PropertyDescriptor.isParentTheSame` to consider the candidate
as well as all super classes.

Fixes gh-21626
 2022-06-21 19:09:32 -07:00
dreis2211
cc91009b70 Use java.util.HexFormat where appropriate 
See gh-31477
 2022-06-21 17:02:39 +01:00
dreis2211
5db04da275 Use pattern matching for instanceof where appropriate 
See gh-31475
 2022-06-20 17:55:36 +01:00
dreis2211
fb45fc4819 Use Files.writeString() and Files.readString() where possible 
See gh-31459
 2022-06-20 09:05:09 +02:00
dreis2211
b687e1c7ee Use Runtime.version() instead of reflection 
See gh-31444
 2022-06-19 10:28:59 +02:00
dreis2211
a639685053 Remove obsolete Java compatibility code 
See gh-31452
 2022-06-19 10:22:23 +02:00
Johnny Lim
5d7d0d8047 Use 3.0.0 for Javadoc since tags 
See gh-31448
 2022-06-17 16:48:58 +02:00
Phillip Webb
657fa3e64e Merge branch '2.7.x' 
Closes gh-31409
 2022-06-16 15:36:29 -07:00
Phillip Webb
7c91ebb1b0 Merge branch '2.6.x' into 2.7.x 
Closes gh-31408
 2022-06-16 15:36:00 -07:00
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