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

452 Commits

Author SHA1 Message Date
Stephane Nicoll
d8f9a20221 Add missing XSD version for layers configuration 
Closes gh-27321
 2021-07-14 14:32:08 +02:00
Phillip Webb
2c518f1dff Merge branch '2.4.x' into 2.5.x 2021-06-23 21:02:05 -07:00
Phillip Webb
a76e5c043e Update copyright year of changed files 2021-06-23 21:01:45 -07:00
Phillip Webb
af37f59136 Merge branch '2.4.x' into 2.5.x 
Closes gh-27056
 2021-06-23 17:13:13 -07:00
Madhura Bhave
b790c82732 Apply exclusions to existing war entries 
Update `RepackageMojo` and supporting classes so that `exclusions`
on the repackage goal apply to both the contributed libraries and any
existing jar entries already contained in the original war.

Prior to this commit, exclusions would apply to contributed jars (for
example, those in `WEB-INF/lib-provided`) but not jars that were
packaged directly into `WEB-INF/lib` by the war plugin

Fixes gh-15808

Co-authored-by: Phillip Webb <pwebb@vmware.com>
 2021-06-23 15:08:31 -07:00
Andy Wilkinson
9e2339b5d0 Merge branch '2.4.x' into 2.5.x 2021-06-14 13:36:29 +01:00
Andy Wilkinson
16bfa669e1 Polish authors separators 2021-06-14 13:35:30 +01:00
Andy Wilkinson
5f26fd9ccb Merge branch '2.4.x' into 2.5.x 
Closes gh-26891
 2021-06-14 13:28:54 +01:00
Andy Wilkinson
f6b7730dac Use Asciidoctor's revision line to provide document's version 
Using the revision line means that the revision number is automatically
set. The revision number is then included by the HTML and PDF backends
in the standard location. In the HTML backend that's alongside the
list of authors. In the PDF backend that's on the title page.

Closes gh-26851
 2021-06-14 13:24:01 +01:00
Phillip Webb
f798f26596 Merge branch '2.4.x' 2021-06-08 18:05:50 -07:00
Phillip Webb
4d62e47c5d Merge branch '2.3.x' into 2.4.x 2021-06-08 18:05:12 -07:00
Phillip Webb
9e1c78da99 Update copyright year of changed files 2021-06-08 18:03:46 -07:00
Phillip Webb
d19b2681ab Rework build-image-customization table in docs 
Collapse parameter name and user property into a single column to give
a little more room for the description and default value.

Closes gh-25739
 2021-06-08 14:46:53 -07:00
Phillip Webb
ab958d2394 Include io.spring.asciidoctor.backends group 
Update `repositories` declaration to include the
'io.spring.asciidoctor.backends' group.

See gh-26293
 2021-05-19 22:58:31 -07:00
Phillip Webb
f0896c2de6 Rework title anchors for maven docs 
Closes gh-26617
 2021-05-19 21:19:24 -07:00
Phillip Webb
2dbf39c738 Polish asciidoc formatting 2021-05-19 21:19:24 -07:00
Phillip Webb
8a3f835ffe Set Asciidoctor attribute-missing to warn 
Closes gh-26590
 2021-05-19 11:53:46 -07:00
Stephane Nicoll
d3c817b7ba Polish "Remove unnecessary throws declaration in tests" 
See gh-26441
 2021-05-17 09:36:53 +02:00
Scott Frederick
b62905b91d Merge branch '2.4.x' 
Closes gh-25840
 2021-05-12 15:48:59 -05:00
Scott Frederick
8ac297d6f3 Merge branch '2.3.x' into 2.4.x 
Closes gh-25839
 2021-05-12 14:57:40 -05:00
Scott Frederick
32d378a348 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-05-12 14:51:45 -05:00
Phillip Webb
87d8aedd3c Use spring-pdf backend for PDF generation 
Update `asciidoctorPdf` tasks to use the `spring-pdf` backend so that
chomped elements and @fold:on/@fold:off comments are hidden.

Closes gh-26373
 2021-05-10 18:04:05 -07:00
Scott Frederick
bb8188b681 Merge branch '2.4.x' 
Closes gh-26313
 2021-04-29 16:16:32 -05:00
Scott Frederick
17fa215cf5 Merge branch '2.3.x' into 2.4.x 
Closes gh-26312
 2021-04-29 15:33:33 -05:00
Scott Frederick
c37b9b8a8e Use layout configuration in Maven build-image goal 
This commit changes the Maven build-image goal to honor the `layout` and
`layoutFactory` parameters to ensure that the archive content sent to the
builder is the same as is used by the `repackage` goal to build the
archive file.

Fixes gh-26216
 2021-04-29 15:03:08 -05:00
Slawomir Jaranowski
50118f67fd Test Maven plugin against latest Maven versions 
See gh-26200
 2021-04-22 14:59:16 +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
6f2b4aa685 Upgrade to Kotlin 1.5.0-RC 
Closes gh-26080
Closes gh-25498
 2021-04-13 19:51:03 +01: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
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
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
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
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
8c31d29acf Merge branch '2.4.x' 2021-03-30 09:29:59 -07: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
44b1751bb4 Merge branch '2.4.x' 
Closes gh-25826
 2021-03-29 15:48:20 -07:00