Update docs about DuplicatesStrategy.INCLUDE

Goooler · Goooler · commit 67dd06fcca56 · 2025-08-09T10:07:21.000+08:00
diff --git a/docs/configuration/merging/README.md b/docs/configuration/merging/README.md
@@ -397,10 +397,10 @@ Different strategies will lead to different results for `foo/bar` files in the J
 
 - `EXCLUDE`: The **first** `foo/bar` file will be included in the final JAR.
 - `FAIL`: **Fail** the build with a `DuplicateFileCopyingException` if there are duplicate `foo/bar` files.
-- `INCLUDE`: The **last** `foo/bar` file will be included in the final JAR (the default behavior).
+- `INCLUDE`: Duplicate `foo/bar` entries will be included in the final JAR.
 - `INHERIT`: **Fail** the build with an exception like
   `Entry .* is a duplicate but no duplicate handling strategy has been set`.
-- `WARN`: The **last** `foo/bar` file will be included in the final JAR, and a warning message will be logged.
+- `WARN`: **Warn** about duplicates in the build log, this behaves exactly as `INHERIT` otherwise.
 
 **NOTE:** The `duplicatesStrategy` takes precedence over transforming and relocating. If you mix the usages of
 `duplicatesStrategy` and [`ResourceTransformer`][ResourceTransformer] like below:
diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt
@@ -196,16 +196,15 @@ public abstract class ShadowJar : Jar() {
   /**
    * Returns the strategy to use when trying to copy more than one file to the same destination.
    *
-   * This strategy can be overridden for individual files by using [filesMatching].
+   * This global strategy can be overridden for individual files by using [filesMatching].
    *
-   * The default value is [INCLUDE]. Different strategies will lead to different results for
-   * `foo/bar` files in the JARs to be merged:
+   * The default value is [INCLUDE]. Different strategies will lead to different results for `foo/bar` files in the JARs to be merged:
    *
    * - [EXCLUDE]: The **first** `foo/bar` file will be included in the final JAR.
    * - [FAIL]: **Fail** the build with a `DuplicateFileCopyingException` if there are duplicate `foo/bar` files.
-   * - [INCLUDE]: The **last** `foo/bar` file will be included in the final JAR (the default behavior).
+   * - [INCLUDE]: Duplicate `foo/bar` entries will be included in the final JAR.
    * - [INHERIT]: **Fail** the build with an exception like `Entry .* is a duplicate but no duplicate handling strategy has been set`.
-   * - [WARN]: The **last** `foo/bar` file will be included in the final JAR, and a warning message will be logged.
+   * - [WARN]: **Warn** about duplicates in the build log, this behaves exactly as [INHERIT] otherwise.
    *
    * **NOTE:** The strategy takes precedence over transforming and relocating.
    * Some [ResourceTransformer]s like [ServiceFileTransformer] will not work as expected with setting the strategy to

Original file line number	Diff line number	Diff line change
`@@ -196,16 +196,15 @@ public abstract class ShadowJar : Jar() {`
`196`	`196`	`/**`
`197`	`197`	`* Returns the strategy to use when trying to copy more than one file to the same destination.`
`198`	`198`	`*`
`199`		`- * This strategy can be overridden for individual files by using [filesMatching].`
	`199`	`+ * This global strategy can be overridden for individual files by using [filesMatching].`
`200`	`200`	`*`
`201`		`- * The default value is [INCLUDE]. Different strategies will lead to different results for`
`202`		- * `foo/bar` files in the JARs to be merged:
	`201`	+ * The default value is [INCLUDE]. Different strategies will lead to different results for `foo/bar` files in the JARs to be merged:
`203`	`202`	`*`
`204`	`203`	* - [EXCLUDE]: The first `foo/bar` file will be included in the final JAR.
`205`	`204`	* - [FAIL]: Fail the build with a `DuplicateFileCopyingException` if there are duplicate `foo/bar` files.
`206`		- * - [INCLUDE]: The last `foo/bar` file will be included in the final JAR (the default behavior).
	`205`	+ * - [INCLUDE]: Duplicate `foo/bar` entries will be included in the final JAR.
`207`	`206`	* - [INHERIT]: Fail the build with an exception like `Entry .* is a duplicate but no duplicate handling strategy has been set`.
`208`		- * - [WARN]: The last `foo/bar` file will be included in the final JAR, and a warning message will be logged.
	`207`	`+ * - [WARN]: Warn about duplicates in the build log, this behaves exactly as [INHERIT] otherwise.`
`209`	`208`	`*`
`210`	`209`	`* NOTE: The strategy takes precedence over transforming and relocating.`
`211`	`210`	`* Some [ResourceTransformer]s like [ServiceFileTransformer] will not work as expected with setting the strategy to`