[4/4] git commit: Improve exclusions needed to generate Maven POMs correctly

[hl...@apache.org]

Improve exclusions needed to generate Maven POMs correctly


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/5e22b236
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/5e22b236
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/5e22b236

Branch: refs/heads/master
Commit: 5e22b236fcf6d1aa460f02a883bcdd57e0f3aa7e
Parents: 0b223bc
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Mon Jun 17 18:30:40 2013 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Mon Jun 17 18:30:40 2013 -0700

----------------------------------------------------------------------
 tapestry-core/build.gradle  |  4 +++-
 tapestry-wro4j/build.gradle | 15 ++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5e22b236/tapestry-core/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-core/build.gradle b/tapestry-core/build.gradle
index d24d50f..22e1cea 100644
--- a/tapestry-core/build.gradle
+++ b/tapestry-core/build.gradle
@@ -27,7 +27,9 @@ dependencies {
     compile "commons-codec:commons-codec:1.5"
 
     // Transitive will bring in the unwanted string template library as well
-    compile "org.antlr:antlr-runtime:3.3", { transitive = false }
+    compile "org.antlr:antlr-runtime:3.3", {
+        exclude group:"org.antlr", module:"stringtemplate"
+    }
 
     // Antlr3 tool path used with the antlr3 task
     antlr3 "org.antlr:antlr:3.3"

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5e22b236/tapestry-wro4j/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-wro4j/build.gradle b/tapestry-wro4j/build.gradle
index 02b1e46..b4a770b 100644
--- a/tapestry-wro4j/build.gradle
+++ b/tapestry-wro4j/build.gradle
@@ -3,10 +3,19 @@ description = "Integration with WRO4J to perform runtime CoffeeScript compilatio
 dependencies {
     compile project(":tapestry-core")
     compile "ro.isdc.wro4j:wro4j-extensions:${versions.wro4j}", {
-        exclude group: "org.codehaus.gmaven.runtime"
-        exclude group: "com.github.lltyk"
+        exclude group: "org.codehaus.gmaven.runtime", module: "gmaven-runtime-1.7"
+        exclude group: "com.github.lltyk", module: "dojo-shrinksafe"
+        exclude group: "org.springframework", module: "spring-web"
+        exclude group: "me.n4u.sass", module: "sass-gems"
+        exclude group: "nz.co.edmi", module: "bourbon-gem-jar"
+        exclude group: "org.webjars", module: "jshint"
+        exclude group: "org.webjars", module: "less"
+        exclude group: "org.webjars", module: "emberjs"
+        exclude group: "org.webjars", module: "handlebars"
+        exclude group: "org.webjars", module: "jslint"
+        exclude group: "org.webjars", module: "json2"
         // Due to conflict:
-        exclude group: "org.slf4j"
+        exclude group: "org.slf4j", module: "slf4j-api"
     }
 
     testCompile project(":tapestry-runner")