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

1023 Commits

Author SHA1 Message Date
Andy Wilkinson
74494f1d37 Merge branch '2.6.x' into 2.7.x 
Closes gh-30671
 2022-04-14 18:38:09 +01:00
Andy Wilkinson
1720290234 Merge branch '2.5.x' into 2.6.x 
Closes gh-30670
 2022-04-14 18:37:55 +01:00
Andy Wilkinson
f7d181e65b Handle null additional properties more gracefully 
Closes gh-30654
 2022-04-14 18:36:15 +01:00
izeye
40d0e38e76 Test Spring Boot Gradle Plugin against Gradle 7.4.2 
See gh-30506
 2022-04-03 09:29:50 +02:00
Andy Wilkinson
42ae55895d Simplify resolution of the application's main class name 
Closes gh-30467
 2022-03-29 15:51:22 +01:00
Andy Wilkinson
d9c2e7c85a Merge branch '2.7.x' 2022-03-29 15:07:08 +01:00
Andy Wilkinson
4722d9d17e Merge branch '2.6.x' into 2.7.x 
Closes gh-30470
 2022-03-29 15:06:56 +01:00
Andy Wilkinson
880d33f391 Merge branch '2.5.x' into 2.6.x 
Closes gh-30469
 2022-03-29 15:06:47 +01:00
Andy Wilkinson
05b7befc7a Fix javadoc of ResolveMainClassName setClasspath(Object) 
Closes gh-30468
 2022-03-29 15:05:54 +01:00
Andy Wilkinson
98678ed415 Merge branch '2.7.x' 2022-03-15 17:36:23 +00:00
Andy Wilkinson
b4cbcd797e Merge branch '2.6.x' into 2.7.x 
Closes gh-30218
 2022-03-15 17:36:08 +00:00
Andy Wilkinson
c4d2602a3e Merge branch '2.5.x' into 2.6.x 
Closes gh-30217
 2022-03-15 17:34:53 +00:00
Octavia Togami
264a6888a9 Refactor code to avoid using internal LazyPublishArtifact 
See gh-30209
 2022-03-15 17:09:15 +00:00
Andy Wilkinson
9bf77b1a06 Merge branch '2.7.x' 2022-03-15 15:31:03 +00:00
Andy Wilkinson
4935c11a07 Merge branch '2.6.x' into 2.7.x 
Closes gh-30215
 2022-03-15 15:30:40 +00:00
Andy Wilkinson
464fce621d Merge branch '2.5.x' into 2.6.x 
Closes gh-30213
 2022-03-15 15:30:06 +00:00
Andy Wilkinson
f11ddb4bd7 Prevent eager creation of bootWar task 
Previously, querying the artifact's extension in
SinglePublishedArtifact would result in eager creation of the task
that creates the artifact. Typically, this is the bootWar task.

Instead of querying the extension, this commit reworks
SinglePublishedArtifact and its callers to call separate methods for
jar and war artifacts so that the extension check is no longer
required.

Tests have been added to ensure that running help does not trigger
any unexpected task creation. The tests' assertions tolerate some
variation in behavior that depend on the version of Gradle and
whether the configuration cache is enabled.

Closes gh-30211
 2022-03-15 15:28:59 +00:00
Scott Frederick
377b13c048 Merge branch '2.7.x' 2022-03-11 16:39:49 -06:00
Scott Frederick
de321b00b7 Support podman for building images 
Closes gh-30196
 2022-03-11 16:39:07 -06:00
Scott Frederick
5e07db7d21 Merge branch '2.7.x' 2022-03-11 15:59:16 -06:00
Scott Frederick
7ad538cd84 Add option to use configured Docker host in builder 
This commit adds support for a `docker.bindHostToBuilder` option in
the Maven and Gradle image building goal and task.

Fixes gh-29384
 2022-03-11 15:27:22 -06:00
Andy Wilkinson
5264fb3d1e Test our Gradle Plugin against Gradle 7.4.1 
Closes gh-30139
 2022-03-09 18:09:07 +00:00
Andy Wilkinson
e9d2ec507e Merge branch '2.7.x' 2022-03-09 15:17:25 +00:00
Andy Wilkinson
d552f49128 Merge branch '2.7.x' 2022-03-09 12:53:15 +00:00
Andy Wilkinson
83de1995c7 Merge branch '2.6.x' into 2.7.x 
Closes gh-30130
 2022-03-09 12:44:53 +00:00
Andy Wilkinson
b0e4cabdd8 Merge branch '2.5.x' into 2.6.x 
Closes gh-30123
 2022-03-09 12:37:45 +00:00
Andy Wilkinson
20d21d4e58 Set up CI with JDK 18 
Closes gh-30104
 2022-03-09 12:28:34 +00:00
Madhura Bhave
5960d2dba1 Merge branch '2.7.x' into main 2022-03-07 21:54:10 -08:00
Madhura Bhave
9628507756 Merge branch '2.6.x' into 2.7.x 
Closes gh-30094
 2022-03-07 21:53:59 -08:00
Madhura Bhave
d131003456 Merge branch '2.5.x' into 2.6.x 
Closes gh-30093
 2022-03-07 21:53:44 -08:00
Madhura Bhave
480ccc6175 Clarify devtools documentation when using with build plugins 
Closes gh-17851
 2022-03-07 21:52:43 -08:00
Andy Wilkinson
e2d0b348e3 Merge branch '2.7.x' 2022-03-03 20:36:13 +00:00
Andy Wilkinson
4459fb46be Merge branch '2.6.x' into 2.7.x 
Closes gh-30058
 2022-03-03 20:34:46 +00:00
Andy Wilkinson
2ba8b490a0 Merge branch '2.5.x' into 2.6.x 
Closes gh-30057
 2022-03-03 20:34:34 +00:00
Andy Wilkinson
e7566e968e Use configuration avoidance APIs in Gradle plugin's docs 
Closes gh-30056
 2022-03-03 20:27:46 +00:00
Andy Wilkinson
a5ec85bede Merge branch '2.7.x' 2022-03-02 15:24:23 +00:00
Andy Wilkinson
b89c29f29c Merge branch '2.6.x' into 2.7.x 
Closes gh-30037
 2022-03-02 15:24:10 +00:00
Andy Wilkinson
ea729fc1c6 Merge branch '2.5.x' into 2.6.x 
Closes gh-30036
 2022-03-02 15:21:43 +00:00
Andy Wilkinson
4073cf8334 Only apply special handling of META-INF to jar files 
The changes for gh-28562 attempted to align the Gradle plugin's
handling of META-INF with the Maven plugin's behavior. Unfortunately,
they want too far, applying the handling to both jar and war files
when the Maven plugin only applies it to jar files.

This commit reworks the changes so that they only apply to jar files.

Closes gh-30026
 2022-03-02 15:19:09 +00:00
Andy Wilkinson
6051a10d4a Merge branch '2.7.x' 2022-02-23 09:01:26 +00:00
Andy Wilkinson
1ae46dee6d Merge branch '2.6.x' into 2.7.x 
Closes gh-29967
 2022-02-23 08:59:33 +00:00
Andy Wilkinson
4f8a18fa0a Merge branch '2.5.x' into 2.6.x 
Closes gh-29966
 2022-02-23 08:59:16 +00:00
Andy Wilkinson
9c9e04b8e4 Use mainClass rather than deprecated main in BootRun examples 
Closes gh-29965
 2022-02-23 08:59:04 +00:00
Phillip Webb
ff4b92a3ba Update copyright year of changed files 2022-02-16 20:44:54 -08:00
Phillip Webb
f4b849ec95 Merge branch '2.7.x' 2022-02-16 20:27:18 -08:00
Phillip Webb
26512f8ac6 Merge branch '2.6.x' into 2.7.x 2022-02-16 20:24:59 -08:00
Phillip Webb
5b4ec32645 Merge branch '2.5.x' into 2.6.x 2022-02-16 18:56:12 -08:00
Phillip Webb
c86b1330cf Update copyright year of changed files 2022-02-16 17:56:19 -08:00
Phillip Webb
9ab1b669d0 Polish 2022-02-16 17:56:07 -08:00
Andy Wilkinson
d62d5a09a1 Merge branch '2.7.x' 2022-02-16 14:59:55 +00:00