Skip to content

Commit 91f7ff3

Browse files
committed
Merge branch '2.4.x' into 2.5.x
Closes gh-28549
2 parents 034cf6a + c1a6f60 commit 91f7ff3

File tree

2 files changed

+2
-2
lines changed
  • spring-boot-project/spring-boot-tools

2 files changed

+2
-2
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/packaging.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ These closures are evaluated in the order that they are defined, from top to bot
353353
Any content not claimed by an earlier `intoLayer` closure remains available for subsequent ones to consider.
354354

355355
The `intoLayer` closure claims content using nested `include` and `exclude` calls.
356-
The `application` closure uses Ant-style patch matching for include/exclude parameters.
356+
The `application` closure uses Ant-style path matching for include/exclude parameters.
357357
The `dependencies` section uses `group:artifact[:version]` patterns.
358358
It also provides `includeProjectDependencies()` and `excludeProjectDependencies()` methods that can be used to include or exclude project dependencies.
359359

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ The blocks are evaluated in the order that they are defined, from top to bottom.
100100
Any content not claimed by an earlier block remains available for subsequent blocks to consider.
101101

102102
The `<into>` block claims content using nested `<include>` and `<exclude>` elements.
103-
The `<application>` section uses Ant-style patch matching for include/exclude expressions.
103+
The `<application>` section uses Ant-style path matching for include/exclude expressions.
104104
The `<dependencies>` section uses `group:artifact[:version]` patterns.
105105
It also provides `<includeModuleDependencies />` and `<excludeModuleDependencies />` elements that can be used to include or exclude local module dependencies.
106106

0 commit comments

Comments
 (0)