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

380 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
dreis2211
89a44f3da4 Fix some assertions 
See gh-25499
 2021-03-05 09:56:55 +01: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
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
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
Phillip Webb
939b5dfc26 Add junit-platform-launcher dependency 
Update `build.gradle` files to ensure that `junit-platform-launcher` is
a `testRuntimeOnly` dependency. This ensures that tests can be run from
Eclipse.

Closes gh-25074
 2021-02-01 15:31:28 -08:00
Scott Frederick
210438ee5b Merge branch '2.3.x' into 2.4.x 
Closes gh-24689
 2021-01-07 15:59:37 -06:00
Scott Frederick
a302238e21 Remove layout parameters from build-image Maven goal 
This commit removes the `layout` and `layoutFactory` parameters
from the `build-image` goal in the Maven plugin while retaining
them for the `repackage` goal. The `build-image` goal currently
only supports jar archives, so allowing other layout types to be
configured for the goal could cause confusion.

Fixes gh-24105
 2021-01-07 15:59:02 -06:00
Stephane Nicoll
c19f7e696e Polish 
See gh-24597
 2021-01-04 16:39:27 +01:00
Stephane Nicoll
4cdfd6f13d Polish "Handle missing manifest files in JarTypeFilter" 
See gh-24597
 2020-12-23 09:12:58 +01:00
Rob Edwards
86eecb01b3 Handle missing manifest files in JarTypeFilter 
This commit makes sure that a jar file without a manifest is handled
properly (i.e. included in the repackaged archive).

See gh-24597
 2020-12-23 09:11:24 +01:00
Scott Frederick
4e603d9239 Merge branch '2.3.x' into 2.4.x 
Closes gh-24538
 2020-12-16 15:59:28 -06:00
Scott Frederick
e4d124dc45 Improve error message with Maven build-image and war packaging 
Fixes gh-24522
 2020-12-16 15:58:53 -06:00
Phillip Webb
30c27274e2 Merge branch '2.3.x' 
Closes gh-24339
 2020-12-04 18:31:55 -08:00