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
Stephane Nicoll
7465eb0f03 Merge branch '2.4.x' 2021-04-28 15:12:45 +02:00
Stephane Nicoll
85e1cc4d65 Fix checkstyle violation 2021-04-28 15:12:22 +02:00
Stephane Nicoll
09ae65e3b7 Merge branch '2.4.x' 
Closes gh-26277
 2021-04-28 14:13:11 +02:00
Stephane Nicoll
05b09907e0 Merge branch '2.3.x' into 2.4.x 
Closes gh-26275
 2021-04-28 14:12:35 +02:00
Stephane Nicoll
d610f3c2ff Polish "Fix ordering of metadata entries" 
See gh-26230
 2021-04-28 14:07:37 +02:00
Dmitry Pavlov
3e34b0a60a Fix ordering of metadata entries 
This commit provides a consistent ordering for groups that share the
same configuration property prefix.

See gh-26230
 2021-04-28 14:07:37 +02:00
Stephane Nicoll
9e3c3b73ac Merge branch '2.4.x' 2021-04-28 13:58:05 +02:00
Stephane Nicoll
d98fe36b88 Merge branch '2.3.x' into 2.4.x 2021-04-28 13:57:45 +02:00
Stephane Nicoll
20da9826cc Disable incrementalBuildTypeRenamed test 
This commit disables a test that does not test what it is supposed to
and improve the Metadata assertions to fail early if more than one
matching item by name and type is found in the metadata.

See gh-26271
 2021-04-28 13:54:35 +02:00
Andy Wilkinson
6953da2013 Merge branch '2.4.x' 
Closes gh-26257
 2021-04-27 15:19:04 +01:00
Andy Wilkinson
a1138efc5f Merge branch '2.3.x' into 2.4.x 
Closes gh-26256
 2021-04-27 15:18:23 +01:00
Andy Wilkinson
a470c1af3a Align documentation with main default branch name 
Closes gh-26255
 2021-04-27 15:18:00 +01:00
Slawomir Jaranowski
50118f67fd Test Maven plugin against latest Maven versions 
See gh-26200
 2021-04-22 14:59:16 +02:00
Andy Wilkinson
b9348c6d28 Merge branch '2.4.x' 
Closes gh-26169
 2021-04-20 11:26:46 +01:00
Andy Wilkinson
bc1a462143 Merge branch '2.3.x' into 2.4.x 
Closes gh-26168
 2021-04-20 11:19:10 +01:00
Andy Wilkinson
82198a99e0 Polish nohttp configuration 
Closes gh-26166
 2021-04-20 11:15:13 +01:00
Stephane Nicoll
548baf7914 Update copyright year of changed file 
See gh-26145
 2021-04-19 09:34:56 +02:00
izeye
996472b42d Polish 
See gh-26145
 2021-04-19 09:34:55 +02:00
Phillip Webb
b4c9bb0d5c Merge branch '2.4.x' 
Closes gh-26122
 2021-04-14 15:05:55 -07:00
Phillip Webb
fb3796dae8 Merge branch '2.3.x' into 2.4.x 
Closes gh-26121
 2021-04-14 15:02:58 -07:00
Phillip Webb
fcb2210a87 Include optional shade plugin in published pom 
Update `MavenPublishingConventions` to add a new `mavenOptional` feature
that allows us to declare optional dependencies that are also published
in the generated POM.

This change allows us to include the maven-shade-plugin in the
spring-boot-maven-plugin POM which fixes an issue with Eclipse m2e.

Fixes gh-21992
 2021-04-14 15:02:42 -07:00
Andy Wilkinson
b0cce645dd Use a non-deprecated class to identify kotlin-gradle-plugin-api jar 
See gh-26080
 2021-04-13 20:29:36 +01:00
Andy Wilkinson
6f2b4aa685 Upgrade to Kotlin 1.5.0-RC 
Closes gh-26080
Closes gh-25498
 2021-04-13 19:51:03 +01:00
Andy Wilkinson
c4750fd0ff Support Gradle 7 and raise minimum supported version to 6.8 
Closes gh-26026
 2021-04-12 15:20:32 +01:00
dreis2211
db79fe8b2c Test our Gradle Plugin against Gradle 7.0 
See gh-25997
 2021-04-10 10:48:44 +02:00
Scott Frederick
5bc35e8f44 Extract XML example from Maven plugin adoc file 
See gh-25993
 2021-04-09 14:22:51 -05:00
Scott Frederick
e27d4848dd Merge branch '2.4.x' 
Closes gh-25993
 2021-04-09 14:12:36 -05:00
Scott Frederick
6a7f1f1c56 Merge branch '2.3.x' into 2.4.x 
Closes gh-25992
 2021-04-09 14:11:47 -05:00
Scott Frederick
e19443093d Document runtime JVM configuration when building an image 
Fixes gh-21478
 2021-04-09 14:06:24 -05:00
Scott Frederick
86303c017b Merge branch '2.4.x' 
Closes gh-25938
 2021-04-08 13:03:45 -05:00
Scott Frederick
9108b81bb2 Merge branch '2.3.x' into 2.4.x 
Closes gh-25937
 2021-04-08 13:03:26 -05:00
Scott Frederick
0ad7f76263 Preserve file permissions in images built by Gradle 
This commit copies the file mode along with other attributes when
copying files from the source archive to the build container while
building an image using the Gradle plugin. This preserves file
permissions on any resources included in the source archive.

Fixes gh-25915
 2021-04-08 12:56:41 -05:00
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
Phillip Webb
807ea1af0d Update copyright year of changed files 2021-04-06 14:59:52 -07:00
Andy Wilkinson
095ff18854 Test our Gradle plugin against Gradle 7.0-rc-2 
Closes gh-25888
 2021-04-06 10:30:35 +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
6f9b1ed6a3 Merge branch '2.4.x' 
See gh-25837
 2021-03-30 20:52:38 +01:00
Andy Wilkinson
563b8a8cec Merge branch '2.3.x' into 2.4.x 
See gh-25836
 2021-03-30 20:52:15 +01:00
Andy Wilkinson
e94f8bba62 Ensure that upstream jars have been built 
See gh-25835
 2021-03-30 20:51:33 +01:00
Andy Wilkinson
df4b1ffb0d Merge branch '2.4.x' 
Closes gh-25837
 2021-03-30 20:42:41 +01:00
Andy Wilkinson
38a4f135a9 Merge branch '2.3.x' into 2.4.x 
Closes gh-25836
 2021-03-30 20:42:29 +01:00
Andy Wilkinson
ca9a619259 Defer processing of zipTree source until execution time 
Closes gh-25835
 2021-03-30 20:41:46 +01: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