prevents ant, gant etc. going into the runtime/compile scope (build o…

…nly) and hence ending up in the war file

grails-core/build.gradle

@@ -1,3 +1,6 @@
+configurations {
+    optional
+}
 dependencies {
 
     compile 'javax.servlet:javax.servlet-api:3.0.1'
@@ -66,9 +69,37 @@ dependencies {
     }
 
     compile "org.springframework:spring-tx:${springVersion}"
-    compile project(":grails-bootstrap"), project(":grails-spring")
+    compile project(":grails-bootstrap"), {
+        exclude group:"org.fusesource.jansi", module:"jansi"
+        exclude group:"jline", module:"jline"
+        exclude group:"net.java.dev.jna", module:"jna"
+
+        // Ant
+        exclude group:"org.apache.ant", module:"ant"
+        exclude group:"org.apache.ant", module:"ant-launcher"
+        exclude group:"org.apache.ivy", module:"ivy"
+        exclude group:"org.apache.ant", module:"ant-trax"
+        exclude group:"org.apache.ant", module:"ant-junit"
+
+        exclude group:"org.codehaus.gant", module:"gant_groovy1.8"
+    }
+
+    optional "org.apache.ant:ant:${antVersion}"
+    optional "jline:jline:$jlineVersion"
+    optional "org.fusesource.jansi:jansi:$jansiVersion"
+
+    optional("org.codehaus.gant:gant_groovy1.8:${gantVersion}") {
+        exclude group:'commons-cli', module:'commons-cli'
+    }
+    compile project(":grails-spring")
 }
 
+sourceSets {
+    main {
+        compileClasspath += files(configurations.optional)
+    }
+}
+javadoc.classpath += files(configurations.optional)
 compileGroovy.doFirst {
     delete("${buildDir}/classes/main/META-INF")
     ant.mkdir(dir:sourceSets.main.output.classesDir)

grails-hibernate/build.gradle

@@ -5,8 +5,7 @@ dependencies {
         exclude group: 'commons-logging', module:'commons-logging'
     }
 
-    compile project(":grails-bootstrap"),
-            project(":grails-core"),
+    compile project(":grails-core"),
             project(":grails-spring"),
             project(":grails-web"),
             project(":grails-plugin-domain-class")

grails-plugin-datasource/build.gradle

@@ -12,8 +12,7 @@ dependencies {
     runtime 'hsqldb:hsqldb:1.8.0.10',
             'com.h2database:h2:1.3.164'
 
-    compile project(":grails-core"),
-            project(':grails-bootstrap')
+    compile project(":grails-core")
 }
 
 jar.appendix = 'plugin-datasource'

grails-plugin-domain-class/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
 
-    compile project(":grails-bootstrap"), project(":grails-core"), project(":grails-spring")
+    compile project(":grails-core"), project(":grails-spring")
 
     // Datastore APIs
     compile("org.grails:grails-datastore-gorm:$datastoreVersion") {

grails-plugin-services/build.gradle

@@ -1,7 +1,6 @@
 dependencies {
     compile "org.springframework:spring-tx:${springVersion}"
 
-    compile project(":grails-core"),
-            project(':grails-bootstrap')
+    compile project(":grails-core")
 }
 jar.appendix = 'plugin-services'

grails-plugin-tomcat/build.gradle

@@ -1,5 +1,12 @@
 def tomcatVersion = "7.0.30"
 dependencies {
+
+    // Ant
+    compile "org.apache.ant:ant:${antVersion}"
+    compile  "jline:jline:$jlineVersion"
+    compile  "org.fusesource.jansi:jansi:$jansiVersion"
+
+
     compile "org.apache.tomcat.embed:tomcat-embed-core:$tomcatVersion"
     compile "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatVersion"
     runtime "org.apache.tomcat.embed:tomcat-embed-logging-juli:$tomcatVersion"
@@ -8,7 +15,6 @@ dependencies {
     runtime "org.apache.tomcat.embed:tomcat-embed-jasper:$tomcatVersion"
     runtime "org.eclipse.jdt.core.compiler:ecj:3.7.2"
     compile project(":grails-core"),
-            project(":grails-web"),
-            project(':grails-bootstrap')
+            project(":grails-web")
 }
 jar.appendix = 'plugin-tomcat'

grails-plugin-validation/build.gradle

@@ -1,6 +1,5 @@
 dependencies {
     compile project(":grails-core"),
-            project(':grails-bootstrap'),
             project(':grails-web'),
             project(':grails-plugin-domain-class')
 }

grails-scripts/build.gradle

@@ -11,6 +11,27 @@ dependencies {
             project(":grails-test"),
             project(":grails-plugin-testing")
             project(":grails-resources")
+
+    compile "org.fusesource.jansi:jansi:$jansiVersion",
+        "jline:jline:$jlineVersion",
+        "net.java.dev.jna:jna:$jnaVersion"
+
+    // Ant
+    compile "org.apache.ant:ant:${antVersion}",
+        "org.apache.ant:ant-launcher:${antVersion}",
+        "org.apache.ivy:ivy:${ivyVersion}"
+
+    compile "org.apache.ant:ant-trax:${antTraxVersion}", {
+        exclude group:"org.apache.ant", module:"ant"
+    }
+
+    compile("org.apache.ant:ant-junit:${antVersion}") {
+        exclude group:'junit',module:'junit'
+    }
+
+    compile("org.codehaus.gant:gant_groovy1.8:${gantVersion}") {
+        exclude group:'commons-cli', module:'commons-cli'
+    }
 }
 
 sourceSets {

grails-spring/build.gradle

@@ -1,6 +1,19 @@
 dependencies {
     compile "org.springframework:spring-tx:${springVersion}"
     compile "org.springframework:spring-web:${springVersion}"
-    compile project(":grails-bootstrap")
+    compile project(":grails-bootstrap"), {
+        exclude group:"org.fusesource.jansi", module:"jansi"
+        exclude group:"jline", module:"jline"
+        exclude group:"net.java.dev.jna", module:"jna"
+
+        // Ant
+        exclude group:"org.apache.ant", module:"ant"
+        exclude group:"org.apache.ant", module:"ant-launcher"
+        exclude group:"org.apache.ivy", module:"ivy"
+        exclude group:"org.apache.ant", module:"ant-trax"
+        exclude group:"org.apache.ant", module:"ant-junit"
+
+        exclude group:"org.codehaus.gant", module:"gant_groovy1.8"
+    }
 }
 jar.appendix = 'spring'

grails-test/build.gradle

@@ -2,6 +2,9 @@ dependencies {
 
     compile "org.springframework:spring-tx:${springVersion}"
 
+    // Ant
+    compile "org.apache.ant:ant:${antVersion}"
+    compile "org.apache.ant:ant-junit:${antVersion}"
 
     // Testing
     compile "junit:junit:${junitVersion}", project(":grails-plugin-converters"), project(":grails-plugin-mimetypes")

grails-web/build.gradle

@@ -1,11 +1,12 @@
 configurations {
     jsp21.extendsFrom compile
+    optional
 }
 
 dependencies {
     jsp21 'javax.servlet.jsp:jsp-api:2.1'
 
-    compile project(":grails-bootstrap"), project(":grails-core"), project(":grails-spring")
+    compile project(":grails-core"), project(":grails-spring")
     compile('commons-el:commons-el:1.0') {
         exclude module:'commons-logging'
     }
@@ -33,16 +34,29 @@ dependencies {
     compile 'xpp3:xpp3_min:1.1.4c'
     runtime 'taglibs:standard:1.1.2'
     runtime "javax.servlet:jstl:1.1.2"
+
+    optional "org.apache.ant:ant:${antVersion}"
+    optional "jline:jline:$jlineVersion"
+    optional "org.fusesource.jansi:jansi:$jansiVersion"
+
+    optional("org.codehaus.gant:gant_groovy1.8:${gantVersion}") {
+        exclude group:'commons-cli', module:'commons-cli'
+    }
+
 }
 
 sourceSets {
+    main {
+        compileClasspath += files(configurations.optional)
+    }
     jsp21 {
         compileClasspath = files(configurations.jsp21, main.output)
         groovy.srcDirs = ['src/jsp21/groovy']
         resources.srcDirs = []
     }
 }
 
+javadoc.classpath += files(configurations.optional)
 jar {
     from compileJsp21Groovy.outputs.files
 }