[groovy] branch danielsun/tweak-dist updated (25b7071 -> 8ea64b2)

[su...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a change to branch danielsun/tweak-dist
in repository https://gitbox.apache.org/repos/asf/groovy.git.


 discard 25b7071  Fix the failing dist build
     new 8ea64b2  Fix the failing dist build

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (25b7071)
            \
             N -- N -- N   refs/heads/danielsun/tweak-dist (8ea64b2)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 buildSrc/src/main/groovy/org/apache/groovy/gradle/DocGDK.groovy | 3 +++
 1 file changed, 3 insertions(+)

[groovy] 01/01: Fix the failing dist build

[su...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch danielsun/tweak-dist
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 8ea64b2f7ec9fccd8751b43bd4f7ce1b4d5b86db
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Sep 18 21:16:32 2021 +0800

    Fix the failing dist build
---
 build.gradle                                                    | 6 ++++--
 buildSrc/src/main/groovy/org/apache/groovy/gradle/DocGDK.groovy | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7507b67..15a566d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -181,8 +181,10 @@ configurations {
     }
 }
 
-tasks.withType(AbstractCopyTask).configureEach {
-    it.duplicatesStrategy = DuplicatesStrategy.WARN
+allprojects {
+    tasks.withType(AbstractCopyTask).configureEach {
+        it.duplicatesStrategy = DuplicatesStrategy.WARN
+    }
 }
 
 tasks.named('jar') {
diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/DocGDK.groovy b/buildSrc/src/main/groovy/org/apache/groovy/gradle/DocGDK.groovy
index ee16fda..56112a0 100644
--- a/buildSrc/src/main/groovy/org/apache/groovy/gradle/DocGDK.groovy
+++ b/buildSrc/src/main/groovy/org/apache/groovy/gradle/DocGDK.groovy
@@ -23,6 +23,7 @@ import groovy.transform.CompileStatic
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.file.DuplicatesStrategy
 import org.gradle.api.file.FileSystemOperations
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.tasks.CacheableTask
@@ -82,6 +83,8 @@ class DocGDK extends DefaultTask {
             )
         }
         fs.copy {
+            duplicatesStrategy = DuplicatesStrategy.WARN
+
             into outputDirectory
             from resources
         }