You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@groovy.apache.org by pa...@apache.org on 2015/05/01 08:03:06 UTC

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

Repository: incubator-groovy
Updated Branches:
  refs/heads/master 3cac8859f -> 8aa516850


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/8aa51685
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/8aa51685
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/8aa51685

Branch: refs/heads/master
Commit: 8aa5168509fcd057f6b38a15a37d44533c8e718e
Parents: 3cac885
Author: Paul King <pa...@asert.com.au>
Authored: Fri May 1 16:02:49 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Fri May 1 16:02:49 2015 +1000

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


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/8aa51685/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 2740069..77e833c 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') },