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

518 Commits

Author SHA1 Message Date
Andy Wilkinson
8b5f914ba5 Revert "Merge branch '2.4.x'" 
This reverts commit 97b26b4886d163335b8b749633520d7432b8818e, reversing
changes made to 6f9b1ed6a3b1b219f5254d6923c64c0948e5c9b4.

See gh-25840
 2021-04-07 10:20:23 +01:00
Andy Wilkinson
e9ce20dbf4 Revert "Merge branch '2.3.x' into 2.4.x" 
This reverts commit 586ce00e06aad0532b9bb4753baa343b0f9acff7, reversing
changes made to 563b8a8cecb29911828701aa211a9b43663f72c6.

See gh-25839
 2021-04-07 10:19:20 +01:00
Andy Wilkinson
b35d1ec6e8 Revert "Use test harness for image building integration tests" 
This reverts commit da9d8d6055dd458419e4268a7924f7abd33ee919.

See gh-25838
 2021-04-07 09:30:51 +01:00
Scott Frederick
5595fb2423 Polish "Extract XML examples from Maven plugin adoc files" 
See gh-25534
 2021-03-31 14:05:11 -05:00
robert-smith-911
4e287594bf Extract XML examples from Maven plugin adoc files 
See gh-25534
 2021-03-31 14:05:10 -05:00
Scott Frederick
97b26b4886 Merge branch '2.4.x' 
Closes gh-25840
 2021-03-30 21:00:38 -05:00
Scott Frederick
586ce00e06 Merge branch '2.3.x' into 2.4.x 
Closes gh-25839
 2021-03-30 17:39:10 -05:00
Scott Frederick
da9d8d6055 Use test harness for image building integration tests 
This commit modifies the integration tests for the Maven and Gradle
image building goal and task to use a custom builder as a test harness
to verify that the plugins invoke the builder as expected.

Fixes gh-25838
 2021-03-30 16:48:28 -05:00
Andy Wilkinson
09173b81d6 Merge branch '2.4.x' 
Closes gh-25833
 2021-03-30 18:18:36 +01:00
Andy Wilkinson
7a846ad41f Merge branch '2.3.x' into 2.4.x 
Closes gh-25832
 2021-03-30 18:18:10 +01:00
Andy Wilkinson
5a086321c6 Polish "Document Failsafe configuration when not using starter parent" 
See gh-25621
 2021-03-30 18:16:21 +01:00
robert-smith-911
0d79fd3e01 Document Failsafe configuration when not using starter parent 
See gh-25621
 2021-03-30 18:02:12 +01:00
Phillip Webb
8c31d29acf Merge branch '2.4.x' 2021-03-30 09:29:59 -07:00
Phillip Webb
a28a3ae090 Merge branch '2.3.x' into 2.4.x 2021-03-30 09:25:46 -07:00
Phillip Webb
9c8a97809d Consistent use of @deprecated since 
Restore the patch version number for consistency with `@since`
tags.

See gh-25808
 2021-03-30 09:20:30 -07:00
Phillip Webb
44b1751bb4 Merge branch '2.4.x' 
Closes gh-25826
 2021-03-29 15:48:20 -07:00
Phillip Webb
363f5829d1 Merge branch '2.3.x' into 2.4.x 
Closes gh-25825
 2021-03-29 15:46:50 -07:00
Phillip Webb
26dd1b9a26 Update deprecations with for removal targets 
Update all deprecation tags to include a removal target.

Closes gh-25808
 2021-03-29 15:44:58 -07:00
Scott Frederick
269fc68c1d Merge branch '2.4.x' 
Closes gh-25811
 2021-03-26 16:43:13 -05:00
Scott Frederick
4015d70f00 Merge branch '2.3.x' into 2.4.x 
Closes gh-25789
 2021-03-26 15:16:01 -05:00
Scott Frederick
3ad5f1013a Fix Maven image building with classifiers 
Fixes gh-25736
 2021-03-26 11:36:38 -05:00
Phillip Webb
77ddb45704 Merge branch '2.4.x' 2021-03-23 12:53:59 -07:00
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
2dd4010eb0 Merge branch '2.4.x' 
Closes gh-25701
 2021-03-19 15:58:14 -05:00
Scott Frederick
6f860b441b Merge branch '2.3.x' into 2.4.x 
Closes gh-25700
 2021-03-19 14:52:20 -05:00
Phillip Webb
663fd8ce5e Update copyright year of changed files 2021-03-18 14:49:52 -07:00
Phillip Webb
685b045c3d Polish 2021-03-18 14:49:52 -07: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
67545cf4f1 Polish 2021-03-17 12:39:50 +00:00
Andy Wilkinson
2adf3f836c Merge branch '2.4.x' 2021-03-17 12:25:24 +00:00
Andy Wilkinson
c815195f13 Polish 2021-03-17 12:25:13 +00:00
Andy Wilkinson
36c72cb6ef Merge branch '2.4.x' 
Closes gh-25716
 2021-03-17 11:33:48 +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
68e5a107cc Revert "Merge branch '2.4.x'" 
This reverts commit 5488b8cb465b6aa45a1a807f7754ca32132b8ed1, reversing
changes made to dee0df5c53dba81fca08bc64479fc9e54434a9ac.

See gh-25701
 2021-03-17 11:17:54 +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
5488b8cb46 Merge branch '2.4.x' 
Closes gh-25701
 2021-03-16 17:48:54 -05: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
Jurrie Overgoor
3c0e236562 Support Maven's reproducible build feature for war repackaging 
See gh-25571
 2021-03-11 11:08:10 +00:00
Stephane Nicoll
76d0a7f8ba Merge branch '2.4.x' 
Closes gh-25506
 2021-03-05 10:03:42 +01:00
dreis2211
89a44f3da4 Fix some assertions 
See gh-25499
 2021-03-05 09:56:55 +01:00
Andy Wilkinson
961a34a5ee Merge branch '2.4.x' 
Closes gh-25497
 2021-03-04 19:15:03 +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
e58353a32d Merge branch '2.4.x' 
Closes gh-25484
 2021-03-03 15:16:58 +01: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
4be04b0ea2 Support image building with Maven and war packaging 
This commit updates the Maven image building goal to support building
images from executable and non-executable war files.

Fixes gh-23823
 2021-02-24 15:23:33 -06:00