Repository: incubator-groovy
Updated Branches:
  refs/heads/GROOVY_2_4_X 9ec6a0913 -> 461e93768


GROOVY-7386: Packed Maven pom.xml reference commons-cli instead of groovy-all 
(removed the incorrect commons-cli info)


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

Branch: refs/heads/GROOVY_2_4_X
Commit: 461e93768d7330d7f319954ff9e84c21276e46c6
Parents: 9ec6a09
Author: Paul King <[email protected]>
Authored: Fri May 1 16:02:49 2015 +1000
Committer: Paul King <[email protected]>
Committed: Fri May 1 16:05:03 2015 +1000

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


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/461e9376/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index c1a8330..8622f72 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -180,7 +180,8 @@ allprojects {
                                 file.name.startsWith(it)
                             } && ['asm-attr', 'asm-util', 
'asm-analysis'].every { !file.name.startsWith(it) }
                         }.each { jarjarFile ->
-                            zipfileset(src: 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/*')
                         }
 
                         zipfileset(src: configurations.runtime.files.find { 
file -> file.name.startsWith('asm-util') },

Reply via email to