groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject groovy git commit: GROOVY-8332: Packaging issue for Antlr4-related jars
Date Fri, 13 Oct 2017 11:23:56 GMT
Repository: groovy
Updated Branches:
  refs/heads/master ce548dc94 -> 32bdaa56e


GROOVY-8332: Packaging issue for Antlr4-related jars


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

Branch: refs/heads/master
Commit: 32bdaa56e918d3f6e02d9052b0f77dab9857f18a
Parents: ce548dc
Author: paulk <paulk@asert.com.au>
Authored: Fri Oct 13 21:23:45 2017 +1000
Committer: paulk <paulk@asert.com.au>
Committed: Fri Oct 13 21:23:45 2017 +1000

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


http://git-wip-us.apache.org/repos/asf/groovy/blob/32bdaa56/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 4432d75..0294f13 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -185,8 +185,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-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')
                         }
 
                         zipfileset(src: configurations.runtime.files.find { file -> file.name.startsWith('asm-util')
},


Mime
View raw message