[groovy] branch danielsun/tweak-dist updated (56a9a16 -> 6504336)

[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 56a9a16  Fix the failing dist build
     new 6504336  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   (56a9a16)
            \
             N -- N -- N   refs/heads/danielsun/tweak-dist (6504336)

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 deletions(-)

[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 650433695e43b79a7cf569f29a11415bf5be3661
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Sep 18 22:45:02 2021 +0800

    Fix the failing dist build
---
 build.gradle                                                  | 6 ++++--
 buildSrc/src/main/groovy/org.apache.groovy-asciidoctor.gradle | 2 ++
 2 files changed, 6 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-asciidoctor.gradle b/buildSrc/src/main/groovy/org.apache.groovy-asciidoctor.gradle
index 07d8c19..aa55870 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-asciidoctor.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-asciidoctor.gradle
@@ -53,6 +53,8 @@ asciidoctor {
     }
     outputDir = "$buildDir/asciidoc/html5"
     resources {
+        duplicatesStrategy = DuplicatesStrategy.WARN
+
         from("${rootProject.projectDir}/src/spec/doc/assets") {
             include 'css/style.css'
         }