You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2017/11/21 05:49:22 UTC

groovy git commit: GROOVY-8387: Invalid module-info.class in jar artifacts

Repository: groovy
Updated Branches:
  refs/heads/master feea9b457 -> 79d5e047f


GROOVY-8387: Invalid module-info.class in jar artifacts


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/79d5e047
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/79d5e047
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/79d5e047

Branch: refs/heads/master
Commit: 79d5e047f370cfb807e434890d8d02a8e666642e
Parents: feea9b4
Author: paulk <pa...@asert.com.au>
Authored: Tue Nov 21 15:49:11 2017 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Tue Nov 21 15:49:11 2017 +1000

----------------------------------------------------------------------
 gradle/assemble.gradle | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/79d5e047/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 65c1a8b..59f9279 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -188,7 +188,9 @@ allprojects {
                             // explanation of excludes:
                             // GROOVY-7386: stop copy of incorrect maven meta info
                             // GROOVY-8332: stop copy of annotation processor which is for some reason included in antlr runtime artifact
-                            zipfileset(src: jarjarFile, excludes: 'META-INF/maven/commons-cli/commons-cli/*,META-INF/*,META-INF/services/javax.annotation.processing.Processor')
+                            // GROOVY-8387: we don't want module-info.class from any dependencies
+                            zipfileset(src: jarjarFile,
+                                    excludes: 'META-INF/maven/commons-cli/commons-cli/*,META-INF/*,META-INF/services/javax.annotation.processing.Processor,module-info.class')
                         }
 
                         zipfileset(src: configurations.runtime.files.find { file -> file.name.startsWith('asm-util') },