root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
30,733 Commits 23 Branches 345 Tags 276 MiB
Commit Graph

364 Commits

Author SHA1 Message Date
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 eaa510872a, reversing
changes made to 3e69522e2d.

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

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
Phillip Webb 5f351a6983 Merge branch '2.2.x' into 2.3.x 
Closes gh-24338
 2020-12-04 18:21:57 -08:00
Scott Frederick da2276e7d4 Use stable builder and run images in integration tests 
Fixes gh-24183
 2020-11-17 13:54:10 -06:00
Scott Frederick 59e0f7317e Avoid image pulls in integration tests 
This commit sets the pull policy to `IF_NOT_PRESENT` where possible
in integration tests for the Maven and Gradle plugins to reduce
the number of times the default Paketo builder and run images are
pulled from Docker Hub.

Fixes gh-24113
 2020-11-10 16:19:05 -06:00
Andy Wilkinson 21d97524d8 Merge branch '2.3.x' 
Closes gh-24112
 2020-11-10 17:38:30 +00:00
Andy Wilkinson e6ab20b029 Merge branch '2.2.x' into 2.3.x 
Closes gh-24111
 2020-11-10 17:37:41 +00:00
Andy Wilkinson 31042bfc49 Test inclusion of system scope dependencies in repackaged war 
Closes gh-22503
 2020-11-10 17:35:04 +00:00
Stephane Nicoll b6fc0913cf Merge branch '2.3.x' 
Closes gh-24104
 2020-11-10 17:44:05 +01:00
Stephane Nicoll 515b18e142 Merge branch '2.3.x' 
Closes gh-24108
 2020-11-10 17:10:26 +01:00
Stephane Nicoll 33d83ebc94 Merge branch '2.3.x' 2020-11-09 14:41:03 +01:00
Stephane Nicoll 6aca0275ad Polish 2020-11-09 14:40:44 +01:00
Scott Frederick f080bb6c25 Fix test that depended on snapshot version 
A test case would fail to accurately capture the contents
of the layers.idx file unless the test project contained
at least one non-project snapshot dependency, which was only
true when the Spring Boot version was a snapshot.

See gh-23463
 2020-10-29 19:40:13 -05:00
Phillip Webb a41ff4dfab Merge branch '2.3.x' 2020-10-29 09:07:57 -07:00
Phillip Webb b0c2687aa9 Update copyright year of changed files 2020-10-29 09:07:42 -07:00
Phillip Webb b39d1910bc Fix test failure caused by MavenBuild upgrades 
See gh-23937
 2020-10-28 14:07:27 -07:00
Phillip Webb d43760ba5a Merge branch '2.3.x' 
Closes gh-23938
 2020-10-28 12:39:08 -07:00
Phillip Webb d79c23ef89 Upgrade MavenBuild versions 
Align versions with those in the main build.

Closes gh-23937
 2020-10-28 12:37:30 -07:00