[gradle/experimental] upload missing patches

[gil]

commit 2272f3276b9c74eeb2ce8cf65c35e916763832ba
Author: gil <puntogil at libero.it>
Date:   Mon Aug 12 16:04:08 2013 +0200

    upload missing patches

 gradle-1.2-Add-proper-codenarc-dependencies.patch  |   51 +++++++++++++++++
 ...ovy-all-references-to-valid-package-names.patch |   59 ++++++++++++++++++++
 2 files changed, 110 insertions(+), 0 deletions(-)
---
diff --git a/gradle-1.2-Add-proper-codenarc-dependencies.patch b/gradle-1.2-Add-proper-codenarc-dependencies.patch
new file mode 100644
index 0000000..c61d67b
--- /dev/null
+++ b/gradle-1.2-Add-proper-codenarc-dependencies.patch
@@ -0,0 +1,51 @@
+diff -Nru gradle-1.2/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Checkstyle.groovy gradle-1.2-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Checkstyle.groovy
+--- gradle-1.2/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Checkstyle.groovy	2012-09-03 00:00:28.000000000 +0200
++++ gradle-1.2-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Checkstyle.groovy	2012-09-22 11:58:27.385815535 +0200
+@@ -17,6 +17,7 @@
+ 
+ import org.gradle.api.GradleException
+ import org.gradle.api.file.FileCollection
++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
+@@ -151,7 +152,7 @@
+     @TaskAction
+     public void run() {
+         def propertyName = "org.gradle.checkstyle.violations"
+-        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.2/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarc.groovy gradle-1.2-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarc.groovy
+--- gradle-1.2/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarc.groovy	2012-09-03 00:00:28.000000000 +0200
++++ gradle-1.2-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarc.groovy	2012-09-22 11:59:32.790188227 +0200
+@@ -17,6 +17,7 @@
+ 
+ import org.gradle.api.GradleException
+ import org.gradle.api.file.FileCollection
++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
+@@ -106,7 +107,7 @@
+     @TaskAction
+     void run() {
+         logging.captureStandardOutput(LogLevel.INFO)
+-        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.2/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarcPlugin.groovy gradle-1.2-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarcPlugin.groovy
+--- gradle-1.2/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarcPlugin.groovy	2012-08-28 00:02:32.000000000 +0200
++++ gradle-1.2-gil/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarcPlugin.groovy	2012-09-22 12:00:53.536710915 +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"
+                     }
+                 }
diff --git a/gradle-1.2-Change-groovy-all-references-to-valid-package-names.patch b/gradle-1.2-Change-groovy-all-references-to-valid-package-names.patch
new file mode 100644
index 0000000..2b57a63
--- /dev/null
+++ b/gradle-1.2-Change-groovy-all-references-to-valid-package-names.patch
@@ -0,0 +1,59 @@
+diff -Nru gradle-1.2/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/source/ExtractDslMetaDataTask.groovy gradle-1.2-gil/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/source/ExtractDslMetaDataTask.groovy
+--- gradle-1.2/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/source/ExtractDslMetaDataTask.groovy	2012-08-28 00:02:32.000000000 +0200
++++ gradle-1.2-gil/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/source/ExtractDslMetaDataTask.groovy	2012-09-22 11:47:28.257536851 +0200
+@@ -15,7 +15,7 @@
+  */
+ package org.gradle.build.docs.dsl.source
+ 
+-import groovyjarjarantlr.collections.AST
++import antlr.collections.AST
+ import org.codehaus.groovy.antlr.AntlrASTProcessor
+ import org.codehaus.groovy.antlr.SourceBuffer
+ import org.codehaus.groovy.antlr.UnicodeEscapingReader
+diff -Nru gradle-1.2/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/source/SourceMetaDataVisitor.java gradle-1.2-gil/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/source/SourceMetaDataVisitor.java
+--- gradle-1.2/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/source/SourceMetaDataVisitor.java	2012-08-28 00:02:32.000000000 +0200
++++ gradle-1.2-gil/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/source/SourceMetaDataVisitor.java	2012-09-22 11:46:46.898851314 +0200
+@@ -15,7 +15,7 @@
+  */
+ package org.gradle.build.docs.dsl.source;
+ 
+-import groovyjarjarantlr.collections.AST;
++import antlr.collections.AST;
+ import org.apache.commons.lang.StringUtils;
+ import org.codehaus.groovy.antlr.GroovySourceAST;
+ import org.codehaus.groovy.antlr.LineColumn;
+diff -Nru gradle-1.2/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandler.java gradle-1.2-gil/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandler.java
+--- gradle-1.2/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandler.java	2012-08-28 00:02:32.000000000 +0200
++++ gradle-1.2-gil/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandler.java	2012-09-22 11:49:54.631355240 +0200
+@@ -19,7 +19,7 @@
+ import groovy.lang.GroovyClassLoader;
+ import groovy.lang.GroovyCodeSource;
+ import groovy.lang.Script;
+-import groovyjarjarasm.asm.ClassWriter;
++import org.objectweb.asm.ClassWriter;
+ import org.apache.commons.lang.StringUtils;
+ import org.codehaus.groovy.ast.expr.ConstantExpression;
+ import org.codehaus.groovy.ast.stmt.ReturnStatement;
+@@ -90,7 +90,7 @@
+                     // Groovy will only put the filename into the class, but that does not help a debugger for Gradle
+                     // because it does not know where Gradle scripts might live.
+                     @Override
+-                    protected groovyjarjarasm.asm.ClassVisitor createClassVisitor() {
++                    protected org.objectweb.asm.ClassVisitor createClassVisitor() {
+                         return new ClassWriter(ClassWriter.COMPUTE_MAXS) {
+                             // ignore the sourcePath that is given by Groovy (this is only the filename) and instead
+                             // insert the full path if our script source has a source file
+diff -Nru gradle-1.2/subprojects/core/src/test/groovy/org/gradle/process/internal/child/SerializableMockHelper.groovy gradle-1.2-gil/subprojects/core/src/test/groovy/org/gradle/process/internal/child/SerializableMockHelper.groovy
+--- gradle-1.2/subprojects/core/src/test/groovy/org/gradle/process/internal/child/SerializableMockHelper.groovy	2012-08-28 00:02:32.000000000 +0200
++++ gradle-1.2-gil/subprojects/core/src/test/groovy/org/gradle/process/internal/child/SerializableMockHelper.groovy	2012-09-22 11:51:31.845931092 +0200
+@@ -18,8 +18,8 @@
+ 
+ package org.gradle.process.internal.child
+ 
+-import groovyjarjarasm.asm.ClassVisitor
+-import groovyjarjarasm.asm.ClassWriter
++import org.objectweb.asm.ClassVisitor
++import org.objectweb.asm.ClassWriter
+ import java.util.concurrent.atomic.AtomicInteger
+ import org.codehaus.groovy.ast.ClassNode
+ import org.codehaus.groovy.control.CompilationUnit