From ab8f9eb8c97af75a9a384f7f2388d3721e2f8085 Mon Sep 17 00:00:00 2001
From: Paul King <paulk@asert.com.au>
Date: Tue, 26 Jun 2012 09:12:31 +1000
Subject: [PATCH] merge packing issue fix from master

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

diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 54b99fa579..f20ed5dfe6 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -254,8 +254,8 @@ ext.distSpec = copySpec {
         from({
             configurations.runtime.findAll { it.name.endsWith 'jar' } +
                     modules()*.jar.archivePath +
-                    subprojects.configurations.runtime*.findAll {
-                        it.name.endsWith('jar') && !it.name.contains('livetribe-jsr223')
+                    modules().configurations.runtime*.findAll {
+                        it.name.endsWith('jar') && !it.name.contains('livetribe-jsr223') && !it.name.matches(/groovy-\d.*/)
                     }.flatten() as Set
         })
     }
@@ -275,7 +275,7 @@ ext.distSpec = copySpec {
         from("src/bin") {
             filter(ReplaceTokens, tokens: [GROOVYJAR:jar.archiveName])
             fileMode = 0755
-            ext.exclude = "groovy.icns"
+            exclude "groovy.icns"
         }
         from("src/bin/groovy.icns")
         from("src/tools/org/codehaus/groovy/tools/groovy.ico")