diff -Nru gradle-1.0/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Checkstyle.groovy gradle-1.0-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Checkstyle.groovy
--- gradle-1.0/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Checkstyle.groovy	2012-02-26 19:51:24.000000000 +0100
+++ gradle-1.0-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Checkstyle.groovy	2012-09-21 20:41:41.905228525 +0200
@@ -18,6 +18,7 @@
 import org.gradle.api.GradleException
 import org.gradle.api.file.FileCollection
 import org.gradle.api.internal.Instantiator
+import org.gradle.api.internal.ClassPathRegistry
 import org.gradle.api.internal.project.IsolatedAntBuilder
 import org.gradle.api.plugins.quality.internal.CheckstyleReportsImpl
 import org.gradle.api.reporting.Reporting
@@ -141,7 +142,7 @@
     public void run() {
         def propertyName = "org.gradle.checkstyle.violations"
         def antBuilder = services.get(IsolatedAntBuilder)
-        antBuilder.withClasspath(getCheckstyleClasspath()).execute {
+        antBuilder.withGroovy(services.get(ClassPathRegistry).getClassPath("GROOVY").asFiles).withClasspath(getCheckstyleClasspath()).execute {
             ant.taskdef(name: 'checkstyle', classname: 'com.puppycrawl.tools.checkstyle.CheckStyleTask')
 
             ant.checkstyle(config: getConfigFile(), failOnViolation: false, failureProperty: propertyName) {
diff -Nru gradle-1.0/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CheckstylePlugin.groovy gradle-1.0-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CheckstylePlugin.groovy
--- gradle-1.0/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CheckstylePlugin.groovy	2012-09-21 20:42:29.333850013 +0200
+++ gradle-1.0-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CheckstylePlugin.groovy	2012-09-21 20:41:41.906228474 +0200
@@ -52,8 +52,6 @@
                     project.dependencies {
                         checkstyle "antlr:antlr:2.7.7"
                         checkstyle "com.puppycrawl.tools:checkstyle:$extension.toolVersion"
-//                        checkstyle "com.google.guava:guava:11.0.1"
-//                        checkstyle "commons-beanutils:commons-beanutils:1.8.3"
                     }
                 }
                 config
diff -Nru gradle-1.0/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarc.groovy gradle-1.0-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarc.groovy
--- gradle-1.0/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarc.groovy	2012-02-26 19:51:24.000000000 +0100
+++ gradle-1.0-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarc.groovy	2012-09-21 20:41:41.907228424 +0200
@@ -21,6 +21,7 @@
 import org.gradle.api.GradleException
 import org.gradle.api.file.FileCollection
 import org.gradle.api.internal.Instantiator
+import org.gradle.api.internal.ClassPathRegistry
 import org.gradle.api.internal.project.IsolatedAntBuilder
 import org.gradle.api.logging.LogLevel
 import org.gradle.api.plugins.quality.internal.CodeNarcReportsImpl
@@ -99,7 +100,7 @@
     void run() {
         logging.captureStandardOutput(LogLevel.INFO)
         def antBuilder = services.get(IsolatedAntBuilder)
-        antBuilder.withClasspath(getCodenarcClasspath()).execute {
+        antBuilder.withGroovy(services.get(ClassPathRegistry).getClassPath("LOCAL_GROOVY").asFiles).withClasspath(getCodenarcClasspath()).execute {
             ant.taskdef(name: 'codenarc', classname: 'org.codenarc.ant.CodeNarcTask')
             try {
                 ant.codenarc(ruleSetFiles: "file:${getConfigFile()}", maxPriority1Violations: 0, maxPriority2Violations: 0, maxPriority3Violations: 0) {
diff -Nru gradle-1.0/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarcPlugin.groovy gradle-1.0-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarcPlugin.groovy
--- gradle-1.0/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarcPlugin.groovy	2012-04-25 01:27:12.000000000 +0200
+++ gradle-1.0-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarcPlugin.groovy	2012-09-21 20:41:41.908228373 +0200
@@ -55,6 +55,7 @@
                 def config = project.configurations['codenarc']
                 if (config.dependencies.empty) {
                     project.dependencies {
+                        codenarc "antlr:antlr:2.7.7"
                         codenarc "org.codenarc:CodeNarc:$extension.toolVersion"
                     }
                 }