Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_4_X e0a411114 -> 730dc5a8c


GROOVY-8489: Invalid module-info.class in jar artifacts (port GROOVY-8387 to 
2_4_X)


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

Branch: refs/heads/GROOVY_2_4_X
Commit: 730dc5a8c8f9b4b5ef0c6bebb08e07b662d11c7c
Parents: e0a4111
Author: paulk <pa...@asert.com.au>
Authored: Tue Nov 21 15:49:11 2017 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Sat Mar 3 12:03:08 2018 +1000

----------------------------------------------------------------------
 gradle/assemble.gradle | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/730dc5a8/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 42e9e2b..9e62f1a 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -186,8 +186,10 @@ allprojects {
                                 file.name.startsWith(it)
                             } && ['asm-attr', 'asm-util', 
'asm-analysis'].every { !file.name.startsWith(it) }
                         }.each { jarjarFile ->
-                            // GROOVY-7386 : excludes needed below to stop 
copy of incorrect maven meta info
-                            zipfileset(src: jarjarFile, excludes: 
'META-INF/maven/commons-cli/commons-cli/*,META-INF/*')
+                            // explanation of excludes:
+                            // GROOVY-7386: stop copy of incorrect maven meta 
info
+                            // 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/*,module-info.class')
                         }
 
                         zipfileset(src: configurations.runtime.files.find { 
file -> file.name.startsWith('asm-util') },

Reply via email to