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

1502 Commits

Author SHA1 Message Date
Phillip Webb
11a94ee6f0 Merge branch '2.3.x' into 2.4.x 2021-03-23 12:52:07 -07:00
Phillip Webb
82127fdaa3 Update copyright year of changed files 2021-03-23 12:50:49 -07:00
Scott Frederick
6f860b441b Merge branch '2.3.x' into 2.4.x 
Closes gh-25700
 2021-03-19 14:52:20 -05:00
Scott Frederick
e4fa39df01 Fail fast when finalName is misconfigured 
When the `finalName` parameter is incorrectly set in the Spring Boot
Maven plugin configuration instead of in the `build` configuration, the
repackaged and original archive files are not named as expected. Prior
to this commit, the image building goal would detect this error
condition and throw an exception late in the process of creating the
build container, leaving the container in an unstable state. This
commit changes the image building goal to detect this condition early,
before attempting to create the container.

Fixes gh-25590
 2021-03-17 15:19:21 -05:00
Andy Wilkinson
c815195f13 Polish 2021-03-17 12:25:13 +00:00
Andy Wilkinson
5595fd4017 Merge branch '2.3.x' into 2.4.x 
Closes gh-25715
 2021-03-17 11:31:46 +00:00
Andy Wilkinson
0e0418546b Test spring-boot:build-image when repackage is also invoked 
Closes gh-25714
 2021-03-17 11:19:29 +00:00
Andy Wilkinson
ed4e419b0c Revert "Merge branch '2.3.x' into 2.4.x" 
This reverts commit eaa510872a5af5defddca4285bc01c730ae79856, reversing
changes made to 3e69522e2d5fda8f7d019525df6b7f645c28ab49.

See gh-25700
 2021-03-17 11:13:58 +00:00
Andy Wilkinson
ae2ff7849b Revert "Fail fast when finalName is misconfigured" 
This reverts commit 263b7c20e4ad4bdc9bbd5f0e68bcd1d706d8a29c.

See gh-25590
 2021-03-17 11:11:24 +00:00
Scott Frederick
eaa510872a Merge branch '2.3.x' into 2.4.x 
Closes gh-25700
 2021-03-16 17:31:32 -05:00
Scott Frederick
263b7c20e4 Fail fast when finalName is misconfigured 
When the `finalName` parameter is incorrectly set in the Spring Boot
Maven plugin configuration instead of in the `build` configuration, the
repackaged and original archive files are not named as expected. Prior
to this commit, the image building goal would detect this error
condition and throw an exception late in the process of creating the
build container, leaving the container in an unstable state. This
commit changes the image building goal to detect this condition early,
before attempting to create the container.

Fixes gh-25590
 2021-03-16 17:22:48 -05:00
izeye
09f4d4b9bf Polish 
See gh-25617
 2021-03-13 18:08:54 +01:00
Stephane Nicoll
ddf75f095c Merge branch '2.3.x' into 2.4.x 
Closes gh-25515
 2021-03-05 15:47:36 +01:00
Stephane Nicoll
6ebc69d704 Polish "Include properties in source merge algorithm" 
See gh-25507
 2021-03-05 15:47:09 +01:00
Bertrand Renuart
cf4bc6e9e0 Include properties in source merge algorithm 
This commit improves SimpleConfigurationMetadataRepository to include
properties that are contributed to an existing configuration metadata
source.

See gh-25507
 2021-03-05 15:47:09 +01:00
Andy Wilkinson
ac258a95a2 Merge branch '2.3.x' into 2.4.x 
Closes gh-25508
 2021-03-05 10:39:52 +00:00
Andy Wilkinson
c6ca7a53ab Polish "Prevent extracting zip entries outside of destination path" 
See gh-25505
 2021-03-05 10:13:32 +00:00
trungPa
2993e68715 Prevent extracting zip entries outside of destination path 
See gh-25505
 2021-03-05 10:12:06 +00:00
dreis2211
89a44f3da4 Fix some assertions 
See gh-25499
 2021-03-05 09:56:55 +01:00
Andy Wilkinson
1ce6e796fe Polish "Allow the project to be built with Java 16" 
See gh-25171
 2021-03-04 18:54:58 +00:00
dreis2211
1ccd8dae8a Allow the project to be built with Java 16 
See gh-25171
 2021-03-04 18:54:56 +00:00
Stephane Nicoll
e5d8b6029b Merge branch '2.3.x' into 2.4.x 
Closes gh-25483
 2021-03-03 15:16:08 +01:00
Stephane Nicoll
8e67ae7113 Fix fallback fork value for spring-boot:stop 
This commit harmonizes the fallback value that spring-boot:stop goal
should use if no information is available in the current context.

Closes gh-25472
 2021-03-03 15:15:04 +01:00
Scott Frederick
afb60d6161 Add tests for Gradle examples used in plugin docs 
Fixes gh-25468
 2021-03-01 15:22:15 -06:00
Stephane Nicoll
ed1c68f567 Update copyright year of changed file 
See gh-25454
 2021-03-01 10:06:23 +01:00
jnizet
cbab2396e2 Fix property name in gradle plugin documentation 
See gh-25454
 2021-03-01 10:01:52 +01:00
Andy Wilkinson
d48551ff12 Merge branch '2.3.x' into 2.4.x 
Closes gh-25437
 2021-02-25 17:32:40 +00:00
Stefan Wolf
86ca32e694 Enable stricter validation for Gradle plugin 
See gh-25409
 2021-02-25 17:28:51 +00:00
Andy Wilkinson
ecf8437d4a Merge branch '2.3.x' into 2.4.x 
Closes gh-25430
 2021-02-25 14:28:28 +00:00
dreis2211
101d88a840 Update Testcontainers image versions 
See gh-25412
 2021-02-25 14:27:41 +00:00
Stephane Nicoll
7c5a5c6663 Merge branch '2.3.x' into 2.4.x 
Closes gh-25385
 2021-02-22 10:45:55 +01:00
Stephane Nicoll
77daae1480 Update copyright year of changed file 
See gh-25382
 2021-02-22 10:41:49 +01:00
Mustafa Ulu
abc90db32f Fix wording error in build-info goal description 
See gh-25382
 2021-02-22 10:26:53 +01:00
Andy Wilkinson
b86351d0cf Merge branch '2.3.x' into 2.4.x 
Closes gh-25307
 2021-02-16 11:30:03 +00:00
Andy Wilkinson
a2adb877ee Polish "Encourage use of maven-publish plugin in Gradle docs" 
See gh-25299
 2021-02-16 11:22:47 +00:00
Robert Smith
c0a5245a3e Encourage use of maven-publish plugin in Gradle docs 
See gh-25299
 2021-02-16 11:19:27 +00:00
Andy Wilkinson
45e6c12cb6 Consider transitives when identifying project dependencies 
Previously, when building a layered jar, the Gradle plugin only
considered a configuration's direct dependencies when identifying
project dependencies. This resulted in transitive project dependencies
being missed when deciding which dependencies belong in the
application layer.

This commit updates ResolvedDependencies to consider all projects
from the root project when collecting the IDs of local projects. This
ensures that any project dependency, no matter where it appears in the
dependency graph, is successfully identified.

Fixes gh-25163
 2021-02-10 12:10:07 +00:00
Stephane Nicoll
9218965104 Merge branch '2.3.x' into 2.4.x 
Closes gh-25140
 2021-02-09 15:04:28 +01:00
dreis2211
4937547b8a Fix build deprecation warnings about duplicate jar entries 
See gh-25116
 2021-02-09 14:45:58 +01:00
Andy Wilkinson
788a42d694 Merge branch '2.3.x' into 2.4.x 
See gh-25076
 2021-02-02 15:12:27 +00:00
Andy Wilkinson
67479b6380 Add junit-platform-launcher dependency by convention 
Closes gh-25074
 2021-02-02 13:03:21 +00:00
Phillip Webb
230b4ab2eb Merge branch '2.3.x' into 2.4.x 2021-02-01 22:10:52 -08:00
Phillip Webb
630d216430 Update copyright year of changed files 2021-02-01 22:10:24 -08:00
Phillip Webb
331c7b756b Merge branch '2.3.x' into 2.4.x 2021-02-01 19:46:49 -08:00
Phillip Webb
c404a50a2e Allow test to use snapshot/milestone repo 
Update `spring-boot-maven-plugin` `settings.xml` so that milestone and
snapshot dependencies can be resolved.

See gh-23936
 2021-02-01 19:45:11 -08:00
Phillip Webb
003f2f9521 Merge branch '2.3.x' into 2.4.x 2021-02-01 17:07:07 -08:00
Phillip Webb
faaa5e4186 Fix BOM attached sourceSet 
See gh-23936
 2021-02-01 16:51:53 -08:00
Phillip Webb
db52bf3d7a Merge branch '2.3.x' into 2.4.x 
Closes gh-25078
 2021-02-01 16:35:46 -08:00
Phillip Webb
40c1748e3c Remove hardcoded versions from MavenBuild 
Use the dependencies BOM to ensure versions used in the `MavenBuild`
test class are always aligned.

Closes gh-23936
 2021-02-01 16:20:55 -08:00
Phillip Webb
257608a3a3 Merge branch '2.3.x' into 2.4.x 
Closes gh-25076
 2021-02-01 16:03:43 -08:00