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

2245 Commits

Author SHA1 Message Date
Marc Wrobel
dbfc6bded4 Fix typos in code and documentation 
See gh-31734
 2022-07-26 12:08:07 +01:00
Phillip Webb
3931e82841 Merge branch '2.6.x' into 2.7.x 2022-07-26 10:50:42 +01:00
Phillip Webb
4bcec6e0ee Polish 2022-07-26 10:50:01 +01:00
Scott Frederick
9da38c8d2d Merge branch '2.6.x' into 2.7.x 
Closes gh-31826
 2022-07-20 17:29:58 -05:00
Scott Frederick
4e0b3aad9f Clarify how docker image publishing registry is determined 
Closes gh-31820
 2022-07-20 17:29:40 -05:00
Scott Frederick
f9cf31e59e Fix compile errors 
See gh-28844
 2022-07-20 16:07:19 -05:00
Scott Frederick
09c7ce6dab Merge branch '2.6.x' into 2.7.x 
Closes gh-31824
 2022-07-20 15:10:43 -05:00
Scott Frederick
9b0cdac58a Simplify support for pushing images to unauthenticated registries 
This commit removes the requirement that `docker.publishRegistry`
configuration must be provided when an image is published by the Gradle
or Maven plugin.

Fixes gh-28844
 2022-07-20 15:06:05 -05:00
Stephane Nicoll
92a7af4038 Merge branch '2.6.x' into 2.7.x 
Closes gh-31777
 2022-07-18 11:30:36 +02:00
Johnny Lim
f591c75ad7 Disable incompatible tests on macOS AArch64 
This commit also updates related test support classes.

See gh-31539
 2022-07-18 11:25:52 +02:00
Andy Wilkinson
9c250cae92 Merge branch '2.6.x' into 2.7.x 
Closes gh-31754
 2022-07-14 17:28:54 +01:00
Andy Wilkinson
8c4708982b Test our Gradle plugin against 7.5 
Closes gh-31753
 2022-07-14 17:25:34 +01:00
Scott Frederick
e24c49a09a Merge branch '2.6.x' into 2.7.x 
Closes gh-31558
 2022-06-30 14:58:28 -05:00
Scott Frederick
17bdc526f6 Avoid adding layers for buildpacks that exist in the builder 
This commit adds validation of any buildpacks that are specified for
image building to match them against buildpacks that are bundled in
the builder. If an image buildpack's ID, version, and one layer
hash match the same information stored in a label on the builder
image, that buildpack won't be added and the buildpack bundled in
the builder will be used instead. This reduces the chance of adding to
the total count of layers in a builder image unnecessarily.

Fixes gh-31233
 2022-06-30 14:35:34 -05: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
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
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
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
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
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
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
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
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
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
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
682ac53f32 Ensure that config processor runs with only AutoConfiguration 
Fixes gh-31186
 2022-05-27 15:58:00 +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
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
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
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
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