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

1845 Commits

Author SHA1 Message Date
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
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
Madhura Bhave
c73e3cc2dc Update documentation for layered wars 
Closes gh-22821
Closes gh-22195
 2021-02-01 14:43:43 -08:00
Madhura Bhave
1245e5eec9 Add support for creating layered war files with Gradle 
See gh-22195
 2021-02-01 14:43:42 -08:00
Phillip Webb
c76a0f7a81 Merge branch '2.4.x' 
Closes gh-25043
 2021-01-28 18:57:10 -08:00
Phillip Webb
ca9b612e27 Merge branch '2.3.x' into 2.4.x 
Closes gh-25042
 2021-01-28 18:56:59 -08:00
jongmin92
23ecb86089 Document missing code to run Gradle bootRun task 
See gh-25012
 2021-01-28 18:56:21 -08:00
Madhura Bhave
82ac7eef91 Update tests following code changes 
See gh-22821
 2021-01-28 14:24:18 -08:00
Madhura Bhave
9a32f67802 Fix formatting 2021-01-28 13:38:30 -08:00
Madhura Bhave
152698f2b2 Add support for creating layered war files with Maven 
See gh-22821
 2021-01-28 12:39:19 -08:00
Phillip Webb
c9a2c4e326 Merge branch '2.4.x' 2021-01-26 19:06:48 -08:00
Phillip Webb
d06407ec0a Update copyright year of changed files 2021-01-26 19:06:14 -08:00
Phillip Webb
b1f27b7604 Merge branch '2.4.x' 
Closes gh-24995
 2021-01-25 21:36:36 -08:00
Phillip Webb
522f68cb40 Merge branch '2.3.x' into 2.4.x 
Closes gh-24994
 2021-01-25 21:36:12 -08:00
Phillip Webb
464b302655 Set withTestKitDir per Gradle version 
Attempt to fix cache locking issues by setting a unique `withTestKitDir`
directory for each tested Gradle version.

Closes gh-24993
 2021-01-25 21:35:25 -08:00
Andy Wilkinson
f3fd55dac6 Merge branch '2.4.x' 
Closes gh-24976
 2021-01-22 14:59:35 +00:00
Andy Wilkinson
9c8645dec2 Merge branch '2.3.x' into 2.4.x 
Closes gh-24975
 2021-01-22 14:59:23 +00:00
Andy Wilkinson
46d908f632 Upgrade to Gradle 6.8.1 
Closes gh-24737
 2021-01-22 14:20:57 +00:00
Stephane Nicoll
2c2c160579 Remove deprecated code 
See gh-24806
 2021-01-15 14:14:33 +01:00
Phillip Webb
635c087694 Merge branch '2.4.x' 2021-01-12 17:33:16 -08:00
Phillip Webb
6c2ff56fba Fix tests to also work in IDE 2021-01-12 17:31:53 -08:00
Scott Frederick
9925c4ccd2 Merge branch '2.4.x' 
Closes gh-24794
 2021-01-12 17:50:55 -06:00
Scott Frederick
a9e711e503 Enforce builder and run images in the same registry 
Previously, when an authenticated Docker builder registry was
configured in the Maven or Gradle plugin and the builder and run
images specified different registries, the authentication credentials
would be sent to both registries. This could cause confusion if both
registries don't recognize the same credentials. This commit enforces
that both images are in the same registry when authentication
is configured.

Fixes gh-24552
 2021-01-12 17:50:28 -06:00
Phillip Webb
4cc1467aba Merge branch '2.4.x' 2021-01-12 12:04:40 -08:00
Phillip Webb
a6a7c06e55 Merge branch '2.3.x' into 2.4.x 2021-01-12 12:04:11 -08:00
Phillip Webb
9da0bd8523 Update copyright year of changed files 2021-01-12 12:02:57 -08:00
Andy Wilkinson
8281f404d1 Merge branch '2.4.x' 
Closes gh-24769
 2021-01-12 13:12:25 +00:00
Andy Wilkinson
c3dfb9bd29 Merge branch '2.3.x' into 2.4.x 
Closes gh-24768
 2021-01-12 13:12:10 +00:00
Andy Wilkinson
997505005b Handle files larger than Integer.MAX_VALUE bytes in bootJar and bootWar 
Fixes gh-24618
 2021-01-12 13:11:46 +00:00
Andy Wilkinson
f34eb86a21 Merge branch '2.4.x' 
Closes gh-24739
 2021-01-11 11:49:59 +00:00
Andy Wilkinson
5ae9fbedcd Merge branch '2.3.x' into 2.4.x 
Closes gh-24738
 2021-01-11 11:33:30 +00:00
Andy Wilkinson
7625a979db Configure bootRun to use project's Java toolchain by default 
Previously, unlike the application plugin's run task, our bootRun task
ignored the project's Java toolchain. This meant that the application
was run on a JVM with the same Java version as the one being used by
Gradle itself. This could result in a failure if the application
required a more modern JVM.

This commit updates the plugin to configure the bootRun task's
JavaLauncher convention to be one derived from the project's Java
toolchain. Toolchain support was introduced in Gradle 6.7 so this is
only done when using Gradle 6.7 and later.

Fixes gh-24517
 2021-01-11 11:21:53 +00:00
Andy Wilkinson
f07e470765 Merge branch '2.4.x' 
Closes gh-24736
 2021-01-11 11:05:03 +00:00