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

692 Commits

Author SHA1 Message Date
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
Scott Frederick
76e42ff96f Correct grouping of custom buildpacks 
This commit corrects the order.toml file that is generated and added
to the builder when building an image using custom buildpacks with the
Maven or Gradle plugin in order to support buildpacks that depend on
detection as a group.

Fixes gh-25378
 2021-02-23 13:56:57 -06:00
Scott Frederick
89555a8745 Add bindings option for image building 
This commit adds configuration to the Maven and Gradle plugins to
allow a list of volume mount bindings to be provided to the image
building goal and task. This enables service bindings to be mounted
in the builder image that are recognized by buildpacks to support
custom certificates, build tool configuration, APM integration, and
other buildpack features.

Fixes gh-23518
 2021-02-22 16:51:24 -06:00
Stephane Nicoll
817a4c5397 Merge branch '2.4.x' 
Closes gh-25386
 2021-02-22 10:46:13 +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
Scott Frederick
88e9f1d28c Fix Maven buildpacks example in docs 
See gh-21722
 2021-02-18 18:22:36 -06:00
Scott Frederick
f54f784f80 Add buildpack option for image building 
This commit adds configuration to the Maven and Gradle plugins to
allow a list of buildpacks to be provided to the image building
goal and task.

Fixes gh-21722
 2021-02-18 17:28:25 -06:00
Andy Wilkinson
db781a0d84 Merge branch '2.4.x' 
See gh-25077
 2021-02-02 15:14:18 +00: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
d9f3e89395 Merge branch '2.4.x' 2021-02-01 22:11:17 -08: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
d8b849e00d Fix test that fails when building against SNAPSHOT 
Update `WarIntegrationTests` do deal with a SNAPSHOT Spring Framwork
dependency.

See gh-23936
 2021-02-01 22:09:04 -08:00
Phillip Webb
1eef2e1b46 Merge branch '2.4.x' 2021-02-01 19:47:11 -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
cff09df3fe Merge branch '2.4.x' 2021-02-01 17:07:28 -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
59b8fb5b49 Merge branch '2.4.x' 
Closes gh-25079
 2021-02-01 16:36:02 -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
d8b6960997 Merge branch '2.4.x' 
Closes gh-25077
 2021-02-01 16:08:57 -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